Merge "Add internal testing for the stress test framework"