Additional test cleanup code