Change chain of events: Unit tests fix (WIP)