Merge "Revert "Converting even more tests to TAPL"" into ub-launcher3-qt-dev