Test harness updates