More work on rspec test suite