Correct traversing algorithms and update tests