- more test cleanup