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