[#1431] Improved tests and fixed pep8 errors
[#1431]Imporved tests
[#1431]Imporved tests
[#1431]Removed unnecessary assertions
merge upstrem/master into bug_1431
Merge pull request #2 from gruber86/bug_1431

Bug 1431