fixup! Rewrite harness.py to better support multiple suites