Additional refactoring and tests (fixtures and test functions) for Walk. 35 of 37 tests passing.