Fixed tests and linting.