Merge "Test case fixes"