build-test.xml updates