Updated tests to reflect the latest deprecations