Try to fix the failed tests