Cleaning up a Deprecation warning and fixing tests
Cleaning up a Deprecation warning and fixing tests