Enhance the test cases.