Forgot testModelGeneration
Saving misc changes.