Added extra details in XMLDescriptor to improve container description
Fixed tests
Replaced underscores with dashes
Skipped empty factoryService and factoryClass
Applied ubot patch