Fix tests + add keywords to package.json