Minor adjustments, conversion of tests to rspec