Fix broken build caused by committing unresolved merge conflicts
Added objectmenu test, ignored