Fix some tests that were failing due to mocks.

I'm not sure why our build system hasn't caught these test failures, but I discovered that the tests in master did not pass when I merged distributed-tasks today. This PR addresses the failure, but I'm not sure whether or not the mocks that I added as "post 3.3" were appropriate, or if they should have been "pre 3.3".