More reliable tests...