Fixing eslint errors and unittests
Merge pull request #475 from ilyavolodin/eslint-errors

Fixing eslint errors and unittests