test cleanup, 2 real bugs remain