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