Fix test suites