Issue #4 - enhance XML building for run tests.