yet more test cleanup