Wait for menu to open in editor test

issue #1287

- also contains some misc cleanup
Merge pull request #1323 from ErisDS/test-fixes

Wait for menu to open in editor test