Testhelper clean up