improving test robustness