added location filters
refactored tests
some location tracking units
minor style changes
Merge branch 'ajwhite-feature/location-filter'