add test walker and fix bug