test xml changes
Cleaning, adding some extra validation