TestHarness integrated
Merge branch 'test_harness'