Change model and corresponding test. Close #83

And damn factory girl, never using that again