Replace the test harness with something hopefully easier to improve.