Traversal test fixes and tweaks