[fix] Finish tests + package.json typo + refactoring of the last epic qu...

...ery