fix broken tests

Change-Id: Ia3755fe97c643408d4849517b1d935fa31b14be3