Clean up test cases some