Fix tests to pass under rspec 3
Merge pull request #93 from cmurphy/fix_tests

Fix tests to pass under rspec 3