[#2163] PEP8
Merge pull request #1 from drudkiewicz/bug_2163

[#2163] PEP8
[#2164] Pylint
[#2164] Increasing test coverage
[#2164] Comparing data with static dict
[#2164] Adding edge cases in tests
Merge pull request #2 from drudkiewicz/bug_2164

[#2164] Increasing test coverage