Fix test due to the new waypoint id stability