Fix up test suite