Update failing test, pep8 fixes.
Merge remote-tracking branch 'ivan/bug/update-failing-test-and-pep8' into develop