Altered XML test cases to fit new APIs