[DI-28] UT for script model & Fixes
Merge pull request #40 from zhenyakoval/master

[DI-28] UT for script model & Fixes