Add more integration tests for non-deeply-nested failures and errors