Make some Menu methods private and refactor tests to reflect this