fix standalone, test run and add cleanup tasks