Wait for menu to open in editor test

fixes #1287

- also contains some misc cleanup