pep8

Change-Id: I921e5596b8321ef0f5cc3b071a7a8f6e35f72cf6
+ tests

Change-Id: I0aa0c319d68996029f9cc6d1b644233a70dd2d6a