Add some dependencies for tests affinitic refs #5725