Added a self transform to correct ordering in the DDI forms output, includes tests etc.