Got the unit test ported to visitor and running