Pull in the extra dependency test from the Test-Builder1.5 branch.