Fix unit tests
Merge pull request #12780 from s0undt3ch/develop

Fix unit tests