reviewed test queries and files context

lopesgrequested to merge
review-minor-tests-issues into develop

Merge request reports