Updated cleanup script to clean tests folders
Updated TODO