factory girl upgrade syntax fixes