IDE-1471 splited descriptor helpers according to content type and added tests