improve test robustness for tests running on remote clusters