even more test cleanup