Fix minor type issues in test harness