Converting even more tests to TAPL
am: 0b20a11d66

Change-Id: I4ba951120a84676dfd00f7ce437799c5bd40f675