New failing test
Fixed traversing algo for cleanup phase