Add some tests
Merge branch 'master' into testing
Update MenuLabelTest to match new MenuLabel constructor
Merge branch 'master' into testing
Fix #2