Let's try if mocking fixes the intermittent failures of the unit test.
Merge pull request #7506 from s0undt3ch/develop

Let's try if mocking fixes the intermittent failures of the unit test.