Fix tests - the mission
Merge branch 'issue_14' into homologacao