pep8 fixes missing from review 3384

pep8 fixes for the 'include all tests' review
did not cover all pep8 errors introduced in
that review. Complete the set so that the
./ci-run test suite can run to completion.

Change-Id: I2d744e98264d3c96b061ab2b2889d6f0055ac7ab
(cherry picked from commit 9cb0028a86d0c3e86bc76f61be019a800fd82653)