fix datacollection tests (again)