Fixed up testing harness