Iron out more factory_girl usage mistakes