Revert "Remove deprecation warnings in test suite"

This reverts commit adffdf55dd8fced5e7774bc3aa1d32983ea0c43d.