big fixture test fixes; visitor.match fix