Fixing lint errors

There are lots more in tests, that are pre existing not sure how to fix them though.