Refactored tests on ureport submodule