Revert change to ErrorOnFail due to test hangs, made TC exporter easier to read