fix tests and linter