More fixes for tdef test