Increased Test robustness