Converting even more tests to TAPL

Bug: 131116002
Bug: 115582915
Change-Id: Id36fca232b5aff5f6692142ce4a0c937d0531f4e
9 files changed