Cleaned up test cases