#81 cluster test fix