Merge "Convert broken flat -> smooth varying linkage test to a negative test."