Bug 210759 - debug tests don't compile after changes in refactoring
4 files changed