ALM-612 further tweaks of model unit tests
ALM-612 further tweaks of model tests for new source setup
ALM-612 fixed remaining source unit tests for updated model