Update TODOs
[tests] Cleanup files after test complete