Fixing the refactorings needed for merge #56
Merge pull request #57 from mateuscomp/tests

Fixing the refactorings needed for merge #56