Fix errors in test suites