Simplify testing harness