More adjustments to target tool_test.