Modifications and test additions to resolve issue #1160