More esb tests and pep8 fix