Adjust test-tool to yangtools changes