Modified and added 2 more test cases
Modified and added 2 more test cases and removed redundancies