Additional Rspec test updates