Building more robustness into tests...