EventSerializer tests and some test refactoring
Removed unneeded code in tests
Intermediate commit
Reworked event tracking