Update tools + testcase