fixed the failing tests on the cluster