Revert "Revert "Add ugly tearDown to fix tests since test-content sticks around.""

This reverts commit 271c341c276f02a79c820dfc54a33dafb6a42c81.