Fixed test harness to work on both machines I devlop on