Fix tests + lint