Cleaned up deprecations in the unit tests