Temp stuff to diagnose test failures on TC