Improve on test flakiness

[coufalja]

Describe the bug Certain tests in the replication and storage package could take a different route in the code depending on a timing of the test.

To Reproduce

• Run couple of test runs and store the coverage
• Diff coverage and see the difference there

Expected behavior

• The coverage should stay the same

Environment (please complete the following information):

• All

Additional context

• It makes coveralls unhappy :)