Refactor Test Harness

Change-Id: Id557220f6c0d72cb5c6aa2645e843450896622f5
7 files changed