Fixed the Test case failures