Make generator format test backwards compatible