fix tests, fix deprecations