Test: Fixes broken tests Change-Id: I62d001c6d0ed84fe1d1d9865b1027be0e1cad8b4 (cherry picked from commit de5a95d4)