fix pep8 and UT issue

fix latest pep8 and UT issues

Change-Id: I9a3b7f55ec68a9944eb7513fca4c7f521642e49e