Fix broken tests

Change-Id: I9d0f1064e8cd63045283445946c46594a50d4b84
2 files changed