Feature parity Fix for test harness