added some tools and tests