Changes test factory to use Event instead of ndict.

As more sources are moving off of ndict,
changing the factory to use Event, so that when testing we are
exercising use of Event.