Some fixes to test harness to allow build