ALM-612 more tweaks of unit tests for updated sources