Sorted out failing rspec tests