More testing

Still more changes to test.xml file