Add first tools and associated tests