Improving tests for dispatch