Fix incorrect cases breaking tests

Change-Id: I2096e9b952dc53ae2d461efa86084c1fb054c3fe
Merge "Fix incorrect cases breaking tests"