Enable Dispatch support again
Further attempt at mocha support.

Also some restructuring to cater better to providers.