More test changes.