more test cleanup.