tried a fix for the 2 failing tests on the cluster