Add tests for Waypoint generation