Add test.xml and Refactor other.