Fix test harness