Merge "Fix uses of readlink in tests."