Migrate tests away from deprecated methods

Change-Id: I06044741e6495e633ffd24ff45e4d39865ec8ef1
3 files changed