Disable half-finished tests
Fix up dispatch behaviour
Merge pull request #1 from dariusj/cleanup_logic

Cleanup logic