add Tool and Test