More testing harness work