Fix GTs used in (IB) HLT tests
Merge pull request #1354 from Martin-Grunewald/70XFixGTforTests

HLT fixes -- Fix GTs used in (IB) HLT tests