More test cleanup