Fix more rspec tests