Xml files update
Tests references corrected
Logic corrections