Reworked traversal and resume of traversals. Fixed tests.