Convert tests to use Harness

Fixes #540