Refactored to use Location class for coordinates. Refactored appropriate
test classes. Added new classes and tests.