Revert "TESTING: slightly adjust expected result after scisoft-core commit 350ad3a"

This reverts commit 9afb64a8a65e92871347b8e6fbc631cd83fbd830.
Merge -s ours from 8.38 into master