Test cases and test case fixes