Added factory_girl gem and fixed minor bugs