Fixing tools and adding a test
Fixing tools and adding a test