I think I prefer to fix the tests.
The fix is simple and it seems that the failure occurs mainly when we execute the assertions, not when we replicate the scenario to test.