PEP8 changes for test stuff

Change-Id: I281e8b1ff765d7ea6b005bb79d8449cbb6b1cd78
Merge "PEP8 changes for test stuff"