a little more test cleanup