reorgenized the testing.xml to be more suitable