Refacored tests structure
Fixed code to obey PEP8 rules
Merge pull request #81 from dominno/tests-refactor

Refacored tests structure