Traverse fixes; tests