Wrote location service tests, fixed up some minor issues in location service