Removed dependency on internal validation
Separated tests into categories
Change test module paths
Fixed tests for geotag marshaller
Change to geolocation