Last 3 test case fixes