More test adjustments.