Fix the tests and test fixtures for the recent changes
Fix Location and the LocationsHelper so the tests pass