Update tests to work with changed generators.