Issue #3496496 by lhridley: Fix mocking in existing tests so that test objects can be created and tests and proceed.