Updated dispatcher test