:green_heart: Fix tests and deprecations