Updated tests for some deprecations