Updated `Locations` class (removed some stuff) and added test case.