Fix: Behavior on the dont_die mode. And tests.