Fix some dependencies in tests
13 files changed