Fix test bitrot breakages

Change-Id: I39cbcd078c07fd48ca9b00abce21871ef273b19d
4 files changed