Fixed rspec; passed all rspec tests