Incorporated code review comments: removed commented line and modified test case descriptions, some of which were duplicate