Fixed all TC failures