Library Refactored
Library Refactored
two test cases modified
new test case added