Improving image converter tests, refactored dispatcher.py to be more testable. Still really only smoke tests rather than proper unit tests