Increased test robustness