#42 Clean tests after merge
#21 Some correction on GenXML
Merge branch