rspec updates from byron