Fix silly unit test fail and pep8 errors

Change-Id: I7e20afbf624cd51b8e1455091616f2ee4b4cdb95