Log Message:
Add some more test dependencies, and run the correct tool for testing.

Still more changes needed to get this anywhere approximatelysuccessful.