Fixed concurrency issue with cluster tests