Linting and test updates to fix deprecation warnings