Fix tests broken by 51d33e111088c2e94dce9a068cf93363588c8811

Change-Id: I940b24c053084293a7aed2dfd303cc979339afc6