fixed tests and linting.