adding factoryGirl; removing deprecation messages