#2873 - Fix sometimes failing tests on CircleCi

Some tests are sometimes failing even when they are not relate to task and made changes.

Failed tests are added to this task notes....