Increased test coverage
Increased test coverage
Fixed casting exception
Fixed earlier termination of pre and post walkers