Revise Some Test Cases to Avoid Croaking