Cleanup lint errors in test code

So that we can enable lint by default over tests as well.