Test harness changes