Move TearDownTest cleaning to environment package Upstream-commit: 1a412a04706633ab5274a0ad6bd5c4414324bc9c Component: engine