Improve DescriptionCollectionSerializer and clean tests