Location lab - made the remaining unit tests pass