[BUG #8796] Add "check waypoints" to test plans