fix and improve comment
improve readability
fix wrong method description
update test script for more files

and also adjust the output filename to better reflect the content