Fixed config unit tests + some PEP8 cleanup