Fix tests
Merge branch 'issue_14' into homologacao