Event.cpp race fix, addtional tests