r26325: Remove use of global_loadparm in netif.

[bbaumbach/samba-autobuild/.git] / source4 / torture / nbt / winsreplication.c

diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 2ac9d1cfb3dbb6fef7415083c4503b25ed7b6185..b427843b80e445aa60e6ca3d7649a09172763b3a 100644 (file)
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -8,7 +8,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
@@ -27,41 +26,28 @@
 #include "lib/socket/socket.h"
 #include "libcli/resolve/resolve.h"
 #include "system/network.h"
-#include "netif/netif.h"
+#include "lib/socket/netif.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
+#include "torture/torture.h"
+#include "torture/nbt/proto.h"
+#include "param/param.h"
 
-#define CHECK_STATUS(status, correct) do { \
-       if (!NT_STATUS_EQUAL(status, correct)) { \
-               printf("(%s) Incorrect status %s - should be %s\n", \
-                      __location__, nt_errstr(status), nt_errstr(correct)); \
-               ret = False; \
-               goto done; \
-       }} while (0)
+#define CHECK_STATUS(tctx, status, correct) \
+       torture_assert_ntstatus_equal(tctx, status, correct, \
+                                                                 "Incorrect status")
 
-#define CHECK_VALUE(v, correct) do { \
-       if ((v) != (correct)) { \
-               printf("(%s) Incorrect value %s=%d - should be %d\n", \
-                      __location__, #v, v, correct); \
-               ret = False; \
-               goto done; \
-       }} while (0)
+#define CHECK_VALUE(tctx, v, correct) \
+       torture_assert(tctx, (v) == (correct), \
+                                  talloc_asprintf(tctx, "Incorrect value %s=%d - should be %d\n", \
+                      #v, v, correct))
 
-#define CHECK_VALUE_UINT64(v, correct) do { \
-       if ((v) != (correct)) { \
-               printf("(%s) Incorrect value %s=%llu - should be %llu\n", \
-                      __location__, #v, (long long)v, (long long)correct); \
-               ret = False; \
-               goto done; \
-       }} while (0)
+#define CHECK_VALUE_UINT64(tctx, v, correct) \
+       torture_assert(tctx, (v) == (correct), \
+               talloc_asprintf(tctx, "Incorrect value %s=%llu - should be %llu\n", \
+                      #v, (long long)v, (long long)correct))
 
-#define CHECK_VALUE_STRING(v, correct) do { \
-       if ( ((!v) && (correct)) || \
-            ((v) && (!correct)) || \
-            ((v) && (correct) && strcmp(v,correct) != 0)) { \
-               printf("(%s) Incorrect value %s='%s' - should be '%s'\n", \
-                      __location__, #v, v, correct); \
-               ret = False; \
-               goto done; \
-       }} while (0)
+#define CHECK_VALUE_STRING(tctx, v, correct) \
+       torture_assert_str_equal(tctx, v, correct, "Invalid value")
 
 #define _NBT_NAME(n,t,s) {\
        .name   = n,\
@@ -95,9 +81,9 @@ static const char *wrepl_name_state_string(enum wrepl_name_state state)
   test how assoc_ctx's are only usable on the connection
   they are created on.
 */
-static BOOL test_assoc_ctx1(TALLOC_CTX *mem_ctx, const char *address)
+static bool test_assoc_ctx1(struct torture_context *tctx)
 {
-       BOOL ret = True;
+       bool ret = true;
        struct wrepl_request *req;
        struct wrepl_socket *wrepl_socket1;
        struct wrepl_associate associate1;
@@ -109,76 +95,75 @@ static BOOL test_assoc_ctx1(TALLOC_CTX *mem_ctx, const char *address)
        struct wrepl_packet *rep_packet;
        struct wrepl_associate_stop assoc_stop;
        NTSTATUS status;
+       struct nbt_name name;
+       const char *address;
 
-       if (!lp_parm_bool(-1, "torture", "dangerous", False)) {
-               printf("winsrepl: cross connection assoc_ctx usage disabled - enable dangerous tests to use\n");
-               return True;
-       }
+       if (!torture_nbt_get_name(tctx, &name, &address))
+               return false;
 
-       printf("Test if assoc_ctx is only valid on the conection it was created on\n");
+       torture_comment(tctx, "Test if assoc_ctx is only valid on the conection it was created on\n");
 
-       wrepl_socket1 = wrepl_socket_init(mem_ctx, NULL);
-       wrepl_socket2 = wrepl_socket_init(mem_ctx, NULL);
+       wrepl_socket1 = wrepl_socket_init(tctx, NULL);
+       wrepl_socket2 = wrepl_socket_init(tctx, NULL);
 
-       printf("Setup 2 wrepl connections\n");
+       torture_comment(tctx, "Setup 2 wrepl connections\n");
        status = wrepl_connect(wrepl_socket1, NULL, address);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
        status = wrepl_connect(wrepl_socket2, NULL, address);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
-       printf("Send a start association request (conn1)\n");
+       torture_comment(tctx, "Send a start association request (conn1)\n");
        status = wrepl_associate(wrepl_socket1, &associate1);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
-       printf("association context (conn1): 0x%x\n", associate1.out.assoc_ctx);
+       torture_comment(tctx, "association context (conn1): 0x%x\n", associate1.out.assoc_ctx);
 
-       printf("Send a start association request (conn2)\n");
+       torture_comment(tctx, "Send a start association request (conn2)\n");
        status = wrepl_associate(wrepl_socket2, &associate2);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
-       printf("association context (conn2): 0x%x\n", associate2.out.assoc_ctx);
+       torture_comment(tctx, "association context (conn2): 0x%x\n", associate2.out.assoc_ctx);
 
-       printf("Send a replication table query, with assoc 1 (conn2), the anwser should be on conn1\n");
+       torture_comment(tctx, "Send a replication table query, with assoc 1 (conn2), the anwser should be on conn1\n");
        ZERO_STRUCT(packet);
        packet.opcode                      = WREPL_OPCODE_BITS;
        packet.assoc_ctx                   = associate1.out.assoc_ctx;
        packet.mess_type                   = WREPL_REPLICATION;
        packet.message.replication.command = WREPL_REPL_TABLE_QUERY;
        ZERO_STRUCT(ctrl);
-       ctrl.send_only = True;
+       ctrl.send_only = true;
        req = wrepl_request_send(wrepl_socket2, &packet, &ctrl);
-       status = wrepl_request_recv(req, mem_ctx, &rep_packet);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       status = wrepl_request_recv(req, tctx, &rep_packet);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
-       printf("Send a association request (conn2), to make sure the last request was ignored\n");
+       torture_comment(tctx, "Send a association request (conn2), to make sure the last request was ignored\n");
        status = wrepl_associate(wrepl_socket2, &associate2);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
-       printf("Send a replication table query, with invalid assoc (conn1), receive answer from conn2\n");
+       torture_comment(tctx, "Send a replication table query, with invalid assoc (conn1), receive answer from conn2\n");
        pull_table.in.assoc_ctx = 0;
        req = wrepl_pull_table_send(wrepl_socket1, &pull_table);
-       status = wrepl_request_recv(req, mem_ctx, &rep_packet);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       status = wrepl_request_recv(req, tctx, &rep_packet);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
-       printf("Send a association request (conn1), to make sure the last request was handled correct\n");
+       torture_comment(tctx, "Send a association request (conn1), to make sure the last request was handled correct\n");
        status = wrepl_associate(wrepl_socket1, &associate2);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
        assoc_stop.in.assoc_ctx = associate1.out.assoc_ctx;
        assoc_stop.in.reason    = 4;
-       printf("Send a association stop request (conn1), reson: %u\n", assoc_stop.in.reason);
+       torture_comment(tctx, "Send a association stop request (conn1), reson: %u\n", assoc_stop.in.reason);
        status = wrepl_associate_stop(wrepl_socket1, &assoc_stop);
-       CHECK_STATUS(status, NT_STATUS_END_OF_FILE);
+       CHECK_STATUS(tctx, status, NT_STATUS_END_OF_FILE);
 
        assoc_stop.in.assoc_ctx = associate2.out.assoc_ctx;
        assoc_stop.in.reason    = 0;
-       printf("Send a association stop request (conn2), reson: %u\n", assoc_stop.in.reason);
+       torture_comment(tctx, "Send a association stop request (conn2), reson: %u\n", assoc_stop.in.reason);
        status = wrepl_associate_stop(wrepl_socket2, &assoc_stop);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
-done:
-       printf("Close 2 wrepl connections\n");
+       torture_comment(tctx, "Close 2 wrepl connections\n");
        talloc_free(wrepl_socket1);
        talloc_free(wrepl_socket2);
        return ret;
@@ -187,62 +172,66 @@ done:
 /*
   test if we always get back the same assoc_ctx
 */
-static BOOL test_assoc_ctx2(TALLOC_CTX *mem_ctx, const char *address)
+static bool test_assoc_ctx2(struct torture_context *tctx)
 {
-       BOOL ret = True;
        struct wrepl_socket *wrepl_socket;
        struct wrepl_associate associate;
        uint32_t assoc_ctx1;
+       struct nbt_name name;
        NTSTATUS status;
+       const char *address;
+
+       if (!torture_nbt_get_name(tctx, &name, &address))
+               return false;
 
-       printf("Test if we always get back the same assoc_ctx\n");
+       torture_comment(tctx, "Test if we always get back the same assoc_ctx\n");
 
-       wrepl_socket = wrepl_socket_init(mem_ctx, NULL);
+       wrepl_socket = wrepl_socket_init(tctx, NULL);
        
-       printf("Setup wrepl connections\n");
+       torture_comment(tctx, "Setup wrepl connections\n");
        status = wrepl_connect(wrepl_socket, NULL, address);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
-
-       printf("Send 1st start association request\n");
+       torture_comment(tctx, "Send 1st start association request\n");
        status = wrepl_associate(wrepl_socket, &associate);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
        assoc_ctx1 = associate.out.assoc_ctx;
-       printf("1st association context: 0x%x\n", associate.out.assoc_ctx);
+       torture_comment(tctx, "1st association context: 0x%x\n", associate.out.assoc_ctx);
 
-       printf("Send 2nd start association request\n");
+       torture_comment(tctx, "Send 2nd start association request\n");
        status = wrepl_associate(wrepl_socket, &associate);
-       CHECK_VALUE(associate.out.assoc_ctx, assoc_ctx1);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       printf("2nd association context: 0x%x\n", associate.out.assoc_ctx);
+       torture_assert_ntstatus_ok(tctx, status, "2nd start association failed");
+       torture_assert(tctx, associate.out.assoc_ctx == assoc_ctx1, 
+                                  "Different context returned");
+       torture_comment(tctx, "2nd association context: 0x%x\n", associate.out.assoc_ctx);
 
-       printf("Send 3rd start association request\n");
+       torture_comment(tctx, "Send 3rd start association request\n");
        status = wrepl_associate(wrepl_socket, &associate);
-       CHECK_VALUE(associate.out.assoc_ctx, assoc_ctx1);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       printf("3rd association context: 0x%x\n", associate.out.assoc_ctx);
+       torture_assert(tctx, associate.out.assoc_ctx == assoc_ctx1, 
+                                  "Different context returned");
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
+       torture_comment(tctx, "3rd association context: 0x%x\n", associate.out.assoc_ctx);
 
-done:
-       printf("Close wrepl connections\n");
+       torture_comment(tctx, "Close wrepl connections\n");
        talloc_free(wrepl_socket);
-       return ret;
+       return true;
 }
 
 
 /*
   display a replication entry
 */
-static void display_entry(TALLOC_CTX *mem_ctx, struct wrepl_name *name)
+static void display_entry(struct torture_context *tctx, struct wrepl_name *name)
 {
        int i;
 
-       printf("%s\n", nbt_name_string(mem_ctx, &name->name));
-       printf("\tTYPE:%u STATE:%u NODE:%u STATIC:%u VERSION_ID: %llu\n",
+       torture_comment(tctx, "%s\n", nbt_name_string(tctx, &name->name));
+       torture_comment(tctx, "\tTYPE:%u STATE:%u NODE:%u STATIC:%u VERSION_ID: %llu\n",
                name->type, name->state, name->node, name->is_static, (long long)name->version_id);
-       printf("\tRAW_FLAGS: 0x%08X OWNER: %-15s\n",
+       torture_comment(tctx, "\tRAW_FLAGS: 0x%08X OWNER: %-15s\n",
                name->raw_flags, name->owner);
        for (i=0;i<name->num_addresses;i++) {
-               printf("\tADDR: %-15s OWNER: %-15s\n", 
+               torture_comment(tctx, "\tADDR: %-15s OWNER: %-15s\n", 
                        name->addresses[i].address, name->addresses[i].owner);
        }
 }
@@ -250,35 +239,39 @@ static void display_entry(TALLOC_CTX *mem_ctx, struct wrepl_name *name)
 /*
   test a full replication dump from a WINS server
 */
-static BOOL test_wins_replication(TALLOC_CTX *mem_ctx, const char *address)
+static bool test_wins_replication(struct torture_context *tctx)
 {
-       BOOL ret = True;
        struct wrepl_socket *wrepl_socket;
        NTSTATUS status;
        int i, j;
        struct wrepl_associate associate;
        struct wrepl_pull_table pull_table;
        struct wrepl_pull_names pull_names;
+       struct nbt_name name;
+       const char *address;
+
+       if (!torture_nbt_get_name(tctx, &name, &address))
+               return false;
 
-       printf("Test one pull replication cycle\n");
+       torture_comment(tctx, "Test one pull replication cycle\n");
 
-       wrepl_socket = wrepl_socket_init(mem_ctx, NULL);
+       wrepl_socket = wrepl_socket_init(tctx, NULL);
        
-       printf("Setup wrepl connections\n");
+       torture_comment(tctx, "Setup wrepl connections\n");
        status = wrepl_connect(wrepl_socket, NULL, address);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
-       printf("Send a start association request\n");
+       torture_comment(tctx, "Send a start association request\n");
 
        status = wrepl_associate(wrepl_socket, &associate);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
-       printf("association context: 0x%x\n", associate.out.assoc_ctx);
+       torture_comment(tctx, "association context: 0x%x\n", associate.out.assoc_ctx);
 
-       printf("Send a replication table query\n");
+       torture_comment(tctx, "Send a replication table query\n");
        pull_table.in.assoc_ctx = associate.out.assoc_ctx;
 
-       status = wrepl_pull_table(wrepl_socket, mem_ctx, &pull_table);
+       status = wrepl_pull_table(wrepl_socket, tctx, &pull_table);
        if (NT_STATUS_EQUAL(NT_STATUS_NETWORK_ACCESS_DENIED,status)) {
                struct wrepl_packet packet;
                struct wrepl_request *req;
@@ -292,17 +285,15 @@ static BOOL test_wins_replication(TALLOC_CTX *mem_ctx, const char *address)
                req = wrepl_request_send(wrepl_socket, &packet, NULL);
                talloc_free(req);
 
-               printf("failed - We are not a valid pull partner for the server\n");
-               ret = False;
-               goto done;
+               torture_fail(tctx, "We are not a valid pull partner for the server");
        }
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
-       printf("Found %d replication partners\n", pull_table.out.num_partners);
+       torture_comment(tctx, "Found %d replication partners\n", pull_table.out.num_partners);
 
        for (i=0;i<pull_table.out.num_partners;i++) {
                struct wrepl_wins_owner *partner = &pull_table.out.partners[i];
-               printf("%s   max_version=%6llu   min_version=%6llu type=%d\n",
+               torture_comment(tctx, "%s   max_version=%6llu   min_version=%6llu type=%d\n",
                       partner->address, 
                       (long long)partner->max_version, 
                       (long long)partner->min_version, 
@@ -311,20 +302,19 @@ static BOOL test_wins_replication(TALLOC_CTX *mem_ctx, const char *address)
                pull_names.in.assoc_ctx = associate.out.assoc_ctx;
                pull_names.in.partner = *partner;
                
-               status = wrepl_pull_names(wrepl_socket, mem_ctx, &pull_names);
-               CHECK_STATUS(status, NT_STATUS_OK);
+               status = wrepl_pull_names(wrepl_socket, tctx, &pull_names);
+               CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
-               printf("Received %d names\n", pull_names.out.num_names);
+               torture_comment(tctx, "Received %d names\n", pull_names.out.num_names);
 
                for (j=0;j<pull_names.out.num_names;j++) {
-                       display_entry(mem_ctx, &pull_names.out.names[j]);
+                       display_entry(tctx, &pull_names.out.names[j]);
                }
        }
 
-done:
-       printf("Close wrepl connections\n");
+       torture_comment(tctx, "Close wrepl connections\n");
        talloc_free(wrepl_socket);
-       return ret;
+       return true;
 }
 
 struct test_wrepl_conflict_conn {
@@ -548,8 +538,8 @@ static const struct wrepl_ip addresses_X_3_4[] = {
        }
 };
 
-static struct test_wrepl_conflict_conn *test_create_conflict_ctx(TALLOC_CTX *mem_ctx,
-                                                                const char *address)
+static struct test_wrepl_conflict_conn *test_create_conflict_ctx(
+               struct torture_context *tctx, const char *address)
 {
        struct test_wrepl_conflict_conn *ctx;
        struct wrepl_associate associate;
@@ -558,14 +548,14 @@ static struct test_wrepl_conflict_conn *test_create_conflict_ctx(TALLOC_CTX *mem
        NTSTATUS status;
        uint32_t i;
 
-       ctx = talloc_zero(mem_ctx, struct test_wrepl_conflict_conn);
+       ctx = talloc_zero(tctx, struct test_wrepl_conflict_conn);
        if (!ctx) return NULL;
 
        ctx->address    = address;
        ctx->pull       = wrepl_socket_init(ctx, NULL);
        if (!ctx->pull) return NULL;
 
-       printf("Setup wrepl conflict pull connection\n");
+       torture_comment(tctx, "Setup wrepl conflict pull connection\n");
        status = wrepl_connect(ctx->pull, NULL, ctx->address);
        if (!NT_STATUS_IS_OK(status)) return NULL;
 
@@ -622,12 +612,12 @@ static struct test_wrepl_conflict_conn *test_create_conflict_ctx(TALLOC_CTX *mem
        ctx->nbtsock = nbt_name_socket_init(ctx, NULL);
        if (!ctx->nbtsock) return NULL;
 
-       ctx->myaddr = socket_address_from_strings(mem_ctx, ctx->nbtsock->sock->backend_name, iface_best_ip(address), 0);
+       ctx->myaddr = socket_address_from_strings(tctx, ctx->nbtsock->sock->backend_name, iface_best_ip(tctx->lp_ctx, address), 0);
        if (!ctx->myaddr) return NULL;
 
-       for (i = 0; i < iface_count(); i++) {
-               if (strcmp(ctx->myaddr->addr, iface_n_ip(i)) == 0) continue;
-               ctx->myaddr2 = socket_address_from_strings(mem_ctx, ctx->nbtsock->sock->backend_name, iface_n_ip(i), 0);
+       for (i = 0; i < iface_count(tctx->lp_ctx); i++) {
+               if (strcmp(ctx->myaddr->addr, iface_n_ip(tctx->lp_ctx, i)) == 0) continue;
+               ctx->myaddr2 = socket_address_from_strings(tctx, ctx->nbtsock->sock->backend_name, iface_n_ip(tctx->lp_ctx, i), 0);
                if (!ctx->myaddr2) return NULL;
                break;
        }
@@ -639,7 +629,7 @@ static struct test_wrepl_conflict_conn *test_create_conflict_ctx(TALLOC_CTX *mem
        if (!ctx->nbtsock_srv) return NULL;
 
        /* Make a port 137 version of ctx->myaddr */
-       nbt_srv_addr = socket_address_from_strings(mem_ctx, ctx->nbtsock_srv->sock->backend_name, ctx->myaddr->addr, lp_nbt_port());
+       nbt_srv_addr = socket_address_from_strings(tctx, ctx->nbtsock_srv->sock->backend_name, ctx->myaddr->addr, lp_nbt_port(tctx->lp_ctx));
        if (!nbt_srv_addr) return NULL;
 
        /* And if possible, bind to it.  This won't work unless we are root or in sockewrapper */
@@ -662,9 +652,10 @@ static struct test_wrepl_conflict_conn *test_create_conflict_ctx(TALLOC_CTX *mem
                if (!ctx->nbtsock_srv2) return NULL;
 
                /* Make a port 137 version of ctx->myaddr2 */
-               nbt_srv_addr = socket_address_from_strings(mem_ctx, 
+               nbt_srv_addr = socket_address_from_strings(tctx, 
                                                           ctx->nbtsock_srv->sock->backend_name, 
-                                                          ctx->myaddr2->addr, lp_nbt_port());
+                                                          ctx->myaddr2->addr, 
+                                                          lp_nbt_port(tctx->lp_ctx));
                if (!nbt_srv_addr) return NULL;
 
                /* And if possible, bind to it.  This won't work unless we are root or in sockewrapper */
@@ -683,12 +674,12 @@ static struct test_wrepl_conflict_conn *test_create_conflict_ctx(TALLOC_CTX *mem
        ctx->addresses_best[0].owner    = ctx->b.address;
        ctx->addresses_best[0].ip       = ctx->myaddr->addr;
 
-       ctx->addresses_all_num = iface_count();
+       ctx->addresses_all_num = iface_count(tctx->lp_ctx);
        ctx->addresses_all = talloc_array(ctx, struct wrepl_ip, ctx->addresses_all_num);
        if (!ctx->addresses_all) return NULL;
        for (i=0; i < ctx->addresses_all_num; i++) {
                ctx->addresses_all[i].owner     = ctx->b.address;
-               ctx->addresses_all[i].ip        = talloc_strdup(ctx->addresses_all, iface_n_ip(i));
+               ctx->addresses_all[i].ip        = talloc_strdup(ctx->addresses_all, iface_n_ip(tctx->lp_ctx, i));
                if (!ctx->addresses_all[i].ip) return NULL;
        }
 
@@ -711,11 +702,11 @@ static struct test_wrepl_conflict_conn *test_create_conflict_ctx(TALLOC_CTX *mem
        return ctx;
 }
 
-static BOOL test_wrepl_update_one(struct test_wrepl_conflict_conn *ctx,
+static bool test_wrepl_update_one(struct torture_context *tctx, 
+                                                                 struct test_wrepl_conflict_conn *ctx,
                                  const struct wrepl_wins_owner *owner,
                                  const struct wrepl_wins_name *name)
 {
-       BOOL ret = True;
        struct wrepl_socket *wrepl_socket;
        struct wrepl_associate associate;
        struct wrepl_packet update_packet, repl_send;
@@ -731,10 +722,10 @@ static BOOL test_wrepl_update_one(struct test_wrepl_conflict_conn *ctx,
        wrepl_socket = wrepl_socket_init(ctx, NULL);
 
        status = wrepl_connect(wrepl_socket, NULL, ctx->address);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
        status = wrepl_associate(wrepl_socket, &associate);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
        assoc_ctx = associate.out.assoc_ctx;
 
        /* now send a WREPL_REPL_UPDATE message */
@@ -753,9 +744,9 @@ static BOOL test_wrepl_update_one(struct test_wrepl_conflict_conn *ctx,
 
        status = wrepl_request(wrepl_socket, wrepl_socket,
                               &update_packet, &repl_recv);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VALUE(repl_recv->mess_type, WREPL_REPLICATION);
-       CHECK_VALUE(repl_recv->message.replication.command, WREPL_REPL_SEND_REQUEST);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
+       CHECK_VALUE(tctx, repl_recv->mess_type, WREPL_REPLICATION);
+       CHECK_VALUE(tctx, repl_recv->message.replication.command, WREPL_REPL_SEND_REQUEST);
        send_request = &repl_recv->message.replication.info.owner;
 
        ZERO_STRUCT(repl_send);
@@ -772,21 +763,20 @@ static BOOL test_wrepl_update_one(struct test_wrepl_conflict_conn *ctx,
 
        status = wrepl_request(wrepl_socket, wrepl_socket,
                               &repl_send, &repl_recv);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VALUE(repl_recv->mess_type, WREPL_STOP_ASSOCIATION);
-       CHECK_VALUE(repl_recv->message.stop.reason, 0);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
+       CHECK_VALUE(tctx, repl_recv->mess_type, WREPL_STOP_ASSOCIATION);
+       CHECK_VALUE(tctx, repl_recv->message.stop.reason, 0);
 
-done:
        talloc_free(wrepl_socket);
-       return ret;
+       return true;
 }
 
-static BOOL test_wrepl_is_applied(struct test_wrepl_conflict_conn *ctx,
+static bool test_wrepl_is_applied(struct torture_context *tctx, 
+                                                                 struct test_wrepl_conflict_conn *ctx,
                                  const struct wrepl_wins_owner *owner,
                                  const struct wrepl_wins_name *name,
-                                 BOOL expected)
+                                 bool expected)
 {
-       BOOL ret = True;
        NTSTATUS status;
        struct wrepl_pull_names pull_names;
        struct wrepl_name *names;
@@ -796,8 +786,9 @@ static BOOL test_wrepl_is_applied(struct test_wrepl_conflict_conn *ctx,
        pull_names.in.partner.min_version = pull_names.in.partner.max_version;
                
        status = wrepl_pull_names(ctx->pull, ctx->pull, &pull_names);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VALUE(pull_names.out.num_names, (expected?1:0));
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
+       torture_assert(tctx, pull_names.out.num_names == (expected?1:0), 
+                      talloc_asprintf(tctx, "Invalid number of records returned - expected %d got %d", expected, pull_names.out.num_names));
 
        names = pull_names.out.names;
 
@@ -806,34 +797,33 @@ static BOOL test_wrepl_is_applied(struct test_wrepl_conflict_conn *ctx,
                                                  names[0].state,
                                                  names[0].node,
                                                  names[0].is_static);
-               CHECK_VALUE(names[0].name.type, name->name->type);
-               CHECK_VALUE_STRING(names[0].name.name, name->name->name);
-               CHECK_VALUE_STRING(names[0].name.scope, name->name->scope);
-               CHECK_VALUE(flags, name->flags);
-               CHECK_VALUE_UINT64(names[0].version_id, name->id);
+               CHECK_VALUE(tctx, names[0].name.type, name->name->type);
+               CHECK_VALUE_STRING(tctx, names[0].name.name, name->name->name);
+               CHECK_VALUE_STRING(tctx, names[0].name.scope, name->name->scope);
+               CHECK_VALUE(tctx, flags, name->flags);
+               CHECK_VALUE_UINT64(tctx, names[0].version_id, name->id);
 
                if (flags & 2) {
-                       CHECK_VALUE(names[0].num_addresses,
+                       CHECK_VALUE(tctx, names[0].num_addresses,
                                    name->addresses.addresses.num_ips);
                } else {
-                       CHECK_VALUE(names[0].num_addresses, 1);
-                       CHECK_VALUE_STRING(names[0].addresses[0].address,
+                       CHECK_VALUE(tctx, names[0].num_addresses, 1);
+                       CHECK_VALUE_STRING(tctx, names[0].addresses[0].address,
                                           name->addresses.ip);
                }
        }
-done:
        talloc_free(pull_names.out.names);
-       return ret;
+       return true;
 }
 
-static BOOL test_wrepl_mhomed_merged(struct test_wrepl_conflict_conn *ctx,
+static bool test_wrepl_mhomed_merged(struct torture_context *tctx, 
+                                                                        struct test_wrepl_conflict_conn *ctx,
                                     const struct wrepl_wins_owner *owner1,
                                     uint32_t num_ips1, const struct wrepl_ip *ips1,
                                     const struct wrepl_wins_owner *owner2,
                                     uint32_t num_ips2, const struct wrepl_ip *ips2,
                                     const struct wrepl_wins_name *name2)
 {
-       BOOL ret = True;
        NTSTATUS status;
        struct wrepl_pull_names pull_names;
        struct wrepl_name *names;
@@ -855,8 +845,8 @@ static BOOL test_wrepl_mhomed_merged(struct test_wrepl_conflict_conn *ctx,
        pull_names.in.partner.min_version = pull_names.in.partner.max_version;
 
        status = wrepl_pull_names(ctx->pull, ctx->pull, &pull_names);
-       CHECK_STATUS(status, NT_STATUS_OK);
-       CHECK_VALUE(pull_names.out.num_names, 1);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
+       CHECK_VALUE(tctx, pull_names.out.num_names, 1);
 
        names = pull_names.out.names;
 
@@ -864,23 +854,23 @@ static BOOL test_wrepl_mhomed_merged(struct test_wrepl_conflict_conn *ctx,
                                 names[0].state,
                                 names[0].node,
                                 names[0].is_static);
-       CHECK_VALUE(names[0].name.type, name2->name->type);
-       CHECK_VALUE_STRING(names[0].name.name, name2->name->name);
-       CHECK_VALUE_STRING(names[0].name.scope, name2->name->scope);
-       CHECK_VALUE(flags, name2->flags | WREPL_TYPE_MHOMED);
-       CHECK_VALUE_UINT64(names[0].version_id, name2->id);
+       CHECK_VALUE(tctx, names[0].name.type, name2->name->type);
+       CHECK_VALUE_STRING(tctx, names[0].name.name, name2->name->name);
+       CHECK_VALUE_STRING(tctx, names[0].name.scope, name2->name->scope);
+       CHECK_VALUE(tctx, flags, name2->flags | WREPL_TYPE_MHOMED);
+       CHECK_VALUE_UINT64(tctx, names[0].version_id, name2->id);
 
-       CHECK_VALUE(names[0].num_addresses, num_ips);
+       CHECK_VALUE(tctx, names[0].num_addresses, num_ips);
 
        for (i = 0; i < names[0].num_addresses; i++) {
                const char *addr = names[0].addresses[i].address; 
                const char *owner = names[0].addresses[i].owner;
-               BOOL found = False;
+               bool found = false;
 
                for (j = 0; j < num_ips2; j++) {
                        if (strcmp(addr, ips2[j].ip) == 0) {
-                               found = True;
-                               CHECK_VALUE_STRING(owner, owner2->address);
+                               found = true;
+                               CHECK_VALUE_STRING(tctx, owner, owner2->address);
                                break;
                        }
                }
@@ -889,22 +879,22 @@ static BOOL test_wrepl_mhomed_merged(struct test_wrepl_conflict_conn *ctx,
 
                for (j = 0; j < num_ips1; j++) {
                        if (strcmp(addr, ips1[j].ip) == 0) {
-                               found = True;
-                               CHECK_VALUE_STRING(owner, owner1->address);
+                               found = true;
+                               CHECK_VALUE_STRING(tctx, owner, owner1->address);
                                break;
                        }
                }
 
                if (found) continue;
 
-               CHECK_VALUE_STRING(addr, "not found in address list");
+               CHECK_VALUE_STRING(tctx, addr, "not found in address list");
        }
-done:
        talloc_free(pull_names.out.names);
-       return ret;
+       return true;
 }
 
-static BOOL test_wrepl_sgroup_merged(struct test_wrepl_conflict_conn *ctx,
+static bool test_wrepl_sgroup_merged(struct torture_context *tctx, 
+                                                                        struct test_wrepl_conflict_conn *ctx,
                                     struct wrepl_wins_owner *merge_owner,
                                     struct wrepl_wins_owner *owner1,
                                     uint32_t num_ips1, const struct wrepl_ip *ips1,
@@ -912,7 +902,6 @@ static BOOL test_wrepl_sgroup_merged(struct test_wrepl_conflict_conn *ctx,
                                     uint32_t num_ips2, const struct wrepl_ip *ips2,
                                     const struct wrepl_wins_name *name2)
 {
-       BOOL ret = True;
        NTSTATUS status;
        struct wrepl_pull_names pull_names;
        struct wrepl_name *names;
@@ -945,7 +934,7 @@ static BOOL test_wrepl_sgroup_merged(struct test_wrepl_conflict_conn *ctx,
        pull_names.in.partner.max_version = 0;
 
        status = wrepl_pull_names(ctx->pull, ctx->pull, &pull_names);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
        names = pull_names.out.names;
        
@@ -963,30 +952,30 @@ static BOOL test_wrepl_sgroup_merged(struct test_wrepl_conflict_conn *ctx,
        }
 
        if (!name) {
-               printf("%s: Name '%s' not found\n", __location__, nbt_name_string(ctx, name2->name));
-               return False;
+               torture_comment(tctx, "%s: Name '%s' not found\n", __location__, nbt_name_string(ctx, name2->name));
+               return false;
        }
 
        flags = WREPL_NAME_FLAGS(name->type,
                                 name->state,
                                 name->node,
                                 name->is_static);
-       CHECK_VALUE(name->name.type, name2->name->type);
-       CHECK_VALUE_STRING(name->name.name, name2->name->name);
-       CHECK_VALUE_STRING(name->name.scope, name2->name->scope);
-       CHECK_VALUE(flags, name2->flags);
+       CHECK_VALUE(tctx, name->name.type, name2->name->type);
+       CHECK_VALUE_STRING(tctx, name->name.name, name2->name->name);
+       CHECK_VALUE_STRING(tctx, name->name.scope, name2->name->scope);
+       CHECK_VALUE(tctx, flags, name2->flags);
 
-       CHECK_VALUE(name->num_addresses, num_ips);
+       CHECK_VALUE(tctx, name->num_addresses, num_ips);
 
        for (i = 0; i < name->num_addresses; i++) {
                const char *addr = name->addresses[i].address; 
                const char *owner = name->addresses[i].owner;
-               BOOL found = False;
+               bool found = false;
 
                for (j = 0; j < num_ips2; j++) {
                        if (strcmp(addr, ips2[j].ip) == 0) {
-                               found = True;
-                               CHECK_VALUE_STRING(owner, ips2[j].owner);
+                               found = true;
+                               CHECK_VALUE_STRING(tctx, owner, ips2[j].owner);
                                break;
                        }
                }
@@ -995,11 +984,11 @@ static BOOL test_wrepl_sgroup_merged(struct test_wrepl_conflict_conn *ctx,
 
                for (j = 0; j < num_ips1; j++) {
                        if (strcmp(addr, ips1[j].ip) == 0) {
-                               found = True;
+                               found = true;
                                if (owner1 == &ctx->c) {
-                                       CHECK_VALUE_STRING(owner, owner1->address);
+                                       CHECK_VALUE_STRING(tctx, owner, owner1->address);
                                } else {
-                                       CHECK_VALUE_STRING(owner, ips1[j].owner);
+                                       CHECK_VALUE_STRING(tctx, owner, ips1[j].owner);
                                }
                                break;
                        }
@@ -1007,16 +996,16 @@ static BOOL test_wrepl_sgroup_merged(struct test_wrepl_conflict_conn *ctx,
 
                if (found) continue;
 
-               CHECK_VALUE_STRING(addr, "not found in address list");
+               CHECK_VALUE_STRING(tctx, addr, "not found in address list");
        }
-done:
        talloc_free(pull_names.out.names);
-       return ret;
+       return true;
 }
 
-static BOOL test_conflict_same_owner(struct test_wrepl_conflict_conn *ctx)
+static bool test_conflict_same_owner(struct torture_context *tctx, 
+                                                                        struct test_wrepl_conflict_conn *ctx)
 {
-       BOOL ret = True;
+       static bool ret = true;
        struct nbt_name name;
        struct wrepl_wins_name wins_name1;
        struct wrepl_wins_name wins_name2;
@@ -1029,7 +1018,7 @@ static BOOL test_conflict_same_owner(struct test_wrepl_conflict_conn *ctx)
                enum wrepl_name_type type;
                enum wrepl_name_state state;
                enum wrepl_name_node node;
-               BOOL is_static;
+               bool is_static;
                uint32_t num_ips;
                const struct wrepl_ip *ips;
        } records[] = {
@@ -1037,77 +1026,77 @@ static BOOL test_conflict_same_owner(struct test_wrepl_conflict_conn *ctx)
                .type           = WREPL_TYPE_GROUP,
                .state          = WREPL_STATE_ACTIVE,
                .node           = WREPL_NODE_B,
-               .is_static      = False,
+               .is_static      = false,
                .num_ips        = ARRAY_SIZE(addresses_A_1),
                .ips            = addresses_A_1,
                },{
                .type           = WREPL_TYPE_UNIQUE,
                .state          = WREPL_STATE_ACTIVE,
                .node           = WREPL_NODE_B,
-               .is_static      = False,
+               .is_static      = false,
                .num_ips        = ARRAY_SIZE(addresses_A_1),
                .ips            = addresses_A_1,
                },{
                .type           = WREPL_TYPE_UNIQUE,
                .state          = WREPL_STATE_ACTIVE,
                .node           = WREPL_NODE_B,
-               .is_static      = False,
+               .is_static      = false,
                .num_ips        = ARRAY_SIZE(addresses_A_2),
                .ips            = addresses_A_2,
                },{
                .type           = WREPL_TYPE_UNIQUE,
                .state          = WREPL_STATE_ACTIVE,
                .node           = WREPL_NODE_B,
-               .is_static      = True,
+               .is_static      = true,
                .num_ips        = ARRAY_SIZE(addresses_A_1),
                .ips            = addresses_A_1,
                },{
                .type           = WREPL_TYPE_UNIQUE,
                .state          = WREPL_STATE_ACTIVE,
                .node           = WREPL_NODE_B,
-               .is_static      = False,
+               .is_static      = false,
                .num_ips        = ARRAY_SIZE(addresses_A_2),
                .ips            = addresses_A_2,
                },{
                .type           = WREPL_TYPE_SGROUP,
                .state          = WREPL_STATE_TOMBSTONE,
                .node           = WREPL_NODE_B,
-               .is_static      = False,
+               .is_static      = false,
                .num_ips        = ARRAY_SIZE(addresses_A_2),
                .ips            = addresses_A_2,
                },{
                .type           = WREPL_TYPE_MHOMED,
                .state          = WREPL_STATE_TOMBSTONE,
                .node           = WREPL_NODE_B,
-               .is_static      = False,
+               .is_static      = false,
                .num_ips        = ARRAY_SIZE(addresses_A_1),
                .ips            = addresses_A_1,
                },{
                .type           = WREPL_TYPE_MHOMED,
                .state          = WREPL_STATE_RELEASED,
                .node           = WREPL_NODE_B,
-               .is_static      = False,
+               .is_static      = false,
                .num_ips        = ARRAY_SIZE(addresses_A_2),
                .ips            = addresses_A_2,
                },{
                .type           = WREPL_TYPE_SGROUP,
                .state          = WREPL_STATE_ACTIVE,
                .node           = WREPL_NODE_B,
-               .is_static      = False,
+               .is_static      = false,
                .num_ips        = ARRAY_SIZE(addresses_A_1),
                .ips            = addresses_A_1,
                },{
                .type           = WREPL_TYPE_SGROUP,
                .state          = WREPL_STATE_ACTIVE,
                .node           = WREPL_NODE_B,
-               .is_static      = False,
+               .is_static      = false,
                .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                .ips            = addresses_A_3_4,
                },{
                .type           = WREPL_TYPE_SGROUP,
                .state          = WREPL_STATE_TOMBSTONE,
                .node           = WREPL_NODE_B,
-               .is_static      = False,
+               .is_static      = false,
                .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                .ips            = addresses_B_3_4,
                },{
@@ -1115,7 +1104,7 @@ static BOOL test_conflict_same_owner(struct test_wrepl_conflict_conn *ctx)
                .type           = WREPL_TYPE_UNIQUE,
                .state          = WREPL_STATE_TOMBSTONE,
                .node           = WREPL_NODE_B,
-               .is_static      = False,
+               .is_static      = false,
                .num_ips        = ARRAY_SIZE(addresses_A_1),
                .ips            = addresses_A_1,
                }
@@ -1131,7 +1120,7 @@ static BOOL test_conflict_same_owner(struct test_wrepl_conflict_conn *ctx)
 
        for (j=0; ret && j < ARRAY_SIZE(types); j++) {
                name.type = types[j];
-               printf("Test Replica Conflicts with same owner[%s] for %s\n",
+               torture_comment(tctx, "Test Replica Conflicts with same owner[%s] for %s\n",
                        nbt_name_string(ctx, &name), ctx->a.address);
 
                for(i=0; ret && i < ARRAY_SIZE(records); i++) {
@@ -1140,7 +1129,7 @@ static BOOL test_conflict_same_owner(struct test_wrepl_conflict_conn *ctx)
                        wins_name_cur   = wins_name_tmp;
 
                        if (i > 0) {
-                               printf("%s,%s%s vs. %s,%s%s with %s ip(s) => %s\n",
+                               torture_comment(tctx, "%s,%s%s vs. %s,%s%s with %s ip(s) => %s\n",
                                        wrepl_name_type_string(records[i-1].type),
                                        wrepl_name_state_string(records[i-1].state),
                                        (records[i-1].is_static?",static":""),
@@ -1165,19 +1154,19 @@ static BOOL test_conflict_same_owner(struct test_wrepl_conflict_conn *ctx)
                        }
                        wins_name_cur->unknown  = "255.255.255.255";
 
-                       ret &= test_wrepl_update_one(ctx, &ctx->a,wins_name_cur);
+                       ret &= test_wrepl_update_one(tctx, ctx, &ctx->a,wins_name_cur);
                        if (records[i].state == WREPL_STATE_RELEASED) {
-                               ret &= test_wrepl_is_applied(ctx, &ctx->a, wins_name_last, False);
-                               ret &= test_wrepl_is_applied(ctx, &ctx->a, wins_name_cur, False);
+                               ret &= test_wrepl_is_applied(tctx, ctx, &ctx->a, wins_name_last, false);
+                               ret &= test_wrepl_is_applied(tctx, ctx, &ctx->a, wins_name_cur, false);
                        } else {
-                               ret &= test_wrepl_is_applied(ctx, &ctx->a, wins_name_cur, True);
+                               ret &= test_wrepl_is_applied(tctx, ctx, &ctx->a, wins_name_cur, true);
                        }
 
                        /* the first one is a cleanup run */
-                       if (!ret && i == 0) ret = True;
+                       if (!ret && i == 0) ret = true;
 
                        if (!ret) {
-                               printf("conflict handled wrong or record[%u]: %s\n", i, __location__);
+                               torture_comment(tctx, "conflict handled wrong or record[%u]: %s\n", i, __location__);
                                return ret;
                        }
                }
@@ -1185,9 +1174,10 @@ static BOOL test_conflict_same_owner(struct test_wrepl_conflict_conn *ctx)
        return ret;
 }
 
-static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
+static bool test_conflict_different_owner(struct torture_context *tctx, 
+                                                                                 struct test_wrepl_conflict_conn *ctx)
 {
-       BOOL ret = True;
+       bool ret = true;
        struct wrepl_wins_name wins_name1;
        struct wrepl_wins_name wins_name2;
        struct wrepl_wins_name *wins_name_r1;
@@ -1197,20 +1187,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                const char *line; /* just better debugging */
                struct nbt_name name;
                const char *comment;
-               BOOL extra; /* not the worst case, this is an extra test */
-               BOOL cleanup;
+               bool extra; /* not the worst case, this is an extra test */
+               bool cleanup;
                struct {
                        struct wrepl_wins_owner *owner;
                        enum wrepl_name_type type;
                        enum wrepl_name_state state;
                        enum wrepl_name_node node;
-                       BOOL is_static;
+                       bool is_static;
                        uint32_t num_ips;
                        const struct wrepl_ip *ips;
-                       BOOL apply_expected;
-                       BOOL sgroup_merge;
+                       bool apply_expected;
+                       bool sgroup_merge;
                        struct wrepl_wins_owner *merge_owner;
-                       BOOL sgroup_cleanup;
+                       bool sgroup_cleanup;
                } r1, r2;
        } records[] = {
        /* 
@@ -1221,26 +1211,26 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
        {
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
-               .cleanup= True,
+               .cleanup= true,
                .r1     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True /* ignored */
+                       .apply_expected = true /* ignored */
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True /* ignored */
+                       .apply_expected = true /* ignored */
                }
        },
 
@@ -1259,20 +1249,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1288,20 +1278,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -1317,20 +1307,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1346,20 +1336,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1375,20 +1365,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1404,20 +1394,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1437,20 +1427,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1466,20 +1456,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -1495,20 +1485,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1524,20 +1514,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1553,20 +1543,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1582,20 +1572,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1614,20 +1604,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -1643,20 +1633,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -1672,20 +1662,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1701,20 +1691,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1730,20 +1720,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1759,20 +1749,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1791,20 +1781,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1820,20 +1810,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -1849,20 +1839,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1878,20 +1868,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1907,20 +1897,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1936,20 +1926,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -1968,20 +1958,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -1997,20 +1987,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2026,20 +2016,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2055,20 +2045,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2084,20 +2074,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2113,20 +2103,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2145,20 +2135,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2174,20 +2164,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2203,20 +2193,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2232,20 +2222,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2261,20 +2251,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2290,20 +2280,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2322,20 +2312,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2351,20 +2341,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2380,20 +2370,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2409,20 +2399,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2438,20 +2428,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2467,20 +2457,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2499,20 +2489,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2528,20 +2518,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2557,20 +2547,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2586,20 +2576,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2615,20 +2605,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2644,20 +2634,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2676,20 +2666,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2705,20 +2695,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2734,20 +2724,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2763,20 +2753,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2792,20 +2782,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2821,20 +2811,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2853,20 +2843,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2882,20 +2872,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -2911,20 +2901,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2940,20 +2930,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2969,20 +2959,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -2998,20 +2988,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3030,20 +3020,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3059,20 +3049,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3088,20 +3078,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3117,20 +3107,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3149,20 +3139,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -3178,20 +3168,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -3207,20 +3197,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3236,20 +3226,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3265,20 +3255,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3294,20 +3284,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3326,20 +3316,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3355,20 +3345,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -3384,20 +3374,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3413,20 +3403,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3442,20 +3432,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3471,20 +3461,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3503,20 +3493,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3532,20 +3522,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -3561,20 +3551,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3590,20 +3580,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3619,20 +3609,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3648,20 +3638,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3680,20 +3670,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -3709,20 +3699,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -3738,20 +3728,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3767,20 +3757,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3796,20 +3786,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3825,20 +3815,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3857,20 +3847,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3886,20 +3876,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                }
        },
 
@@ -3915,20 +3905,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3944,20 +3934,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_RELEASED,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -3973,20 +3963,20 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
 
@@ -4002,45 +3992,45 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        },
        {
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
-               .cleanup= True,
+               .cleanup= true,
                .r1     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True,
+                       .apply_expected = true,
                }
        },
 /*
@@ -4054,27 +4044,27 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:A_3_4 vs. B:A_3_4",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = False,
-                       .sgroup_cleanup = True
+                       .apply_expected = false,
+                       .sgroup_cleanup = true
                }
        },
        /* 
@@ -4085,27 +4075,27 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:A_3_4 vs. B:NULL",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .apply_expected = False,
-                       .sgroup_cleanup = True
+                       .apply_expected = false,
+                       .sgroup_cleanup = true
                }
        },
        /* 
@@ -4116,51 +4106,51 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:A_3_4_X_3_4 vs. B:A_3_4",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4_X_3_4),
                        .ips            = addresses_A_3_4_X_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = False,
+                       .apply_expected = false,
                }
        },
        {
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
-               .cleanup= True,
+               .cleanup= true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .apply_expected = False,
+                       .apply_expected = false,
                },
                .r2     = {
                        .owner          = &ctx->x,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .apply_expected = False,
+                       .apply_expected = false,
                }
        },
        /* 
@@ -4171,27 +4161,27 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:B_3_4 vs. B:A_3_4",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True,
-                       .sgroup_cleanup = True
+                       .apply_expected = true,
+                       .sgroup_cleanup = true
                }
        },
        /* 
@@ -4202,27 +4192,27 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:A_3_4 vs. B:A_3_4_OWNER_B",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4_OWNER_B),
                        .ips            = addresses_A_3_4_OWNER_B,
-                       .apply_expected = True,
-                       .sgroup_cleanup = True
+                       .apply_expected = true,
+                       .sgroup_cleanup = true
                }
        },
        /* 
@@ -4233,27 +4223,27 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:A_3_4_OWNER_B vs. B:A_3_4",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4_OWNER_B),
                        .ips            = addresses_A_3_4_OWNER_B,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True,
-                       .sgroup_cleanup = True
+                       .apply_expected = true,
+                       .sgroup_cleanup = true
                }
        },
        /* 
@@ -4264,27 +4254,27 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:A_3_4 vs. B:B_3_4 => C:A_3_4_B_3_4",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .sgroup_merge   = True,
-                       .sgroup_cleanup = True,
+                       .sgroup_merge   = true,
+                       .sgroup_cleanup = true,
                }
        },
        /* 
@@ -4295,53 +4285,53 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:B_3_4_X_3_4 vs. B:A_3_4 => B:A_3_4_X_3_4",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4_X_3_4),
                        .ips            = addresses_B_3_4_X_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .sgroup_merge   = True,
+                       .sgroup_merge   = true,
                        .merge_owner    = &ctx->b,
-                       .sgroup_cleanup = False
+                       .sgroup_cleanup = false
                }
        },
        {
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
-               .cleanup= True,
+               .cleanup= true,
                .r1     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4_X_3_4_OWNER_B),
                        .ips            = addresses_A_3_4_X_3_4_OWNER_B,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .apply_expected = False,
+                       .apply_expected = false,
                }
        },
        /* 
@@ -4352,52 +4342,52 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:X_3_4 vs. B:A_3_4 => C:A_3_4_X_3_4",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_X_3_4),
                        .ips            = addresses_X_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .sgroup_merge   = True,
-                       .sgroup_cleanup = False
+                       .sgroup_merge   = true,
+                       .sgroup_cleanup = false
                }
        },
        {
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
-               .cleanup= True,
+               .cleanup= true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .apply_expected = False,
+                       .apply_expected = false,
                },
                .r2     = {
                        .owner          = &ctx->x,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .apply_expected = False,
+                       .apply_expected = false,
                }
        },
        /* 
@@ -4408,52 +4398,52 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:A_3_4_X_3_4 vs. B:A_3_4_OWNER_B => B:A_3_4_OWNER_B_X_3_4",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4_X_3_4),
                        .ips            = addresses_A_3_4_X_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4_OWNER_B),
                        .ips            = addresses_A_3_4_OWNER_B,
-                       .sgroup_merge   = True,
+                       .sgroup_merge   = true,
                        .merge_owner    = &ctx->b,
                }
        },
        {
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
-               .cleanup= True,
+               .cleanup= true,
                .r1     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .apply_expected = False,
+                       .apply_expected = false,
                },
                .r2     = {
                        .owner          = &ctx->x,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .apply_expected = False,
+                       .apply_expected = false,
                }
        },
        /* 
@@ -4464,52 +4454,52 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:B_3_4_X_3_4 vs. B:B_3_4_X_1_2 => C:B_3_4_X_1_2_3_4",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4_X_3_4),
                        .ips            = addresses_B_3_4_X_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4_X_1_2),
                        .ips            = addresses_B_3_4_X_1_2,
-                       .sgroup_merge   = True,
-                       .sgroup_cleanup = False
+                       .sgroup_merge   = true,
+                       .sgroup_cleanup = false
                }
        },
        {
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
-               .cleanup= True,
+               .cleanup= true,
                .r1     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .apply_expected = False,
+                       .apply_expected = false,
                },
                .r2     = {
                        .owner          = &ctx->x,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .apply_expected = False,
+                       .apply_expected = false,
                }
        },
        /* 
@@ -4520,53 +4510,53 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:A_3_4_B_3_4 vs. B:NULL => B:A_3_4",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4_B_3_4),
                        .ips            = addresses_A_3_4_B_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .sgroup_merge   = True,
+                       .sgroup_merge   = true,
                        .merge_owner    = &ctx->b,
-                       .sgroup_cleanup = True
+                       .sgroup_cleanup = true
                }
        },
        {
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
-               .cleanup= True,
+               .cleanup= true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .apply_expected = False,
+                       .apply_expected = false,
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True,
+                       .apply_expected = true,
                }
        },
        /* 
@@ -4577,53 +4567,53 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:B_3_4_X_3_4 vs. B:NULL => B:X_3_4",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4_X_3_4),
                        .ips            = addresses_B_3_4_X_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .sgroup_merge   = True,
+                       .sgroup_merge   = true,
                        .merge_owner    = &ctx->b,
-                       .sgroup_cleanup = True
+                       .sgroup_cleanup = true
                }
        },
        {
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
-               .cleanup= True,
+               .cleanup= true,
                .r1     = {
                        .owner          = &ctx->x,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .apply_expected = False,
+                       .apply_expected = false,
                },
                .r2     = {
                        .owner          = &ctx->x,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True,
+                       .apply_expected = true,
                }
        },
 
@@ -4635,26 +4625,26 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:B_3_4_X_3_4 vs. B:NULL => B:NULL",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4_X_3_4),
                        .ips            = addresses_B_3_4_X_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = 0,
                        .ips            = NULL,
-                       .apply_expected = True,
+                       .apply_expected = true,
                }
        },
        /* 
@@ -4665,26 +4655,26 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:B_3_4_X_3_4 vs. B:A_3_4 => B:A_3_4",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4_X_3_4),
                        .ips            = addresses_B_3_4_X_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                }
        },
        /* 
@@ -4695,26 +4685,26 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:B_3_4_X_3_4 vs. B:B_3_4 => B:B_3_4",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4_X_3_4),
                        .ips            = addresses_B_3_4_X_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                }
        },
        /* 
@@ -4725,26 +4715,26 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
                .comment= "A:B_3_4_X_3_4 vs. B:B_3_4_X_3_4 => B:B_3_4_X_3_4",
-               .extra  = True,
+               .extra  = true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4_X_3_4),
                        .ips            = addresses_B_3_4_X_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                },
                .r2     = {
                        .owner          = &ctx->b,
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4_X_3_4),
                        .ips            = addresses_B_3_4_X_3_4,
-                       .apply_expected = True,
+                       .apply_expected = true,
                }
        },
 
@@ -4756,46 +4746,46 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
        {
                .line   = __location__,
                .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
-               .cleanup= True,
+               .cleanup= true,
                .r1     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .r2     = {
                        .owner          = &ctx->a,
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_A_1),
                        .ips            = addresses_A_1,
-                       .apply_expected = True
+                       .apply_expected = true
                }
        }}; /* do not add entries here, this should be the last record! */
 
        wins_name_r1    = &wins_name1;
        wins_name_r2    = &wins_name2;
 
-       printf("Test Replica Conflicts with different owners\n");
+       torture_comment(tctx, "Test Replica Conflicts with different owners\n");
 
        for(i=0; ret && i < ARRAY_SIZE(records); i++) {
 
                if (!records[i].extra && !records[i].cleanup) {
                        /* we should test the worst cases */
                        if (records[i].r2.apply_expected && records[i].r1.ips==records[i].r2.ips) {
-                               printf("(%s) Programmer error, invalid record[%u]: %s\n",
+                               torture_comment(tctx, "(%s) Programmer error, invalid record[%u]: %s\n",
                                        __location__, i, records[i].line);
-                               return False;
+                               return false;
                        } else if (!records[i].r2.apply_expected && records[i].r1.ips!=records[i].r2.ips) {
-                               printf("(%s) Programmer error, invalid record[%u]: %s\n",
+                               torture_comment(tctx, "(%s) Programmer error, invalid record[%u]: %s\n",
                                        __location__, i, records[i].line);
-                               return False;
+                               return false;
                        }
                }
 
@@ -4819,7 +4809,7 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                                ips = "with different ip(s)";
                        }
 
-                       printf("%s,%s%s vs. %s,%s%s %s => %s\n",
+                       torture_comment(tctx, "%s,%s%s vs. %s,%s%s %s => %s\n",
                                wrepl_name_type_string(records[i].r1.type),
                                wrepl_name_state_string(records[i].r1.state),
                                (records[i].r1.is_static?",static":""),
@@ -4848,8 +4838,8 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                wins_name_r1->unknown   = "255.255.255.255";
 
                /* now apply R1 */
-               ret &= test_wrepl_update_one(ctx, records[i].r1.owner, wins_name_r1);
-               ret &= test_wrepl_is_applied(ctx, records[i].r1.owner,
+               ret &= test_wrepl_update_one(tctx, ctx, records[i].r1.owner, wins_name_r1);
+               ret &= test_wrepl_is_applied(tctx, ctx, records[i].r1.owner,
                                             wins_name_r1, records[i].r1.apply_expected);
 
                /*
@@ -4870,34 +4860,34 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                wins_name_r2->unknown   = "255.255.255.255";
 
                /* now apply R2 */
-               ret &= test_wrepl_update_one(ctx, records[i].r2.owner, wins_name_r2);
+               ret &= test_wrepl_update_one(tctx, ctx, records[i].r2.owner, wins_name_r2);
                if (records[i].r1.state == WREPL_STATE_RELEASED) {
-                       ret &= test_wrepl_is_applied(ctx, records[i].r1.owner,
-                                                    wins_name_r1, False);
+                       ret &= test_wrepl_is_applied(tctx, ctx, records[i].r1.owner,
+                                                    wins_name_r1, false);
                } else if (records[i].r2.sgroup_merge) {
-                       ret &= test_wrepl_sgroup_merged(ctx, records[i].r2.merge_owner,
+                       ret &= test_wrepl_sgroup_merged(tctx, ctx, records[i].r2.merge_owner,
                                                        records[i].r1.owner,
                                                        records[i].r1.num_ips, records[i].r1.ips,
                                                        records[i].r2.owner,
                                                        records[i].r2.num_ips, records[i].r2.ips,
                                                        wins_name_r2);
                } else if (records[i].r1.owner != records[i].r2.owner) {
-                       BOOL _expected;
+                       bool _expected;
                        _expected = (records[i].r1.apply_expected && !records[i].r2.apply_expected);
-                       ret &= test_wrepl_is_applied(ctx, records[i].r1.owner,
+                       ret &= test_wrepl_is_applied(tctx, ctx, records[i].r1.owner,
                                                     wins_name_r1, _expected);
                }
                if (records[i].r2.state == WREPL_STATE_RELEASED) {
-                       ret &= test_wrepl_is_applied(ctx, records[i].r2.owner,
-                                                    wins_name_r2, False);
+                       ret &= test_wrepl_is_applied(tctx, ctx, records[i].r2.owner,
+                                                    wins_name_r2, false);
                } else if (!records[i].r2.sgroup_merge) {
-                       ret &= test_wrepl_is_applied(ctx, records[i].r2.owner,
+                       ret &= test_wrepl_is_applied(tctx, ctx, records[i].r2.owner,
                                                     wins_name_r2, records[i].r2.apply_expected);
                }
 
                if (records[i].r2.sgroup_cleanup) {
                        if (!ret) {
-                               printf("failed before sgroup_cleanup record[%u]: %s\n", i, records[i].line);
+                               torture_comment(tctx, "failed before sgroup_cleanup record[%u]: %s\n", i, records[i].line);
                                return ret;
                        }
 
@@ -4905,16 +4895,16 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        wins_name_r1->name      = &records[i].name;
                        wins_name_r1->flags     = WREPL_NAME_FLAGS(WREPL_TYPE_SGROUP,
                                                                   WREPL_STATE_ACTIVE,
-                                                                  WREPL_NODE_B, False);
+                                                                  WREPL_NODE_B, false);
                        wins_name_r1->id        = ++records[i].r1.owner->max_version;
                        wins_name_r1->addresses.addresses.num_ips = 0;
                        wins_name_r1->addresses.addresses.ips     = NULL;
                        wins_name_r1->unknown   = "255.255.255.255";
-                       ret &= test_wrepl_update_one(ctx, records[i].r1.owner, wins_name_r1);
+                       ret &= test_wrepl_update_one(tctx, ctx, records[i].r1.owner, wins_name_r1);
 
                        /* here we test how names from an owner are deleted */
                        if (records[i].r2.sgroup_merge && records[i].r2.num_ips) {
-                               ret &= test_wrepl_sgroup_merged(ctx, NULL,
+                               ret &= test_wrepl_sgroup_merged(tctx, ctx, NULL,
                                                                records[i].r2.owner,
                                                                records[i].r2.num_ips, records[i].r2.ips,
                                                                records[i].r1.owner,
@@ -4926,48 +4916,48 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
                        wins_name_r2->name      = &records[i].name;
                        wins_name_r2->flags     = WREPL_NAME_FLAGS(WREPL_TYPE_SGROUP,
                                                                   WREPL_STATE_ACTIVE,
-                                                                  WREPL_NODE_B, False);
+                                                                  WREPL_NODE_B, false);
                        wins_name_r2->id        = ++records[i].r2.owner->max_version;
                        wins_name_r2->addresses.addresses.num_ips = 0;
                        wins_name_r2->addresses.addresses.ips     = NULL;
                        wins_name_r2->unknown   = "255.255.255.255";
-                       ret &= test_wrepl_update_one(ctx, records[i].r2.owner, wins_name_r2);
+                       ret &= test_wrepl_update_one(tctx, ctx, records[i].r2.owner, wins_name_r2);
 
                        /* take ownership of the SGROUP record */
                        wins_name_r2->name      = &records[i].name;
                        wins_name_r2->flags     = WREPL_NAME_FLAGS(WREPL_TYPE_SGROUP,
                                                                   WREPL_STATE_ACTIVE,
-                                                                  WREPL_NODE_B, False);
+                                                                  WREPL_NODE_B, false);
                        wins_name_r2->id        = ++records[i].r2.owner->max_version;
                        wins_name_r2->addresses.addresses.num_ips = ARRAY_SIZE(addresses_B_1);
                        wins_name_r2->addresses.addresses.ips     = discard_const(addresses_B_1);
                        wins_name_r2->unknown   = "255.255.255.255";
-                       ret &= test_wrepl_update_one(ctx, records[i].r2.owner, wins_name_r2);
-                       ret &= test_wrepl_is_applied(ctx, records[i].r2.owner, wins_name_r2, True);
+                       ret &= test_wrepl_update_one(tctx, ctx, records[i].r2.owner, wins_name_r2);
+                       ret &= test_wrepl_is_applied(tctx, ctx, records[i].r2.owner, wins_name_r2, true);
 
                        /* overwrite the SGROUP record with unique,tombstone */
                        wins_name_r2->name      = &records[i].name;
                        wins_name_r2->flags     = WREPL_NAME_FLAGS(WREPL_TYPE_SGROUP,
                                                                   WREPL_STATE_TOMBSTONE,
-                                                                  WREPL_NODE_B, False);
+                                                                  WREPL_NODE_B, false);
                        wins_name_r2->id        = ++records[i].r2.owner->max_version;
                        wins_name_r2->addresses.addresses.num_ips = ARRAY_SIZE(addresses_B_1);
                        wins_name_r2->addresses.addresses.ips     = discard_const(addresses_B_1);
                        wins_name_r2->unknown   = "255.255.255.255";
-                       ret &= test_wrepl_update_one(ctx, records[i].r2.owner, wins_name_r2);
-                       ret &= test_wrepl_is_applied(ctx, records[i].r2.owner, wins_name_r2, True);
+                       ret &= test_wrepl_update_one(tctx, ctx, records[i].r2.owner, wins_name_r2);
+                       ret &= test_wrepl_is_applied(tctx, ctx, records[i].r2.owner, wins_name_r2, true);
 
                        if (!ret) {
-                               printf("failed in sgroup_cleanup record[%u]: %s\n", i, records[i].line);
+                               torture_comment(tctx, "failed in sgroup_cleanup record[%u]: %s\n", i, records[i].line);
                                return ret;
                        }
                }
 
                /* the first one is a cleanup run */
-               if (!ret && i == 0) ret = True;
+               if (!ret && i == 0) ret = true;
 
                if (!ret) {
-                       printf("conflict handled wrong or record[%u]: %s\n", i, records[i].line);
+                       torture_comment(tctx, "conflict handled wrong or record[%u]: %s\n", i, records[i].line);
                        return ret;
                }
        }
@@ -4975,9 +4965,10 @@ static BOOL test_conflict_different_owner(struct test_wrepl_conflict_conn *ctx)
        return ret;
 }
 
-static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_conn *ctx)
+static bool test_conflict_owned_released_vs_replica(struct torture_context *tctx,
+                                                                                                       struct test_wrepl_conflict_conn *ctx)
 {
-       BOOL ret = True;
+       bool ret = true;
        NTSTATUS status;
        struct wrepl_wins_name wins_name_;
        struct wrepl_wins_name *wins_name = &wins_name_;
@@ -4991,19 +4982,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                struct nbt_name name;
                struct {
                        uint32_t nb_flags;
-                       BOOL mhomed;
+                       bool mhomed;
                        uint32_t num_ips;
                        const struct wrepl_ip *ips;
-                       BOOL apply_expected;
+                       bool apply_expected;
                } wins;
                struct {
                        enum wrepl_name_type type;
                        enum wrepl_name_state state;
                        enum wrepl_name_node node;
-                       BOOL is_static;
+                       bool is_static;
                        uint32_t num_ips;
                        const struct wrepl_ip *ips;
-                       BOOL apply_expected;
+                       bool apply_expected;
                } replica;
        } records[] = {
 /* 
@@ -5017,19 +5008,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_UA_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5040,19 +5031,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_UA_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5063,19 +5054,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_UT_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5086,19 +5077,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_UT_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
 /* 
@@ -5112,19 +5103,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_GA_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5135,19 +5126,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_GA_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5158,19 +5149,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_GT_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5181,19 +5172,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_GT_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
 /* 
@@ -5207,19 +5198,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_SA_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5230,19 +5221,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_SA_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5253,19 +5244,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_ST_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5276,19 +5267,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_ST_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
 /* 
@@ -5302,19 +5293,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_MA_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5325,19 +5316,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_MA_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5348,19 +5339,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_MT_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5371,19 +5362,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_UR_MT_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
 /* 
@@ -5397,19 +5388,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_UA_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -5420,19 +5411,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_UA_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -5443,19 +5434,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_UT_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -5466,19 +5457,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_UT_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -5492,19 +5483,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_GA_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5515,19 +5506,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_GA_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5538,19 +5529,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_GT_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5561,19 +5552,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_GT_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
 /* 
@@ -5587,19 +5578,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_SA_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -5610,19 +5601,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_SA_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -5633,19 +5624,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_ST_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -5656,19 +5647,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_ST_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -5682,19 +5673,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_MA_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -5705,19 +5696,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_MA_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -5728,19 +5719,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_MT_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -5751,19 +5742,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_GR_MT_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -5777,19 +5768,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_UA_SI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5800,19 +5791,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_UA_DI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5823,19 +5814,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_UT_SI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5846,19 +5837,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_UT_DI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
 /* 
@@ -5872,19 +5863,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_GA_SI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5895,19 +5886,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_GA_DI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5918,19 +5909,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_GT_SI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5941,19 +5932,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_GT_DI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
 /* 
@@ -5967,19 +5958,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_SA_SI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -5990,19 +5981,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_SA_DI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6013,19 +6004,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_ST_SI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6036,19 +6027,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_ST_DI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
 /* 
@@ -6062,19 +6053,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_MA_SI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6085,19 +6076,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_MA_DI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6108,19 +6099,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_MT_SI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6131,19 +6122,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_SR_MT_DI", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
 /* 
@@ -6157,19 +6148,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_UA_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6180,19 +6171,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_UA_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6203,19 +6194,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_UT_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6226,19 +6217,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_UT_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
 /* 
@@ -6252,19 +6243,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_GA_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6275,19 +6266,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_GA_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6298,19 +6289,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_GT_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6321,19 +6312,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_GT_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
 /* 
@@ -6347,19 +6338,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_SA_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6370,19 +6361,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_SA_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6393,19 +6384,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_ST_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6416,19 +6407,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_ST_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
 /* 
@@ -6442,19 +6433,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_MA_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6465,19 +6456,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_MA_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6488,19 +6479,19 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_MT_SI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6511,27 +6502,27 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                .name   = _NBT_NAME("_MR_MT_DI", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        };
 
-       printf("Test Replica records vs. owned released records\n");
+       torture_comment(tctx, "Test Replica records vs. owned released records\n");
 
        for(i=0; ret && i < ARRAY_SIZE(records); i++) {
-               printf("%s => %s\n", nbt_name_string(ctx, &records[i].name),
+               torture_comment(tctx, "%s => %s\n", nbt_name_string(ctx, &records[i].name),
                        (records[i].replica.apply_expected?"REPLACE":"NOT REPLACE"));
 
                /*
@@ -6541,8 +6532,8 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                name_register->in.dest_addr     = ctx->address;
                name_register->in.address       = records[i].wins.ips[0].ip;
                name_register->in.nb_flags      = records[i].wins.nb_flags;
-               name_register->in.register_demand= False;
-               name_register->in.broadcast     = False;
+               name_register->in.register_demand= false;
+               name_register->in.broadcast     = false;
                name_register->in.multi_homed   = records[i].wins.mhomed;
                name_register->in.ttl           = 300000;
                name_register->in.timeout       = 70;
@@ -6550,41 +6541,41 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
 
                status = nbt_name_register(ctx->nbtsock, ctx, name_register);
                if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
-                       printf("No response from %s for name register\n", ctx->address);
-                       ret = False;
+                       torture_comment(tctx, "No response from %s for name register\n", ctx->address);
+                       ret = false;
                }
                if (!NT_STATUS_IS_OK(status)) {
-                       printf("Bad response from %s for name register - %s\n",
+                       torture_comment(tctx, "Bad response from %s for name register - %s\n",
                               ctx->address, nt_errstr(status));
-                       ret = False;
+                       ret = false;
                }
-               CHECK_VALUE(name_register->out.rcode, 0);
-               CHECK_VALUE_STRING(name_register->out.reply_from, ctx->address);
-               CHECK_VALUE(name_register->out.name.type, records[i].name.type);
-               CHECK_VALUE_STRING(name_register->out.name.name, records[i].name.name);
-               CHECK_VALUE_STRING(name_register->out.name.scope, records[i].name.scope);
-               CHECK_VALUE_STRING(name_register->out.reply_addr, records[i].wins.ips[0].ip);
+               CHECK_VALUE(tctx, name_register->out.rcode, 0);
+               CHECK_VALUE_STRING(tctx, name_register->out.reply_from, ctx->address);
+               CHECK_VALUE(tctx, name_register->out.name.type, records[i].name.type);
+               CHECK_VALUE_STRING(tctx, name_register->out.name.name, records[i].name.name);
+               CHECK_VALUE_STRING(tctx, name_register->out.name.scope, records[i].name.scope);
+               CHECK_VALUE_STRING(tctx, name_register->out.reply_addr, records[i].wins.ips[0].ip);
 
                /* release the record */
                release->in.name        = records[i].name;
                release->in.dest_addr   = ctx->address;
                release->in.address     = records[i].wins.ips[0].ip;
                release->in.nb_flags    = records[i].wins.nb_flags;
-               release->in.broadcast   = False;
+               release->in.broadcast   = false;
                release->in.timeout     = 30;
                release->in.retries     = 0;
 
                status = nbt_name_release(ctx->nbtsock, ctx, release);
                if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
-                       printf("No response from %s for name release\n", ctx->address);
-                       return False;
+                       torture_comment(tctx, "No response from %s for name release\n", ctx->address);
+                       return false;
                }
                if (!NT_STATUS_IS_OK(status)) {
-                       printf("Bad response from %s for name query - %s\n",
+                       torture_comment(tctx, "Bad response from %s for name query - %s\n",
                               ctx->address, nt_errstr(status));
-                       return False;
+                       return false;
                }
-               CHECK_VALUE(release->out.rcode, 0);
+               CHECK_VALUE(tctx, release->out.rcode, 0);
 
                /*
                 * Setup Replica
@@ -6603,45 +6594,44 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                }
                wins_name->unknown      = "255.255.255.255";
 
-               ret &= test_wrepl_update_one(ctx, &ctx->b, wins_name);
-               ret &= test_wrepl_is_applied(ctx, &ctx->b, wins_name,
+               ret &= test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
+               ret &= test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name,
                                             records[i].replica.apply_expected);
 
                if (records[i].replica.apply_expected) {
                        wins_name->name         = &records[i].name;
                        wins_name->flags        = WREPL_NAME_FLAGS(WREPL_TYPE_UNIQUE,
                                                                   WREPL_STATE_TOMBSTONE,
-                                                                  WREPL_NODE_B, False);
+                                                                  WREPL_NODE_B, false);
                        wins_name->id           = ++ctx->b.max_version;
                        wins_name->addresses.ip = addresses_B_1[0].ip;
                        wins_name->unknown      = "255.255.255.255";
 
-                       ret &= test_wrepl_update_one(ctx, &ctx->b, wins_name);
-                       ret &= test_wrepl_is_applied(ctx, &ctx->b, wins_name, True);
+                       ret &= test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
+                       ret &= test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name, true);
                } else {
                        release->in.name        = records[i].name;
                        release->in.dest_addr   = ctx->address;
                        release->in.address     = records[i].wins.ips[0].ip;
                        release->in.nb_flags    = records[i].wins.nb_flags;
-                       release->in.broadcast   = False;
+                       release->in.broadcast   = false;
                        release->in.timeout     = 30;
                        release->in.retries     = 0;
 
                        status = nbt_name_release(ctx->nbtsock, ctx, release);
                        if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
-                               printf("No response from %s for name release\n", ctx->address);
-                               return False;
+                               torture_comment(tctx, "No response from %s for name release\n", ctx->address);
+                               return false;
                        }
                        if (!NT_STATUS_IS_OK(status)) {
-                               printf("Bad response from %s for name query - %s\n",
+                               torture_comment(tctx, "Bad response from %s for name query - %s\n",
                                       ctx->address, nt_errstr(status));
-                               return False;
+                               return false;
                        }
-                       CHECK_VALUE(release->out.rcode, 0);
+                       CHECK_VALUE(tctx, release->out.rcode, 0);
                }
-done:
                if (!ret) {
-                       printf("conflict handled wrong or record[%u]: %s\n", i, records[i].line);
+                       torture_comment(tctx, "conflict handled wrong or record[%u]: %s\n", i, records[i].line);
                        return ret;
                }
        }
@@ -6654,20 +6644,20 @@ struct test_conflict_owned_active_vs_replica_struct {
        const char *section; /* just better debugging */
        struct nbt_name name;
        const char *comment;
-       BOOL skip;
+       bool skip;
        struct {
                uint32_t nb_flags;
-               BOOL mhomed;
+               bool mhomed;
                uint32_t num_ips;
                const struct wrepl_ip *ips;
-               BOOL apply_expected;
+               bool apply_expected;
        } wins;
        struct {
                uint32_t timeout;
-               BOOL positive;
-               BOOL expect_release;
-               BOOL late_release;
-               BOOL ret;
+               bool positive;
+               bool expect_release;
+               bool late_release;
+               bool ret;
                /* when num_ips == 0, then .wins.ips are used */
                uint32_t num_ips;
                const struct wrepl_ip *ips;
@@ -6676,12 +6666,12 @@ struct test_conflict_owned_active_vs_replica_struct {
                enum wrepl_name_type type;
                enum wrepl_name_state state;
                enum wrepl_name_node node;
-               BOOL is_static;
+               bool is_static;
                uint32_t num_ips;
                const struct wrepl_ip *ips;
-               BOOL apply_expected;
-               BOOL mhomed_merge;
-               BOOL sgroup_merge;
+               bool apply_expected;
+               bool mhomed_merge;
+               bool sgroup_merge;
        } replica;
 };
 
@@ -6689,9 +6679,10 @@ static void test_conflict_owned_active_vs_replica_handler(struct nbt_name_socket
                                                          struct nbt_name_packet *req_packet, 
                                                          struct socket_address *src);
 
-static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_conn *ctx)
+static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
+                                                                                                 struct test_wrepl_conflict_conn *ctx)
 {
-       BOOL ret = True;
+       bool ret = true;
        NTSTATUS status;
        struct wrepl_wins_name wins_name_;
        struct wrepl_wins_name *wins_name = &wins_name_;
@@ -6704,6 +6695,7 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
 /* 
  * unique vs. unique section
  */
+#if METZE_NEEDS_TO_LOOK_AT_THIS_ONE
        /*
         * unique,active vs. unique,active with same ip(s), unchecked
         */
@@ -6712,10 +6704,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_UA_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -6724,12 +6716,13 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
+#endif
        /*
         * unique,active vs. unique,active with different ip(s), positive response
         */
@@ -6738,23 +6731,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_UA_DI_P", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -6765,14 +6758,14 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_UA_DI_O", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
                },
@@ -6780,10 +6773,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -6794,23 +6787,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_UA_DI_N", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = False,
+                       .positive       = false,
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6821,10 +6814,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_UT_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -6833,10 +6826,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -6847,10 +6840,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_UT_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -6859,10 +6852,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -6876,23 +6869,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_GA_SI_R", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .expect_release = True,
+                       .expect_release = true,
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6903,23 +6896,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_GA_DI_R", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .expect_release = True,
+                       .expect_release = true,
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -6930,10 +6923,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_GT_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -6942,10 +6935,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -6956,10 +6949,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_GT_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -6968,10 +6961,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -6985,23 +6978,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_SA_SI_R", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .expect_release = True,
+                       .expect_release = true,
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -7012,23 +7005,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_SA_DI_R", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .expect_release = True,
+                       .expect_release = true,
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -7039,10 +7032,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_ST_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7051,10 +7044,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7065,10 +7058,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_ST_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7077,10 +7070,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -7094,10 +7087,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_MA_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7106,10 +7099,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -7120,10 +7113,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_MA_SP_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7132,10 +7125,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_all_num,
                        .ips            = ctx->addresses_all,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -7146,23 +7139,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_MA_DI_P", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7173,14 +7166,14 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_MA_DI_O", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
                },
@@ -7188,10 +7181,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7202,23 +7195,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_MA_DI_N", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = False,
+                       .positive       = false,
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -7229,10 +7222,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_MT_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7241,10 +7234,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7255,10 +7248,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_UA_MT_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7267,10 +7260,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -7284,10 +7277,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_UA_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7296,10 +7289,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7310,10 +7303,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_UA_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7322,10 +7315,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7336,10 +7329,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_UT_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7348,10 +7341,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7362,10 +7355,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_UT_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7374,10 +7367,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -7391,10 +7384,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_GA_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7403,10 +7396,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -7417,10 +7410,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_GA_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7429,10 +7422,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -7443,10 +7436,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_GT_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7455,10 +7448,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7469,10 +7462,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_GT_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7481,10 +7474,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -7498,10 +7491,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_SA_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7510,10 +7503,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7524,10 +7517,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_SA_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7536,10 +7529,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7550,10 +7543,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_ST_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7562,10 +7555,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7576,10 +7569,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_ST_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7588,10 +7581,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -7605,10 +7598,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_MA_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7617,10 +7610,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7631,10 +7624,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_MA_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7643,10 +7636,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7657,10 +7650,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_MT_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7669,10 +7662,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7683,10 +7676,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_GA_MT_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7695,10 +7688,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -7712,10 +7705,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_SA_UA_SI_U", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7724,10 +7717,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7738,10 +7731,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_SA_UA_DI_U", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7750,10 +7743,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7764,10 +7757,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_SA_UT_SI_U", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7776,10 +7769,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7790,10 +7783,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_SA_UT_DI_U", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7802,10 +7795,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -7819,10 +7812,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_SA_GA_SI_U", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7831,10 +7824,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7845,10 +7838,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_SA_GA_DI_U", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7857,10 +7850,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7871,10 +7864,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_SA_GT_SI_U", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7883,10 +7876,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7897,10 +7890,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_SA_GT_DI_U", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7909,10 +7902,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -7926,10 +7919,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_SA_MA_SI_U", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7938,10 +7931,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7952,10 +7945,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_SA_MA_DI_U", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7964,10 +7957,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -7978,10 +7971,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_SA_MT_SI_U", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -7990,10 +7983,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -8004,10 +7997,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_SA_MT_DI_U", 0x1C, NULL),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8016,10 +8009,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -8033,10 +8026,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_UA_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8045,10 +8038,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -8059,23 +8052,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_UA_DI_P", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -8086,14 +8079,14 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_UA_DI_O", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
                },
@@ -8101,10 +8094,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -8115,23 +8108,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_UA_DI_N", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = False,
+                       .positive       = false,
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -8142,10 +8135,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_UT_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8154,10 +8147,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -8168,10 +8161,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_UT_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8180,10 +8173,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -8197,23 +8190,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_GA_SI_R", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .expect_release = True,
+                       .expect_release = true,
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -8224,23 +8217,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_GA_DI_R", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .expect_release = True,
+                       .expect_release = true,
                },
                .replica= {
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -8251,10 +8244,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_GT_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8263,10 +8256,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -8277,10 +8270,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_GT_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8289,10 +8282,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_GROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -8306,23 +8299,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_SA_SI_R", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .expect_release = True,
+                       .expect_release = true,
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -8333,23 +8326,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_SA_DI_R", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .expect_release = True,
+                       .expect_release = true,
                },
                .replica= {
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -8360,10 +8353,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_ST_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8372,10 +8365,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -8386,10 +8379,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_ST_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8398,10 +8391,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_1),
                        .ips            = addresses_B_1,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /* 
@@ -8415,10 +8408,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_MA_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8427,10 +8420,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -8441,10 +8434,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_MA_SP_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8453,10 +8446,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_all_num,
                        .ips            = ctx->addresses_all,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -8467,23 +8460,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_MA_DI_P", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -8494,14 +8487,14 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_MA_DI_O", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                        .num_ips        = ARRAY_SIZE(addresses_A_3_4),
                        .ips            = addresses_A_3_4,
                },
@@ -8509,10 +8502,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -8523,23 +8516,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_MA_DI_N", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = False,
+                       .positive       = false,
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -8550,10 +8543,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_MT_SI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8562,10 +8555,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -8576,10 +8569,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .name   = _NBT_NAME("_MA_MT_DI_U", 0x00, NULL),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8588,10 +8581,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
 /*
@@ -8608,10 +8601,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 3),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8620,10 +8613,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_all_num,
                        .ips            = ctx->addresses_all,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -8636,10 +8629,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_mhomed_num < 2),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8648,10 +8641,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
        /*
@@ -8664,23 +8657,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_mhomed_num < 2),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True
+                       .positive       = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .mhomed_merge   = True
+                       .mhomed_merge   = true
                },
        },
        /*
@@ -8693,14 +8686,14 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 3),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                        .num_ips        = ctx->addresses_all_num,
                        .ips            = ctx->addresses_all,
                },
@@ -8708,10 +8701,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .mhomed_merge   = True
+                       .mhomed_merge   = true
                },
        },
        /*
@@ -8726,26 +8719,26 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 2),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .late_release   = True
+                       .late_release   = true
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -8758,14 +8751,14 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 2),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
                },
@@ -8773,10 +8766,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -8789,23 +8782,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_mhomed_num < 2),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = False
+                       .positive       = false
                },
                .replica= {
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
        },
 /*
@@ -8822,23 +8815,23 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 2),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = True,
+                       .mhomed         = true,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .mhomed_merge   = True
+                       .mhomed_merge   = true
                },
        },
        /*
@@ -8853,26 +8846,26 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 2),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                        .num_ips        = ctx->addresses_best2_num,
                        .ips            = ctx->addresses_best2,
-                       .late_release   = True
+                       .late_release   = true
                },
                .replica= {
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best2_num,
                        .ips            = ctx->addresses_best2,
-                       .apply_expected = False,
+                       .apply_expected = false,
                },
        },
        /*
@@ -8885,14 +8878,14 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 3),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                        .num_ips        = ctx->addresses_all_num,
                        .ips            = ctx->addresses_all,
                },
@@ -8900,10 +8893,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_UNIQUE,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best2_num,
                        .ips            = ctx->addresses_best2,
-                       .mhomed_merge   = True,
+                       .mhomed_merge   = true,
                },
        },
        /*
@@ -8916,14 +8909,14 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 3),
                .wins   = {
                        .nb_flags       = 0,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 10,
-                       .positive       = True,
+                       .positive       = true,
                        .num_ips        = ctx->addresses_all_num,
                        .ips            = ctx->addresses_all,
                },
@@ -8931,10 +8924,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_MHOMED,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best2_num,
                        .ips            = ctx->addresses_best2,
-                       .mhomed_merge   = True,
+                       .mhomed_merge   = true,
                },
        },
 /*
@@ -8950,10 +8943,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 3),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8962,12 +8955,13 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .sgroup_merge   = True
+                       .sgroup_merge   = true
                },
        },
+#if 0
        /*
         * sgroup,active vs. sgroup,active with same ip(s)
         */
@@ -8977,10 +8971,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 3),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -8989,10 +8983,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .sgroup_merge   = True
+                       .sgroup_merge   = true
                },
        },
        /*
@@ -9004,10 +8998,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 3),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -9016,10 +9010,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_all_num,
                        .ips            = ctx->addresses_all,
-                       .sgroup_merge   = True
+                       .sgroup_merge   = true
                },
        },
        /*
@@ -9031,10 +9025,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 3),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -9043,10 +9037,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_ACTIVE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .sgroup_merge   = True
+                       .sgroup_merge   = true
                },
        },
        /*
@@ -9058,10 +9052,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 3),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -9070,10 +9064,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ARRAY_SIZE(addresses_B_3_4),
                        .ips            = addresses_B_3_4,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -9085,10 +9079,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 3),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -9097,10 +9091,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -9112,10 +9106,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 3),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -9124,10 +9118,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_all_num,
                        .ips            = ctx->addresses_all,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
        /*
@@ -9139,10 +9133,10 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                .skip   = (ctx->addresses_all_num < 3),
                .wins   = {
                        .nb_flags       = NBT_NM_GROUP,
-                       .mhomed         = False,
+                       .mhomed         = false,
                        .num_ips        = ctx->addresses_mhomed_num,
                        .ips            = ctx->addresses_mhomed,
-                       .apply_expected = True
+                       .apply_expected = true
                },
                .defend = {
                        .timeout        = 0,
@@ -9151,21 +9145,22 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        .type           = WREPL_TYPE_SGROUP,
                        .state          = WREPL_STATE_TOMBSTONE,
                        .node           = WREPL_NODE_B,
-                       .is_static      = False,
+                       .is_static      = false,
                        .num_ips        = ctx->addresses_best_num,
                        .ips            = ctx->addresses_best,
-                       .apply_expected = False
+                       .apply_expected = false
                },
        },
+#endif
        };
 
        if (!ctx->nbtsock_srv) {
-               printf("SKIP: Test Replica records vs. owned active records: not bound to port[%d]\n",
-                       lp_nbt_port());
-               return True;
+               torture_comment(tctx, "SKIP: Test Replica records vs. owned active records: not bound to port[%d]\n",
+                       lp_nbt_port(tctx->lp_ctx));
+               return true;
        }
 
-       printf("Test Replica records vs. owned active records\n");
+       torture_comment(tctx, "Test Replica records vs. owned active records\n");
 
        for(i=0; ret && i < ARRAY_SIZE(records); i++) {
                struct timeval end;
@@ -9178,11 +9173,11 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                }
 
                if (records[i].section) {
-                       printf("%s\n", records[i].section);
+                       torture_comment(tctx, "%s\n", records[i].section);
                }
 
                if (records[i].skip) {
-                       printf("%s => SKIPPED\n", nbt_name_string(ctx, &records[i].name));
+                       torture_comment(tctx, "%s => SKIPPED\n", nbt_name_string(ctx, &records[i].name));
                        continue;
                }
 
@@ -9196,7 +9191,7 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        action = "NOT REPLACE";
                }
 
-               printf("%s%s%s => %s\n",
+               torture_comment(tctx, "%s%s%s => %s\n",
                        nbt_name_string(ctx, &records[i].name),
                        (records[i].comment?": ":""),
                        (records[i].comment?records[i].comment:""),
@@ -9205,7 +9200,7 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                /* Prepare for multi homed registration */
                ZERO_STRUCT(records[i].defend);
                records[i].defend.timeout       = 10;
-               records[i].defend.positive      = True;
+               records[i].defend.positive      = true;
                nbt_set_incoming_handler(ctx->nbtsock_srv,
                                         test_conflict_owned_active_vs_replica_handler,
                                         &records[i]);
@@ -9225,8 +9220,8 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        name_register->in.dest_addr     = ctx->address;
                        name_register->in.address       = records[i].wins.ips[j].ip;
                        name_register->in.nb_flags      = records[i].wins.nb_flags;
-                       name_register->in.register_demand= False;
-                       name_register->in.broadcast     = False;
+                       name_register->in.register_demand= false;
+                       name_register->in.broadcast     = false;
                        name_register->in.multi_homed   = records[i].wins.mhomed;
                        name_register->in.ttl           = 300000;
                        name_register->in.timeout       = 70;
@@ -9244,7 +9239,7 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                         */
                        if (records[i].wins.mhomed && j > 0) {
                                end = timeval_current_ofs(records[i].defend.timeout,0);
-                               records[i].defend.ret = True;
+                               records[i].defend.ret = true;
                                while (records[i].defend.timeout > 0) {
                                        event_loop_once(ctx->nbtsock_srv->event_ctx);
                                        if (timeval_expired(&end)) break;
@@ -9254,20 +9249,20 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
 
                        status = nbt_name_register_recv(req, ctx, name_register);
                        if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
-                               printf("No response from %s for name register\n", ctx->address);
-                               ret = False;
+                               torture_comment(tctx, "No response from %s for name register\n", ctx->address);
+                               ret = false;
                        }
                        if (!NT_STATUS_IS_OK(status)) {
-                               printf("Bad response from %s for name register - %s\n",
+                               torture_comment(tctx, "Bad response from %s for name register - %s\n",
                                       ctx->address, nt_errstr(status));
-                               ret = False;
+                               ret = false;
                        }
-                       CHECK_VALUE(name_register->out.rcode, 0);
-                       CHECK_VALUE_STRING(name_register->out.reply_from, ctx->address);
-                       CHECK_VALUE(name_register->out.name.type, records[i].name.type);
-                       CHECK_VALUE_STRING(name_register->out.name.name, records[i].name.name);
-                       CHECK_VALUE_STRING(name_register->out.name.scope, records[i].name.scope);
-                       CHECK_VALUE_STRING(name_register->out.reply_addr, records[i].wins.ips[j].ip);
+                       CHECK_VALUE(tctx, name_register->out.rcode, 0);
+                       CHECK_VALUE_STRING(tctx, name_register->out.reply_from, ctx->address);
+                       CHECK_VALUE(tctx, name_register->out.name.type, records[i].name.type);
+                       CHECK_VALUE_STRING(tctx, name_register->out.name.name, records[i].name.name);
+                       CHECK_VALUE_STRING(tctx, name_register->out.name.scope, records[i].name.scope);
+                       CHECK_VALUE_STRING(tctx, name_register->out.reply_addr, records[i].wins.ips[j].ip);
                }
 
                /* Prepare for the current test */
@@ -9298,14 +9293,14 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                }
                wins_name->unknown      = "255.255.255.255";
 
-               ret &= test_wrepl_update_one(ctx, &ctx->b, wins_name);
+               ret &= test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
 
                /*
                 * wait for the name query, which is handled in
                 * test_conflict_owned_active_vs_replica_handler()
                 */
                end = timeval_current_ofs(records[i].defend.timeout,0);
-               records[i].defend.ret = True;
+               records[i].defend.ret = true;
                while (records[i].defend.timeout > 0) {
                        event_loop_once(ctx->nbtsock_srv->event_ctx);
                        if (timeval_expired(&end)) break;
@@ -9314,13 +9309,13 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
 
                if (records[i].defend.late_release) {
                        records[i].defend = record.defend;
-                       records[i].defend.expect_release = True;
+                       records[i].defend.expect_release = true;
                        /*
                         * wait for the name release demand, which is handled in
                         * test_conflict_owned_active_vs_replica_handler()
                         */
                        end = timeval_current_ofs(records[i].defend.timeout,0);
-                       records[i].defend.ret = True;
+                       records[i].defend.ret = true;
                        while (records[i].defend.timeout > 0) {
                                event_loop_once(ctx->nbtsock_srv->event_ctx);
                                if (timeval_expired(&end)) break;
@@ -9329,20 +9324,20 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                }
 
                if (records[i].replica.mhomed_merge) {
-                       ret &= test_wrepl_mhomed_merged(ctx, &ctx->c,
+                       ret &= test_wrepl_mhomed_merged(tctx, ctx, &ctx->c,
                                                        records[i].wins.num_ips, records[i].wins.ips,
                                                        &ctx->b,
                                                        records[i].replica.num_ips, records[i].replica.ips,
                                                        wins_name);
                } else if (records[i].replica.sgroup_merge) {
-                       ret &= test_wrepl_sgroup_merged(ctx, NULL,
+                       ret &= test_wrepl_sgroup_merged(tctx, ctx, NULL,
                                                        &ctx->c,
                                                        records[i].wins.num_ips, records[i].wins.ips,
                                                        &ctx->b,
                                                        records[i].replica.num_ips, records[i].replica.ips,
                                                        wins_name);
                } else {
-                       ret &= test_wrepl_is_applied(ctx, &ctx->b, wins_name,
+                       ret &= test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name,
                                                     records[i].replica.apply_expected);
                }
 
@@ -9351,13 +9346,13 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                        wins_name->name         = &records[i].name;
                        wins_name->flags        = WREPL_NAME_FLAGS(WREPL_TYPE_UNIQUE,
                                                                   WREPL_STATE_TOMBSTONE,
-                                                                  WREPL_NODE_B, False);
+                                                                  WREPL_NODE_B, false);
                        wins_name->id           = ++ctx->b.max_version;
                        wins_name->addresses.ip = addresses_B_1[0].ip;
                        wins_name->unknown      = "255.255.255.255";
 
-                       ret &= test_wrepl_update_one(ctx, &ctx->b, wins_name);
-                       ret &= test_wrepl_is_applied(ctx, &ctx->b, wins_name, True);
+                       ret &= test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
+                       ret &= test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name, true);
                } else {
                        for (j=0; j < count; j++) {
                                struct nbt_name_socket *nbtsock = ctx->nbtsock;
@@ -9370,21 +9365,21 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                                release->in.dest_addr   = ctx->address;
                                release->in.address     = records[i].wins.ips[j].ip;
                                release->in.nb_flags    = records[i].wins.nb_flags;
-                               release->in.broadcast   = False;
+                               release->in.broadcast   = false;
                                release->in.timeout     = 30;
                                release->in.retries     = 0;
 
                                status = nbt_name_release(nbtsock, ctx, release);
                                if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
-                                       printf("No response from %s for name release\n", ctx->address);
-                                       return False;
+                                       torture_comment(tctx, "No response from %s for name release\n", ctx->address);
+                                       return false;
                                }
                                if (!NT_STATUS_IS_OK(status)) {
-                                       printf("Bad response from %s for name query - %s\n",
+                                       torture_comment(tctx, "Bad response from %s for name query - %s\n",
                                               ctx->address, nt_errstr(status));
-                                       return False;
+                                       return false;
                                }
-                               CHECK_VALUE(release->out.rcode, 0);
+                               CHECK_VALUE(tctx, release->out.rcode, 0);
                        }
 
                        if (records[i].replica.sgroup_merge) {
@@ -9392,41 +9387,40 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
                                wins_name->name         = &records[i].name;
                                wins_name->flags        = WREPL_NAME_FLAGS(WREPL_TYPE_SGROUP,
                                                                           WREPL_STATE_ACTIVE,
-                                                                          WREPL_NODE_B, False);
+                                                                          WREPL_NODE_B, false);
                                wins_name->id           = ++ctx->b.max_version;
                                wins_name->addresses.addresses.num_ips = 0;
                                wins_name->addresses.addresses.ips     = NULL;
                                wins_name->unknown      = "255.255.255.255";
-                               ret &= test_wrepl_update_one(ctx, &ctx->b, wins_name);
+                               ret &= test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
 
                                /* take ownership of the SGROUP record */
                                wins_name->name         = &records[i].name;
                                wins_name->flags        = WREPL_NAME_FLAGS(WREPL_TYPE_SGROUP,
                                                                           WREPL_STATE_ACTIVE,
-                                                                          WREPL_NODE_B, False);
+                                                                          WREPL_NODE_B, false);
                                wins_name->id           = ++ctx->b.max_version;
                                wins_name->addresses.addresses.num_ips = ARRAY_SIZE(addresses_B_1);
                                wins_name->addresses.addresses.ips     = discard_const(addresses_B_1);
                                wins_name->unknown      = "255.255.255.255";
-                               ret &= test_wrepl_update_one(ctx, &ctx->b, wins_name);
-                               ret &= test_wrepl_is_applied(ctx, &ctx->b, wins_name, True);
+                               ret &= test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
+                               ret &= test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name, true);
 
                                /* overwrite the SGROUP record with unique,tombstone */
                                wins_name->name         = &records[i].name;
                                wins_name->flags        = WREPL_NAME_FLAGS(WREPL_TYPE_UNIQUE,
                                                                           WREPL_STATE_TOMBSTONE,
-                                                                          WREPL_NODE_B, False);
+                                                                          WREPL_NODE_B, false);
                                wins_name->id           = ++ctx->b.max_version;
                                wins_name->addresses.ip = addresses_A_1[0].ip;
                                wins_name->unknown      = "255.255.255.255";
-                               ret &= test_wrepl_update_one(ctx, &ctx->b, wins_name);
-                               ret &= test_wrepl_is_applied(ctx, &ctx->b, wins_name, True);
+                               ret &= test_wrepl_update_one(tctx, ctx, &ctx->b, wins_name);
+                               ret &= test_wrepl_is_applied(tctx, ctx, &ctx->b, wins_name, true);
                        }
                }
 
-done:
                if (!ret) {
-                       printf("conflict handled wrong or record[%u]: %s\n", i, records[i].line);
+                       torture_comment(tctx, "conflict handled wrong or record[%u]: %s\n", i, records[i].line);
                        return ret;
                }
        }
@@ -9458,7 +9452,8 @@ static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_
 {
        struct nbt_name *name;
        struct nbt_name_packet *rep_packet;
-       struct test_conflict_owned_active_vs_replica_struct *rec = nbtsock->incoming.private;
+       struct test_conflict_owned_active_vs_replica_struct *rec = 
+               (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
 
        _NBT_ASSERT(req_packet->qdcount, 1);
        _NBT_ASSERT(req_packet->questions[0].question_type, NBT_QTYPE_NETBIOS);
@@ -9470,7 +9465,7 @@ static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_
        _NBT_ASSERT_STRING(name->name, rec->name.name);
        _NBT_ASSERT_STRING(name->scope, rec->name.scope);
 
-       _NBT_ASSERT(rec->defend.expect_release, False);
+       _NBT_ASSERT(rec->defend.expect_release, false);
 
        rep_packet = talloc_zero(nbtsock, struct nbt_name_packet);
        if (rep_packet == NULL) return;
@@ -9541,19 +9536,21 @@ static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_
 
        /* make sure we push the reply to the wire */
        event_loop_once(nbtsock->event_ctx);
-       msleep(500);
+       msleep(1000);
 
        rec->defend.timeout     = 0;
-       rec->defend.ret         = True;
+       rec->defend.ret         = true;
 }
 
-static void test_conflict_owned_active_vs_replica_handler_release(struct nbt_name_socket *nbtsock, 
+static void test_conflict_owned_active_vs_replica_handler_release(
+                                                                 struct nbt_name_socket *nbtsock, 
                                                                  struct nbt_name_packet *req_packet, 
                                                                  struct socket_address *src)
 {
        struct nbt_name *name;
        struct nbt_name_packet *rep_packet;
-       struct test_conflict_owned_active_vs_replica_struct *rec = nbtsock->incoming.private;
+       struct test_conflict_owned_active_vs_replica_struct *rec = 
+               (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
 
        _NBT_ASSERT(req_packet->qdcount, 1);
        _NBT_ASSERT(req_packet->questions[0].question_type, NBT_QTYPE_NETBIOS);
@@ -9565,7 +9562,7 @@ static void test_conflict_owned_active_vs_replica_handler_release(struct nbt_nam
        _NBT_ASSERT_STRING(name->name, rec->name.name);
        _NBT_ASSERT_STRING(name->scope, rec->name.scope);
 
-       _NBT_ASSERT(rec->defend.expect_release, True);
+       _NBT_ASSERT(rec->defend.expect_release, true);
 
        rep_packet = talloc_zero(nbtsock, struct nbt_name_packet);
        if (rep_packet == NULL) return;
@@ -9594,19 +9591,20 @@ static void test_conflict_owned_active_vs_replica_handler_release(struct nbt_nam
 
        /* make sure we push the reply to the wire */
        event_loop_once(nbtsock->event_ctx);
-       msleep(500);
+       msleep(1000);
 
        rec->defend.timeout     = 0;
-       rec->defend.ret         = True;
+       rec->defend.ret         = true;
 }
 
 static void test_conflict_owned_active_vs_replica_handler(struct nbt_name_socket *nbtsock, 
                                                          struct nbt_name_packet *req_packet, 
                                                          struct socket_address *src)
 {
-       struct test_conflict_owned_active_vs_replica_struct *rec = nbtsock->incoming.private;
+       struct test_conflict_owned_active_vs_replica_struct *rec = 
+               (struct test_conflict_owned_active_vs_replica_struct *)nbtsock->incoming.private;
 
-       rec->defend.ret = False;
+       rec->defend.ret = false;
 
        switch (req_packet->operation & NBT_OPCODE) {
        case NBT_OPCODE_QUERY:
@@ -9622,101 +9620,78 @@ static void test_conflict_owned_active_vs_replica_handler(struct nbt_name_socket
 }
 
 /*
-  test simple WINS replication operations
+  test WINS replication replica conflicts operations
 */
-BOOL torture_nbt_winsreplication_simple(void)
+static bool torture_nbt_winsreplication_replica(struct torture_context *tctx)
 {
+       bool ret = true;
+       struct test_wrepl_conflict_conn *ctx;
+
        const char *address;
        struct nbt_name name;
-       TALLOC_CTX *mem_ctx = talloc_new(NULL);
-       NTSTATUS status;
-       BOOL ret = True;
-
-       make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
-
-       /* do an initial name resolution to find its IP */
-       status = resolve_name(&name, mem_ctx, &address, NULL);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("Failed to resolve %s - %s\n",
-                      name.name, nt_errstr(status));
-               talloc_free(mem_ctx);
-               return False;
-       }
 
-       ret &= test_assoc_ctx1(mem_ctx, address);
-       ret &= test_assoc_ctx2(mem_ctx, address);
+       if (!torture_nbt_get_name(tctx, &name, &address))
+               return false;
 
-       ret &= test_wins_replication(mem_ctx, address);
+       ctx = test_create_conflict_ctx(tctx, address);
+       if (!ctx) return false;
 
-       talloc_free(mem_ctx);
+       ret &= test_conflict_same_owner(tctx, ctx);
+       ret &= test_conflict_different_owner(tctx, ctx);
 
        return ret;
 }
 
 /*
-  test WINS replication replica conflicts operations
+  test WINS replication owned conflicts operations
 */
-BOOL torture_nbt_winsreplication_replica(void)
+static bool torture_nbt_winsreplication_owned(struct torture_context *tctx)
 {
        const char *address;
        struct nbt_name name;
-       TALLOC_CTX *mem_ctx = talloc_new(NULL);
-       NTSTATUS status;
-       BOOL ret = True;
+       bool ret = true;
        struct test_wrepl_conflict_conn *ctx;
 
-       make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
-
-       /* do an initial name resolution to find its IP */
-       status = resolve_name(&name, mem_ctx, &address, NULL);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("Failed to resolve %s - %s\n",
-                      name.name, nt_errstr(status));
-               talloc_free(mem_ctx);
-               return False;
-       }
+       if (torture_setting_bool(tctx, "quick", false))
+               torture_skip(tctx, 
+                       "skip NBT-WINSREPLICATION-OWNED test in quick test mode\n");
 
-       ctx = test_create_conflict_ctx(mem_ctx, address);
-       if (!ctx) return False;
+       if (!torture_nbt_get_name(tctx, &name, &address))
+               return false;
 
-       ret &= test_conflict_same_owner(ctx);
-       ret &= test_conflict_different_owner(ctx);
+       ctx = test_create_conflict_ctx(tctx, address);
+       torture_assert(tctx, ctx != NULL, "Creating context failed");
 
-       talloc_free(mem_ctx);
+       ret &= test_conflict_owned_released_vs_replica(tctx, ctx);
+       ret &= test_conflict_owned_active_vs_replica(tctx, ctx);
 
        return ret;
 }
 
 /*
-  test WINS replication owned conflicts operations
+  test simple WINS replication operations
 */
-BOOL torture_nbt_winsreplication_owned(void)
+struct torture_suite *torture_nbt_winsreplication(TALLOC_CTX *mem_ctx)
 {
-       const char *address;
-       struct nbt_name name;
-       TALLOC_CTX *mem_ctx = talloc_new(NULL);
-       NTSTATUS status;
-       BOOL ret = True;
-       struct test_wrepl_conflict_conn *ctx;
-
-       make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
+       struct torture_suite *suite = torture_suite_create(
+               mem_ctx, "WINSREPLICATION");
+       struct torture_tcase *tcase;
 
-       /* do an initial name resolution to find its IP */
-       status = resolve_name(&name, mem_ctx, &address, NULL);
-       if (!NT_STATUS_IS_OK(status)) {
-               printf("Failed to resolve %s - %s\n",
-                      name.name, nt_errstr(status));
-               talloc_free(mem_ctx);
-               return False;
-       }
+       tcase = torture_suite_add_simple_test(suite, "assoc_ctx1", 
+                                            test_assoc_ctx1);
+       tcase->tests->dangerous = true;
 
-       ctx = test_create_conflict_ctx(mem_ctx, address);
-       if (!ctx) return False;
+       torture_suite_add_simple_test(suite, "assoc_ctx2", 
+                                     test_assoc_ctx2);
+       
+       torture_suite_add_simple_test(suite, "wins_replication",
+                                     test_wins_replication);
 
-       ret &= test_conflict_owned_released_vs_replica(ctx);
-       ret &= test_conflict_owned_active_vs_replica(ctx);
+       torture_suite_add_simple_test(suite, "replica",
+                                     torture_nbt_winsreplication_replica);
 
-       talloc_free(mem_ctx);
+       torture_suite_add_simple_test(suite, "owned",
+                                     torture_nbt_winsreplication_owned);
 
-       return ret;
+       return suite;
 }