Moved unit tests from Junit to TestNg
Merge branch 'master' of https://github.com/v1-wizard/welper
Fix after merge losed changes.