Cleaned up rspec tests