Disable half-finished tests
Fix up dispatch behaviour