Some more test cleanup; add cleanup.win