Fix the test-tool build