Fixed Rspec issues: