Added Menu class and tests