Fix the build by fixing these unit tests
Merge branch 'unstable_staging' into issue23-callable_distributor
This should be a working start for this implementation