Break a circular reference in test cases.
Merge remote-tracking branch: upstream/master