More additions for the test harness