[AC21.4] test-harness improvements