Fixed wrong named class
Fixed some pep8 warnings
Removed unused imports
Merge pull request #489 from fatiherikli/master

Some fixes on tests