Test fixes following ExceptionAdapter refactor.
@rev gtorres@
@bug W-1859077@
Merging origin/ravi/master-pending-W-1859077 into master