Merge "Added test for MouontPoints and URI"