Fix test teardowns
Merge pull request #79 from yayugu/fix/test_teardown

Fix test teardowns