Test Case Fixes