An attempt at fixing failing integTests.