Fixing all test suites