Changed the RSpec tests + factories