Fix broken TB2 tests

Change-Id: I1ce52065e529d471876e8aae1b53b5808089cc53