Merge "Convert more tests to TAPL" into ub-launcher3-master