Tool and Test Enhancements

In particular fix tool client bug recently discovered by Olivia Doppelt-Azeroual and discussed on the galaxy-dev mailing list and modify tests to "skip" if relevant keys are not set.