PIM-1602 : Fix UT for FamilyType
PIM-1601 : Apply patch for scrutinizer