Fixed all rspec tests
Updated tests