Fix broken build for more tests

Change-Id: I7bdd12a833233724805d01d993541ee05caa9bf6
3 files changed