Merge "Moving some tests off TAPL" into main