Eric Marsden Improve test robustness