Completing coverage of Tools