refactored tests, inc factory girl, more to be done