Revert "Converting even more tests to TAPL"

This reverts commit 406d49bdd724a9707a218f6b7ba3d40bdfb87028.

Reason for revert: Breaks tests on Crosshatch

Change-Id: I95ff541dfe8f6f1d7e1913d209b53abfbebe5336
9 files changed