End of 5.3 Rspec cleanup