refs #296 - fix generation tests (due to fields order keeping)