Fixed the failed tests