more unit testing minor method modifier changes on dipatcher.