Fix test/lint errors
[tvansteenburgh] Fix test/lint errors