Integration test fixes - PreserveOriginalLCTestCase