2i: Update testing exception handling.