Fixed Tests to use new ModelGenerators