improving robustness of tests