refactor tests + lint