more test cleanup