Merge "Implement test harness mode"