Tear Down properly

Let's hope that fixes the tests