Add unit test for menu
Fix merge