Maybe this will fix the test failures