[TEST] jUnits refactoring and fixes
Merge pull request #2111 from AliaksandrDrebenchuk/jUnits

[TEST] jUnits