Renamed TM_Xml_Database field TM_Server_Config to Server
Fixed couple UnitTests