Added teardown to test classes that were missing it