Fixes more linting in tests and api.