Initial, working re-import of test-harness.
Arg, botched import. Trying again after cleaning it out.