Merge "Fixing some tests" into ub-launcher3-master