CMS-2426 Research how to support complex values for properties (type=DataSet) (continue from last sprint)
Updated test