Updated Location, LocationTest, User, UserTest, Waypoint