Fixed the Test case failures

Fixed the test case issues and please accept :)