Add test for waypoints