Let's leave cpplint on the tests for now. I agree I could toss out on lint for tests if it forces us into unnatural acts, but this one was trivial.