Merge "Fix pep8 violations in testmodule.py"