Taking out minor pep8 violations with the test.
Merge pull request #1421 from lowks/master

Taking out minor pep8 violations with the test.