Switched test to use ShouldMatchers
Refactored out BlockMenuBar
Added tests for ExpressionMenu
Removed some println() statements.