More dies_ok -> throws_like cleanup