Made tests more stable
3 files changed