Fixes to cluster test script