Updated the Comments and Test Cases