Tweak test runner to match SimpleValidator changes.