Fix the tests

@liveh2o @localshred 
can you point out where those threads may be hanging around? I can't trivially find it