Spec coverage for event model and subsequent code which needed to be added to get spec coverage.