Improve ClientSiteLinkLookupTest

Change-Id: I8f60fb068722204e88cdf163a14d2519d7db6774
Merge "Improve ClientSiteLinkLookupTest"