Model test: cleaning specs
Remove excess factory
Prepare to Heroku