Return NSUInteger instead of NSNumber in count
Better handling of event removal

- Fixes the mutated enumeration case.
- All events are eventually sent
Fixed EventStore count test