Updated for tests and linting