Fixing deprecated issues breaking unit tests.