Test fix: change exception type.
PEP8 fix: E501 line too long (80 > 79 characters).
Merge remote-tracking branch 'ivan-github/feature/fix-test-and-pep8' into develop