Specs refactored for database_cleaner, all specs passing