Make functions that were created to be backwards compatible with some
unit-test deprecated.