Update tests to use new headers.

Change-Id: I4904c0bfc9a7726d656a6f20757a347642af36b6
2 files changed