Revert "Parameterized xml generation for the tests, still needs some clean up"

This reverts commit c68a20301c14f863864d53f8e64bc9f5feb53baa.