refs #5192 fix some tests after simplifying the top menu