Add changes in stress tests

Change-Id: I86af3ff448eb76fbd843928d83e6ae5d6291ee48