Override onThrowable
Update tests per API changes