Merge "BUG-5006: Rework testEnqueueEvent to avoid private methods"