Issue #2335991: Fixing multivariate tests