Fix/review tests

lopesgrequested to merge
fix/review-tests into develop

Merge request reports