Cleaned up rspec stuff