Converting even more tests to TAPL am: 406d49bdd7
am: 88820e1873

Change-Id: Iec4062785ba7040b42b1f7463684d277bb537a3d