Fixing PEP8 issues

Change-Id: Ia6bb15ba2741cb3a3dbeee704c67941d11ea5ab0
Adding to functional test coverage

Change-Id: I51ff1173bbf317e206177d4eb781bf221006745f