refactored tests
some location tracking units