Fixed tools and tests