More test cleanup.