Some flakiness on builds expected

@cintiadr, no need. I need to fix code to make tests pass.