Redo Rspec tests