Completed conversion of tests to rspec