Fix pep8

Change-Id: I6b73b6ec3e0c6bd851459981bd95316b9a91ba2a
fix tests

Change-Id: I68ada325d59e7d52f9f310230aa6b681f8e66173