waypoint tests updated
waypoint tests updated