Merge "Use dynamic event factory in dispatcher tests" into main