Make test harness more robust.