More Test Cases added Names Refactored