Fix the issue that tests are failed