Fixing the refactorings needed for merge #52
Merge pull request #53 from mateuscomp/tests

Fixing the refactorings needed for merge #52