Merge testing harness into master