Lint (fixes unit tests)