fix test replaceFiresUpdatedEvent and some tiny renaming & refactoring
Merge pull request #3572 from ahmetmircik/fix/3.4/test_replaceFiresUpdatedEvent

Fixes test replaceFiresUpdatedEvent and some refactorings