Updated Tool tests.