Revert back the changes of optional match-pred
modified distributor update function and added few tests