Fix the failed test case. Revise the error message according to Andrew