Implement some more speed-up : Syncing test harness changes