Fixed FactoryGirl depreciated warnings during user model tests.
Fixed FactoryGirl depreciated warnings during zone_template tests.