Reduce the size of the test so it will run on smaller machines.
Merge remote-tracking branch 'origin/master'