Merged in new generate tests.