Better lint, unit tests
Fix lint