Tidying up rspec tests