Improve endpoint ordering tests
Fix small bug in FormWindowMenu