[Argha, Luiza] Refactoring functional tests to make them more stable on the CI
Merge branch 'master' of https://github.com/unicefuganda/ureport