Improove testing
Shitch to element tree xml generation