Unittests
Tests fix
Merge pull request #3 from Neob91/BUG_947

Unittests