Sync tests for 663c72d.
Merge branch '2.0'