Update tests to use the new dispatcher.