Test Case 3 and fixes