[NX-179] Remove usage of model configuration/Fix UTs