Merge "Rework stress to be more UnitTest like"