lint fixes + tests