Fix tests

Change-Id: If375416e3a8dfe63db4a594454d814ccd0e24b60
2 files changed