Test case 1-4 fixes