REFACTOR Renamed Xml test class & file