Fix missed paths and modules by tests dir refactor
Merge pull request #614 from elyezer/fix-tests-dir-refactor

Fix missed paths and modules by tests dir refactor
Fix PEP8 based on the latest version of flake8
Merge pull request #617 from elyezer/pep8-improvement

Fix PEP8 based on the latest version of flake8