Fix for nested blocks where one of them is dead
update tests