Revert "Revert "test cleaning""

This reverts commit 7e7ffa134dd97cef1a5e1b63b8b4cf247845737f.