fix some mocks, also pep8

Change-Id: I235bdf92ce305d2e973aa25e88379a5834ed6ee2