More test re-working.