Added tools and tests.