Fixes whitebox testing for deleted type change

Fixes the remaining 'deleted' default values to
integers instead of booleans.

Change-Id: Iebbb2e6c484a96285a81056af538e414ced55f5d
Merge "Fixes whitebox testing for deleted type change"