Use new plugin to fix the generated code so the tests don't have to be disabled/skipped