Converting some tests to TAPL
am: d11b604e19

Change-Id: Icb1eec754f15ae9fe047d7be3c18e59d96c7d28e