Cleaned up Master op_test_driver test harness