Fix a couple of unit tests.

Change-Id: I4ade90fbfdb10cd5cd4980638946871e473e4d20
3 files changed