Merge "Skip tests if TA not installed" into main