Add robustness test