Added a self transform to correct ordering in the DDI forms output, incl...

...udes tests etc.