Added factory_girl dependency :)
else vs. return