Enhancements to 3-node cluster tests