Cleaning up geo tests

This resolves issue USERGRID-264