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

Fixes test replaceFiresUpdatedEvent and some refactorings