Improve menu tests somewhat