linting and making tests pass again