Add file name after result in wc tool and more test cases
Fix merge conflict