Added factory girl and migrated tests to match