This should hopefully fix a few more failing tests in the matrix build.