Fix the test issue