Improve multivariate test