Adding better diagnostics to test in order to debug failures on TC