BUG: fixed problems and test failures introduced by r22603.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@22604 3bd1e089-480b-0410-8dfb-8563597acbee