corrected assert exceptions, method and properties

identified an issue similar to the event expectations where the wrong
collection was being used to iterate over
corrected the assertion calls to throw the correct expectation exception
spent a lot of time with the events (again)