tests: improve flakyness + clean-up
2 files changed