Fixing test dependencies