Sync up test runner to changes in SimpleValidator.