Converted broken test to TB3

Change-Id: Ic30db7584a65c944eb45c576e12b7671399d1965