Change-Id: I826655a708010149de231ca31a2e3ba4f1842c0c
Suggested by James Zern to clear out cpplint warnings for all unit test code. Change-Id: I731a3fa4d2a257eb9ef733426ba84286fbd7ea34
Change-Id: I99937cbdd6bfe52b7c8ae42f05526dfc06a602f4