Move (some) cross-test dependencies into the framework.