Install all additional dependencies required for tests

Update TestDependent files to point at the installed deps
Some cleanup to TestDependent too