Added more xml messages and test cases