Test fixed
Improve tests' code so that it's not as repetitive and it's actually usable