Xml tables global update
Logic tests update
Logic changes