fixing tests and linting