Update tests to work with current rspec