More TA fixes to the tests