Fix test harness

There are a couple failing tests which haven't been fixed in this PR, but now that I'm actually
able to run the test harness, I'll look at getting those working.
wrapping the test-main file ---- I don't think this really makes a difference, but it matches the patterns used in other repos.