Wait for menu to open in editor test

issue #1287

- also contains some misc cleanup