make old tests work + test deprecation