Fixed errors in TCs. Few pending
Fixed TC errors. Few pening still