Merge "update whitebox testing for deleted type change"