[WIP] another attempt at fixing failing tests on jenkins