Included Menu model and refactored the tests