Rewrite of a failing TB2 test to TB3.

Change-Id: Ic62e5f955d564d3d8f59ba7ca2a41d30e1a92452