making the tests work with api changes

Change-Id: I4956ca588ed8452df9b9fd91ac9204a086a1732e