fix - event dispatcher spi and unit test