Upgrade to latest version of Specs2
Add a few test cases for expressions

Minor restructuring of expression test cases and improved naming