Enhance the test case based on review comments