Fix broken tests after clas name change of related content