Rebuild event routing spike from tests