Fix up test suites