Refactoring for test 1.8
Merge pull request #32 from mateuscomp/master

Refactoring for test 1.8