Update to remove deprecations
Fix failing test