Merge "Remove expectLinkPropertiesThat"