Fixed failing rspec tests