@wip Fix more test deprecation warnings