Fixing dependencies for tests