adding more tools and tests