PEP-8 fixes
Implemented tests