more test cleanup fixes