lint + fix last faling test...