modify the xsd and add some test cases