Test Case Reorganization Part 2