Refactored tests
Merge branch 'development' into refactor-tests
Refactored tests
Merge pull request #14 from henriquecf/refactor-tests

Refactor tests