FLUID-4907: Fixed the unit tests to handle the removal of the event binder.