Make dispatchable trait more testable
Fix