Remove obsolete `doThrow` pattern from some tests. am: 5a11036542
am: bdb99de5cf

Change-Id: I29f252e18a505bcc3e7fbad41bdb1094f267079d