Use non-deprecated versions of withId() and withText()