Converting even more tests to TAPL
am: 406d49bdd7

Change-Id: I807fbb87c00ac23e5f9c3bdf6ebdb4c19dcd2468