Tweak certain collections tests to have more independent samples.
Merge branch 'master' into jenkins