Repair UniqTool and WcTool + add more test cases