fixup! Add deprecation warnings to removed classes and methods
fixup! Add tests of deprecated classes