Additional test cleanup.