Test Case fixes