Fixed test issues with type=null (#11895)

Change-Id: I1618191f534ef75048dbae95564ef30a320114a4