Added xml name mapping and more tests