Added extra details in XMLDescriptor to improve container description
Fixed tests