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

This reverts commit e651e4ea92aba7d00386a614f3237777d57d18f7.