Message distributor mocks
Merge
message distributor tests complete