Added tests for xmlParser + changes in DataServiceModel