Tweaks in the unit tests to align to tranformation changes