Fixing Behavioral - Visitor impl and test