Fix tests broken by 76bbefd

Change-Id: I386d26ebe109d7317e9aeeaba5b97b61f083dedd
2 files changed