Cleaned up Robustness tests, fixed a bug.