Rspec issues fixed