Waypoint modification for test