Revert "Updated tests to use new visitor method signature."

This reverts commit 458a0f0ed66c68bb2b15a2a9895f446c80b738e8.
Revert interface change. Will be simiplified at later date.