Fixed failed test suites