Adding more test cases and Functionality