Merge "Misc test improvements" into ub-launcher3-master