fixup! Add tests of deprecated classes