Added _updateEventSources test and refactoring
#308
Merged
_updateEventSources test and refactoring
#308