Simplified stress tests.

Change-Id: I3cc6a14f32d81fa81adb13aed97049c9df2abbb2
Merge "Simplified stress tests."