pep8 fixes
gerge branch 'feature/tests' into develop