fixes to menu class and testing of it