ENG-4537 Fixes for EE COW refactoring.

Has a lot of instrumentation in case there still are failures.
These must be removed before reviewing and merging.