Revert "Test Harness Data Cleanup"

This reverts commit 1e620d922da37b25ff31332707dac9a06b0d7eab.