Merge "Fix pep8 violations in stress tests"