Reorganized tests - moved from tests/ directory to module directly
Fixed according to PEP8