general fixes in Test case 1, 2, 3