fix existing tests

Change-Id: I26bae0051454e9ba33fe85af41e7c0242c8c8f49