Policy areas multivariate test improvements

A couple of improvements on #1217.