Fix build - test issues.

Fix compilation errors in tests.

Change-Id: Id2405edc2eec5bef9ebf5f241db03a0bb4a6b5a3
2 files changed