Fix tests to work with DEPRECATED_REMOVED
3 files changed