Merge "Migrating widgets tests off TAPL" into main