Merge "Fixes whitebox testing for deleted type change"