Pep8 fixes
&
make tests consistant