corrected event expectation (subscription) issue

when raising an event the event method handler was not using the correect
collection to identify the expectation
the code was checking to see if an expectation was set but was not using
the correct collection to index into the expectations

field problem unit tests were updated to follow the new constructs
some unit tests were removed do to tests focusing on record/replay
features that are no longer available