Merge "Fix hallucinated atest commands" into main