Fixes for test_walker