Fix failing tests

Forgot to fix these with other CL.

Change-Id: I5ac158ca0d312b601fbf1e12722fe271751c88f2
2 files changed