Added factory girl, refactored tests