Fix GTs used in (IB) HLT tests