Fix some dependencies in tests
5 files changed