rename mock files
cleanup
add unit test for location service