[DI-28] UT for script model & Fixes