Fixes for the bootstrap test
Remove some senseless crap
Merge pull request #309 from whirm/walker_test_fix

Fixes for the bootstrap test