US662: Fixed xml and tests based on the new schema version 2.2.1