Better test tear down added