linting, fixing tests