Some PEP8 fixes.
Fix / update fixtures.
Merge pull request #228 from aplanas/master

Minor fixes