Sync with the newer version of my samples.
Sync with the new version of my tests.