fix tests + lint