Fixed config unit tests + some PEP8 cleanup
Merge pull request #271 from shermdog/unit-tests

Fixed config unit tests + some PEP8 cleanup