Converting more tests to TAPL

Bug: 131116002
Bug: 115582915
Change-Id: I3346f96ddba3224eb4b92b15344d71b8ed6e32e0
6 files changed