Merge "Increase test coverage for plugins-event"