Merge "Fixing various tests" into ub-launcher3-dorval-polish2