Add verification to tests, fix warning.

This was originally a change for the kernel integration with some
cleanup.  However, with changes in a previous cl, the kernel changes
weren't needed leaving only the cleanup.

Change-Id: Ie1051b8d4aa266d37f385b4a8de5417c1970e01a
2 files changed