Cleaned up Robustness tests