Fix more rspec stuff