NBT-WINSREPLICATION: be more robust to timing errors
[tprouty/samba.git] / source4 / torture / nbt / winsreplication.c
index 578fff1c5af3cd1930b596d5df20573fa62f1f64..6b600bd7cd48ef847dcc3e7eacb77a6fdd1bbf71 100644 (file)
@@ -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,
    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"
-#include "libcli/nbt/libnbt.h"
 #include "libcli/wrepl/winsrepl.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
-#include "system/time.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_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_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_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)
+#include "libcli/resolve/resolve.h"
+#include "system/network.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(tctx, status, correct) \
+       torture_assert_ntstatus_equal(tctx, status, correct, \
+                                                                 "Incorrect status")
+
+#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(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(tctx, v, correct) \
+       torture_assert_str_equal(tctx, v, correct, "Invalid value")
 
 #define _NBT_NAME(n,t,s) {\
        .name   = n,\
@@ -94,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;
@@ -108,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, tctx->ev, lp_iconv_convenience(tctx->lp_ctx));
+       wrepl_socket2 = wrepl_socket_init(tctx, tctx->ev, lp_iconv_convenience(tctx->lp_ctx));
 
-       printf("Setup 2 wrepl connections\n");
-       status = wrepl_connect(wrepl_socket1, NULL, address);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       torture_comment(tctx, "Setup 2 wrepl connections\n");
+       status = wrepl_connect(wrepl_socket1, lp_resolve_context(tctx->lp_ctx), wrepl_best_ip(tctx->lp_ctx, address), address);
+       CHECK_STATUS(tctx, status, NT_STATUS_OK);
 
-       status = wrepl_connect(wrepl_socket2, NULL, address);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       status = wrepl_connect(wrepl_socket2, lp_resolve_context(tctx->lp_ctx), wrepl_best_ip(tctx->lp_ctx, address), address);
+       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;
@@ -186,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;
 
-       printf("Test if we always get back the same assoc_ctx\n");
+       if (!torture_nbt_get_name(tctx, &name, &address))
+               return false;
 
-       wrepl_socket = wrepl_socket_init(mem_ctx, NULL);
-       
-       printf("Setup wrepl connections\n");
-       status = wrepl_connect(wrepl_socket, NULL, address);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       torture_comment(tctx, "Test if we always get back the same assoc_ctx\n");
 
+       wrepl_socket = wrepl_socket_init(tctx, tctx->ev, lp_iconv_convenience(tctx->lp_ctx));
+       
+       torture_comment(tctx, "Setup wrepl connections\n");
+       status = wrepl_connect(wrepl_socket, lp_resolve_context(tctx->lp_ctx), wrepl_best_ip(tctx->lp_ctx, address), address);
+       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);
        }
 }
@@ -249,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, tctx->ev, lp_iconv_convenience(tctx->lp_ctx));
        
-       printf("Setup wrepl connections\n");
-       status = wrepl_connect(wrepl_socket, NULL, address);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       torture_comment(tctx, "Setup wrepl connections\n");
+       status = wrepl_connect(wrepl_socket, lp_resolve_context(tctx->lp_ctx), wrepl_best_ip(tctx->lp_ctx, address), address);
+       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;
@@ -291,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, 
@@ -310,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 {
@@ -340,8 +331,8 @@ struct test_wrepl_conflict_conn {
 
        struct wrepl_wins_owner a, b, c, x;
 
-       const char *myaddr;
-       const char *myaddr2;
+       struct socket_address *myaddr;
+       struct socket_address *myaddr2;
        struct nbt_name_socket *nbtsock;
        struct nbt_name_socket *nbtsock2;
 
@@ -547,24 +538,26 @@ 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;
        struct wrepl_pull_table pull_table;
+       struct socket_address *nbt_srv_addr;
        NTSTATUS status;
        uint32_t i;
+       struct interface *ifaces;
 
-       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);
+       ctx->pull       = wrepl_socket_init(ctx, tctx->ev, lp_iconv_convenience(tctx->lp_ctx));
        if (!ctx->pull) return NULL;
 
-       printf("Setup wrepl conflict pull connection\n");
-       status = wrepl_connect(ctx->pull, NULL, ctx->address);
+       torture_comment(tctx, "Setup wrepl conflict pull connection\n");
+       status = wrepl_connect(ctx->pull, lp_resolve_context(tctx->lp_ctx), wrepl_best_ip(tctx->lp_ctx, ctx->address), ctx->address);
        if (!NT_STATUS_IS_OK(status)) return NULL;
 
        status = wrepl_associate(ctx->pull, &associate);
@@ -617,43 +610,62 @@ static struct test_wrepl_conflict_conn *test_create_conflict_ctx(TALLOC_CTX *mem
 
        talloc_free(pull_table.out.partners);
 
-       ctx->myaddr = talloc_strdup(mem_ctx, iface_best_ip(address));
+       ctx->nbtsock = nbt_name_socket_init(ctx, tctx->ev, lp_iconv_convenience(tctx->lp_ctx));
+       if (!ctx->nbtsock) return NULL;
+
+       load_interfaces(tctx, lp_interfaces(tctx->lp_ctx), &ifaces);
+
+       ctx->myaddr = socket_address_from_strings(tctx, ctx->nbtsock->sock->backend_name, iface_best_ip(ifaces, address), 0);
        if (!ctx->myaddr) return NULL;
 
-       for (i = 0; i < iface_count(); i++) {
-               if (strcmp(ctx->myaddr, iface_n_ip(i)) == 0) continue;
-               ctx->myaddr2 = talloc_strdup(mem_ctx, iface_n_ip(i));
+       for (i = 0; i < iface_count(ifaces); i++) {
+               if (strcmp(ctx->myaddr->addr, iface_n_ip(ifaces, i)) == 0) continue;
+               ctx->myaddr2 = socket_address_from_strings(tctx, ctx->nbtsock->sock->backend_name, iface_n_ip(ifaces, i), 0);
                if (!ctx->myaddr2) return NULL;
                break;
        }
 
-       ctx->nbtsock = nbt_name_socket_init(ctx, NULL);
-       if (!ctx->nbtsock) return NULL;
-
-       status = socket_listen(ctx->nbtsock->sock, ctx->myaddr, 0, 0, 0);
+       status = socket_listen(ctx->nbtsock->sock, ctx->myaddr, 0, 0);
        if (!NT_STATUS_IS_OK(status)) return NULL;
 
-       ctx->nbtsock_srv = nbt_name_socket_init(ctx, NULL);
+       ctx->nbtsock_srv = nbt_name_socket_init(ctx, tctx->ev, lp_iconv_convenience(tctx->lp_ctx));
        if (!ctx->nbtsock_srv) return NULL;
 
-       status = socket_listen(ctx->nbtsock_srv->sock, ctx->myaddr, lp_nbt_port(), 0, 0);
+       /* Make a port 137 version of ctx->myaddr */
+       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 */
+       status = socket_listen(ctx->nbtsock_srv->sock, nbt_srv_addr, 0, 0);
+       talloc_free(nbt_srv_addr);
        if (!NT_STATUS_IS_OK(status)) {
+               /* this isn't fatal */
                talloc_free(ctx->nbtsock_srv);
                ctx->nbtsock_srv = NULL;
        }
 
        if (ctx->myaddr2 && ctx->nbtsock_srv) {
-               ctx->nbtsock2 = nbt_name_socket_init(ctx, NULL);
+               ctx->nbtsock2 = nbt_name_socket_init(ctx, tctx->ev, lp_iconv_convenience(tctx->lp_ctx));
                if (!ctx->nbtsock2) return NULL;
 
-               status = socket_listen(ctx->nbtsock2->sock, ctx->myaddr2, 0, 0, 0);
+               status = socket_listen(ctx->nbtsock2->sock, ctx->myaddr2, 0, 0);
                if (!NT_STATUS_IS_OK(status)) return NULL;
 
-               ctx->nbtsock_srv2 = nbt_name_socket_init(ctx, ctx->nbtsock_srv->event_ctx);
+               ctx->nbtsock_srv2 = nbt_name_socket_init(ctx, ctx->nbtsock_srv->event_ctx, lp_iconv_convenience(tctx->lp_ctx));
                if (!ctx->nbtsock_srv2) return NULL;
 
-               status = socket_listen(ctx->nbtsock_srv2->sock, ctx->myaddr2, lp_nbt_port(), 0, 0);
+               /* Make a port 137 version of ctx->myaddr2 */
+               nbt_srv_addr = socket_address_from_strings(tctx, 
+                                                          ctx->nbtsock_srv->sock->backend_name, 
+                                                          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 */
+               status = socket_listen(ctx->nbtsock_srv2->sock, ctx->myaddr2, 0, 0);
+               talloc_free(nbt_srv_addr);
                if (!NT_STATUS_IS_OK(status)) {
+                       /* this isn't fatal */
                        talloc_free(ctx->nbtsock_srv2);
                        ctx->nbtsock_srv2 = NULL;
                }
@@ -663,14 +675,14 @@ static struct test_wrepl_conflict_conn *test_create_conflict_ctx(TALLOC_CTX *mem
        ctx->addresses_best = talloc_array(ctx, struct wrepl_ip, ctx->addresses_best_num);
        if (!ctx->addresses_best) return NULL;
        ctx->addresses_best[0].owner    = ctx->b.address;
-       ctx->addresses_best[0].ip       = ctx->myaddr;
+       ctx->addresses_best[0].ip       = ctx->myaddr->addr;
 
-       ctx->addresses_all_num = iface_count();
+       ctx->addresses_all_num = iface_count(ifaces);
        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(ifaces, i));
                if (!ctx->addresses_all[i].ip) return NULL;
        }
 
@@ -679,25 +691,25 @@ static struct test_wrepl_conflict_conn *test_create_conflict_ctx(TALLOC_CTX *mem
                ctx->addresses_best2 = talloc_array(ctx, struct wrepl_ip, ctx->addresses_best2_num);
                if (!ctx->addresses_best2) return NULL;
                ctx->addresses_best2[0].owner   = ctx->b.address;
-               ctx->addresses_best2[0].ip      = ctx->myaddr2;
+               ctx->addresses_best2[0].ip      = ctx->myaddr2->addr;
 
                ctx->addresses_mhomed_num = 2;
                ctx->addresses_mhomed = talloc_array(ctx, struct wrepl_ip, ctx->addresses_mhomed_num);
                if (!ctx->addresses_mhomed) return NULL;
                ctx->addresses_mhomed[0].owner  = ctx->b.address;
-               ctx->addresses_mhomed[0].ip     = ctx->myaddr;
+               ctx->addresses_mhomed[0].ip     = ctx->myaddr->addr;
                ctx->addresses_mhomed[1].owner  = ctx->b.address;
-               ctx->addresses_mhomed[1].ip     = ctx->myaddr2;
+               ctx->addresses_mhomed[1].ip     = ctx->myaddr2->addr;
        }
 
        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;
@@ -710,13 +722,13 @@ static BOOL test_wrepl_update_one(struct test_wrepl_conflict_conn *ctx,
        uint32_t assoc_ctx;
        NTSTATUS status;
 
-       wrepl_socket = wrepl_socket_init(ctx, NULL);
+       wrepl_socket = wrepl_socket_init(ctx, tctx->ev, lp_iconv_convenience(tctx->lp_ctx));
 
-       status = wrepl_connect(wrepl_socket, NULL, ctx->address);
-       CHECK_STATUS(status, NT_STATUS_OK);
+       status = wrepl_connect(wrepl_socket, lp_resolve_context(tctx->lp_ctx), wrepl_best_ip(tctx->lp_ctx, ctx->address), ctx->address);
+       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 */
@@ -735,9 +747,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);
@@ -754,21 +766,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;
@@ -778,8 +789,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;
 
@@ -788,34 +800,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;
@@ -837,8 +848,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;
 
@@ -846,23 +857,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;
                        }
                }
@@ -871,22 +882,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,
@@ -894,7 +905,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;
@@ -927,7 +937,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;
        
@@ -945,30 +955,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;
                        }
                }
@@ -977,11 +987,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;
                        }
@@ -989,16 +999,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;
@@ -1011,7 +1021,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[] = {
@@ -1019,77 +1029,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,
                },{
@@ -1097,7 +1107,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,
                }
@@ -1113,7 +1123,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++) {
@@ -1122,7 +1132,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":""),
@@ -1147,19 +1157,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;
                        }
                }
@@ -1167,9 +1177,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;
@@ -1179,21 +1190,21 @@ 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;
-               } r1, r2, result;
+                       bool sgroup_cleanup;
+               } r1, r2;
        } records[] = {
        /* 
         * NOTE: the first record and the last applied one
@@ -1203,26 +1214,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 */
                }
        },
 
@@ -1241,20 +1252,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
                }
        },
 
@@ -1270,20 +1281,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
                }
        },
 
@@ -1299,20 +1310,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
                }
        },
 
@@ -1328,20 +1339,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
                }
        },
 
@@ -1357,20 +1368,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
                }
        },
 
@@ -1386,20 +1397,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
                }
        },
 
@@ -1419,20 +1430,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
                }
        },
 
@@ -1448,20 +1459,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
                }
        },
 
@@ -1477,20 +1488,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
                }
        },
 
@@ -1506,20 +1517,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
                }
        },
 
@@ -1535,20 +1546,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
                }
        },
 
@@ -1564,20 +1575,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
                }
        },
 
@@ -1596,20 +1607,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
                }
        },
 
@@ -1625,20 +1636,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
                }
        },
 
@@ -1654,20 +1665,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
                }
        },
 
@@ -1683,20 +1694,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
                }
        },
 
@@ -1712,20 +1723,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
                }
        },
 
@@ -1741,20 +1752,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
                }
        },
 
@@ -1773,20 +1784,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
                }
        },
 
@@ -1802,20 +1813,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
                }
        },
 
@@ -1831,20 +1842,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
                }
        },
 
@@ -1860,20 +1871,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
                }
        },
 
@@ -1889,20 +1900,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
                }
        },
 
@@ -1918,20 +1929,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
                }
        },
 
@@ -1950,20 +1961,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
                }
        },
 
@@ -1979,20 +1990,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
                }
        },
 
@@ -2008,20 +2019,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
                }
        },
 
@@ -2037,20 +2048,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
                }
        },
 
@@ -2066,20 +2077,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
                }
        },
 
@@ -2095,20 +2106,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
                }
        },
 
@@ -2127,20 +2138,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
                }
        },
 
@@ -2156,20 +2167,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
                }
        },
 
@@ -2185,20 +2196,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
                }
        },
 
@@ -2214,20 +2225,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
                }
        },
 
@@ -2243,20 +2254,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
                }
        },
 
@@ -2272,20 +2283,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
                }
        },
 
@@ -2304,20 +2315,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
                }
        },
 
@@ -2333,20 +2344,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
                }
        },
 
@@ -2362,20 +2373,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
                }
        },
 
@@ -2391,20 +2402,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
                }
        },
 
@@ -2420,20 +2431,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
                }
        },
 
@@ -2449,20 +2460,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
                }
        },
 
@@ -2481,20 +2492,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
                }
        },
 
@@ -2510,20 +2521,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
                }
        },
 
@@ -2539,20 +2550,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
                }
        },
 
@@ -2568,20 +2579,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
                }
        },
 
@@ -2597,20 +2608,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
                }
        },
 
@@ -2626,20 +2637,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
                }
        },
 
@@ -2658,20 +2669,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
                }
        },
 
@@ -2687,20 +2698,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
                }
        },
 
@@ -2716,20 +2727,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
                }
        },
 
@@ -2745,20 +2756,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
                }
        },
 
@@ -2774,20 +2785,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
                }
        },
 
@@ -2803,20 +2814,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
                }
        },
 
@@ -2835,20 +2846,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
                }
        },
 
@@ -2864,20 +2875,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
                }
        },
 
@@ -2893,20 +2904,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
                }
        },
 
@@ -2922,20 +2933,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
                }
        },
 
@@ -2951,20 +2962,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
                }
        },
 
@@ -2980,20 +2991,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
                }
        },
 
@@ -3012,20 +3023,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
                }
        },
 
@@ -3041,20 +3052,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
                }
        },
 
@@ -3070,20 +3081,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
                }
        },
 
@@ -3099,20 +3110,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
                }
        },
 
@@ -3131,20 +3142,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
                }
        },
 
@@ -3160,20 +3171,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
                }
        },
 
@@ -3189,20 +3200,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
                }
        },
 
@@ -3218,20 +3229,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
                }
        },
 
@@ -3247,20 +3258,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
                }
        },
 
@@ -3276,20 +3287,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
                }
        },
 
@@ -3308,20 +3319,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
                }
        },
 
@@ -3337,20 +3348,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
                }
        },
 
@@ -3366,20 +3377,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
                }
        },
 
@@ -3395,20 +3406,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
                }
        },
 
@@ -3424,20 +3435,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
                }
        },
 
@@ -3453,20 +3464,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
                }
        },
 
@@ -3485,20 +3496,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
                }
        },
 
@@ -3514,20 +3525,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
                }
        },
 
@@ -3543,20 +3554,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
                }
        },
 
@@ -3572,20 +3583,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
                }
        },
 
@@ -3601,20 +3612,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
                }
        },
 
@@ -3630,20 +3641,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
                }
        },
 
@@ -3662,20 +3673,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
                }
        },
 
@@ -3691,20 +3702,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
                }
        },
 
@@ -3720,20 +3731,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
                }
        },
 
@@ -3749,20 +3760,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
                }
        },
 
@@ -3778,20 +3789,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
                }
        },
 
@@ -3807,20 +3818,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
                }
        },
 
@@ -3839,20 +3850,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
                }
        },
 
@@ -3868,20 +3879,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
                }
        },
 
@@ -3897,20 +3908,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
                }
        },
 
@@ -3926,20 +3937,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
                }
        },
 
@@ -3955,20 +3966,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
                }
        },
 
@@ -3984,45 +3995,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,
                }
        },
 /*
@@ -4036,27 +4047,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
                }
        },
        /* 
@@ -4067,27 +4078,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
                }
        },
        /* 
@@ -4098,51 +4109,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,
                }
        },
        /* 
@@ -4153,27 +4164,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
                }
        },
        /* 
@@ -4184,27 +4195,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
                }
        },
        /* 
@@ -4215,27 +4226,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
                }
        },
        /* 
@@ -4246,27 +4257,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,
                }
        },
        /* 
@@ -4277,53 +4288,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,
                }
        },
        /* 
@@ -4334,52 +4345,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,
                }
        },
        /* 
@@ -4390,52 +4401,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,
                }
        },
        /* 
@@ -4446,52 +4457,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,
                }
        },
        /* 
@@ -4502,53 +4513,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,
                }
        },
        /* 
@@ -4559,55 +4570,177 @@ 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,
+               }
+       },
+
+       /* 
+        * sgroup,active vs. sgroup,tombstone different no addresses, special
+        * => should be replaced
+        */
+       {
+               .line   = __location__,
+               .name   = _NBT_NAME("_DIFF_OWNER", 0x00, NULL),
+               .comment= "A:B_3_4_X_3_4 vs. B:NULL => B:NULL",
+               .extra  = true,
+               .r1     = {
+                       .owner          = &ctx->a,
+                       .type           = WREPL_TYPE_SGROUP,
+                       .state          = WREPL_STATE_ACTIVE,
+                       .node           = WREPL_NODE_B,
+                       .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,
+               },
+               .r2     = {
+                       .owner          = &ctx->b,
+                       .type           = WREPL_TYPE_SGROUP,
+                       .state          = WREPL_STATE_TOMBSTONE,
+                       .node           = WREPL_NODE_B,
+                       .is_static      = false,
+                       .num_ips        = 0,
+                       .ips            = NULL,
+                       .apply_expected = true,
+               }
+       },
+       /* 
+        * sgroup,active vs. sgroup,tombstone different addresses
+        * => should be replaced
+        */
+       {
+               .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,
+               .r1     = {
+                       .owner          = &ctx->a,
+                       .type           = WREPL_TYPE_SGROUP,
+                       .state          = WREPL_STATE_ACTIVE,
+                       .node           = WREPL_NODE_B,
+                       .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,
+               },
+               .r2     = {
+                       .owner          = &ctx->b,
+                       .type           = WREPL_TYPE_SGROUP,
+                       .state          = WREPL_STATE_TOMBSTONE,
+                       .node           = WREPL_NODE_B,
+                       .is_static      = false,
+                       .num_ips        = ARRAY_SIZE(addresses_A_3_4),
+                       .ips            = addresses_A_3_4,
+                       .apply_expected = true,
+               }
+       },
+       /* 
+        * sgroup,active vs. sgroup,tombstone subset addresses
+        * => should be replaced
+        */
+       {
+               .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,
+               .r1     = {
+                       .owner          = &ctx->a,
+                       .type           = WREPL_TYPE_SGROUP,
+                       .state          = WREPL_STATE_ACTIVE,
+                       .node           = WREPL_NODE_B,
+                       .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,
+               },
+               .r2     = {
+                       .owner          = &ctx->b,
+                       .type           = WREPL_TYPE_SGROUP,
+                       .state          = WREPL_STATE_TOMBSTONE,
+                       .node           = WREPL_NODE_B,
+                       .is_static      = false,
+                       .num_ips        = ARRAY_SIZE(addresses_B_3_4),
+                       .ips            = addresses_B_3_4,
+                       .apply_expected = true,
                }
        },
+       /* 
+        * sgroup,active vs. sgroup,active same addresses
+        * => should be replaced
+        */
+       {
+               .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,
+               .r1     = {
+                       .owner          = &ctx->a,
+                       .type           = WREPL_TYPE_SGROUP,
+                       .state          = WREPL_STATE_ACTIVE,
+                       .node           = WREPL_NODE_B,
+                       .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,
+               },
+               .r2     = {
+                       .owner          = &ctx->b,
+                       .type           = WREPL_TYPE_SGROUP,
+                       .state          = WREPL_STATE_TOMBSTONE,
+                       .node           = WREPL_NODE_B,
+                       .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,
+               }
+       },
+
        /* 
         * This should be the last record in this array,
         * we need to make sure the we leave a tombstoned unique entry
@@ -4616,46 +4749,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;
                        }
                }
 
@@ -4679,7 +4812,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":""),
@@ -4708,8 +4841,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);
 
                /*
@@ -4730,34 +4863,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;
                        }
 
@@ -4765,16 +4898,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,
@@ -4786,48 +4919,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;
                }
        }
@@ -4835,9 +4968,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_;
@@ -4851,19 +4985,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[] = {
 /* 
@@ -4877,19 +5011,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
                },
        },
        /*
@@ -4900,19 +5034,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
                },
        },
        /*
@@ -4923,19 +5057,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
                },
        },
        /*
@@ -4946,19 +5080,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
                },
        },
 /* 
@@ -4972,19 +5106,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
                },
        },
        /*
@@ -4995,19 +5129,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
                },
        },
        /*
@@ -5018,19 +5152,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
                },
        },
        /*
@@ -5041,19 +5175,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
                },
        },
 /* 
@@ -5067,19 +5201,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
                },
        },
        /*
@@ -5090,19 +5224,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
                },
        },
        /*
@@ -5113,19 +5247,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
                },
        },
        /*
@@ -5136,19 +5270,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
                },
        },
 /* 
@@ -5162,19 +5296,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
                },
        },
        /*
@@ -5185,19 +5319,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
                },
        },
        /*
@@ -5208,19 +5342,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
                },
        },
        /*
@@ -5231,19 +5365,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
                },
        },
 /* 
@@ -5257,19 +5391,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
                },
        },
        /*
@@ -5280,19 +5414,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
                },
        },
        /*
@@ -5303,19 +5437,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
                },
        },
        /*
@@ -5326,19 +5460,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
                },
        },
 /* 
@@ -5352,19 +5486,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
                },
        },
        /*
@@ -5375,19 +5509,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
                },
        },
        /*
@@ -5398,19 +5532,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
                },
        },
        /*
@@ -5421,19 +5555,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
                },
        },
 /* 
@@ -5447,19 +5581,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
                },
        },
        /*
@@ -5470,19 +5604,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
                },
        },
        /*
@@ -5493,19 +5627,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
                },
        },
        /*
@@ -5516,19 +5650,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
                },
        },
 /* 
@@ -5542,19 +5676,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
                },
        },
        /*
@@ -5565,19 +5699,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
                },
        },
        /*
@@ -5588,19 +5722,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
                },
        },
        /*
@@ -5611,19 +5745,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
                },
        },
 /* 
@@ -5637,19 +5771,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
                },
        },
        /*
@@ -5660,19 +5794,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
                },
        },
        /*
@@ -5683,19 +5817,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
                },
        },
        /*
@@ -5706,19 +5840,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
                },
        },
 /* 
@@ -5732,19 +5866,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
                },
        },
        /*
@@ -5755,19 +5889,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
                },
        },
        /*
@@ -5778,19 +5912,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
                },
        },
        /*
@@ -5801,19 +5935,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
                },
        },
 /* 
@@ -5827,19 +5961,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
                },
        },
        /*
@@ -5850,19 +5984,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
                },
        },
        /*
@@ -5873,19 +6007,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
                },
        },
        /*
@@ -5896,19 +6030,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
                },
        },
 /* 
@@ -5922,19 +6056,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
                },
        },
        /*
@@ -5945,19 +6079,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
                },
        },
        /*
@@ -5968,19 +6102,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
                },
        },
        /*
@@ -5991,19 +6125,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
                },
        },
 /* 
@@ -6017,19 +6151,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
                },
        },
        /*
@@ -6040,19 +6174,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
                },
        },
        /*
@@ -6063,19 +6197,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
                },
        },
        /*
@@ -6086,19 +6220,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
                },
        },
 /* 
@@ -6112,19 +6246,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
                },
        },
        /*
@@ -6135,19 +6269,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
                },
        },
        /*
@@ -6158,19 +6292,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
                },
        },
        /*
@@ -6181,19 +6315,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
                },
        },
 /* 
@@ -6207,19 +6341,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
                },
        },
        /*
@@ -6230,19 +6364,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
                },
        },
        /*
@@ -6253,19 +6387,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
                },
        },
        /*
@@ -6276,19 +6410,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
                },
        },
 /* 
@@ -6302,19 +6436,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
                },
        },
        /*
@@ -6325,19 +6459,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
                },
        },
        /*
@@ -6348,19 +6482,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
                },
        },
        /*
@@ -6371,27 +6505,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"));
 
                /*
@@ -6399,10 +6533,11 @@ static BOOL test_conflict_owned_released_vs_replica(struct test_wrepl_conflict_c
                 */
                name_register->in.name          = records[i].name;
                name_register->in.dest_addr     = ctx->address;
+               name_register->in.dest_port     = lp_nbt_port(tctx->lp_ctx);
                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;
@@ -6410,41 +6545,42 @@ 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_port   = lp_nbt_port(tctx->lp_ctx);
                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
@@ -6463,45 +6599,45 @@ 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.dest_port   = lp_nbt_port(tctx->lp_ctx);
                        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;
                }
        }
@@ -6514,20 +6650,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;
@@ -6536,22 +6672,23 @@ 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;
 };
 
 static void test_conflict_owned_active_vs_replica_handler(struct nbt_name_socket *nbtsock, 
                                                          struct nbt_name_packet *req_packet, 
-                                                         const struct nbt_peer_socket *src);
+                                                         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_;
@@ -6572,10 +6709,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,
@@ -6584,10 +6721,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
                },
        },
        /*
@@ -6598,23 +6735,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
                },
        },
        /*
@@ -6625,14 +6762,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,
                },
@@ -6640,10 +6777,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
                },
        },
        /*
@@ -6654,23 +6791,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
                },
        },
        /*
@@ -6681,10 +6818,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,
@@ -6693,10 +6830,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
                },
        },
        /*
@@ -6707,10 +6844,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,
@@ -6719,10 +6856,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
                },
        },
 /* 
@@ -6736,23 +6873,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
                },
        },
        /*
@@ -6763,23 +6900,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
                },
        },
        /*
@@ -6790,10 +6927,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,
@@ -6802,10 +6939,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
                },
        },
        /*
@@ -6816,10 +6953,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,
@@ -6828,10 +6965,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
                },
        },
 /* 
@@ -6845,23 +6982,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
                },
        },
        /*
@@ -6872,23 +7009,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
                },
        },
        /*
@@ -6899,10 +7036,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,
@@ -6911,10 +7048,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
                },
        },
        /*
@@ -6925,10 +7062,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,
@@ -6937,10 +7074,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
                },
        },
 /* 
@@ -6954,10 +7091,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,
@@ -6966,10 +7103,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
                },
        },
        /*
@@ -6980,10 +7117,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,
@@ -6992,10 +7129,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
                },
        },
        /*
@@ -7006,23 +7143,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
                },
        },
        /*
@@ -7033,14 +7170,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,
                },
@@ -7048,10 +7185,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
                },
        },
        /*
@@ -7062,23 +7199,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
                },
        },
        /*
@@ -7089,10 +7226,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,
@@ -7101,10 +7238,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
                },
        },
        /*
@@ -7115,10 +7252,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,
@@ -7127,10 +7264,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
                },
        },
 /* 
@@ -7144,10 +7281,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,
@@ -7156,10 +7293,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
                },
        },
        /*
@@ -7170,10 +7307,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,
@@ -7182,10 +7319,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
                },
        },
        /*
@@ -7196,10 +7333,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,
@@ -7208,10 +7345,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
                },
        },
        /*
@@ -7222,10 +7359,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,
@@ -7234,10 +7371,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
                },
        },
 /* 
@@ -7251,10 +7388,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,
@@ -7263,10 +7400,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
                },
        },
        /*
@@ -7277,10 +7414,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,
@@ -7289,10 +7426,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
                },
        },
        /*
@@ -7303,10 +7440,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,
@@ -7315,10 +7452,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
                },
        },
        /*
@@ -7329,10 +7466,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,
@@ -7341,10 +7478,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
                },
        },
 /* 
@@ -7358,10 +7495,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,
@@ -7370,10 +7507,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
                },
        },
        /*
@@ -7384,10 +7521,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,
@@ -7396,10 +7533,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
                },
        },
        /*
@@ -7410,10 +7547,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,
@@ -7422,10 +7559,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
                },
        },
        /*
@@ -7436,10 +7573,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,
@@ -7448,10 +7585,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
                },
        },
 /* 
@@ -7465,10 +7602,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,
@@ -7477,10 +7614,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
                },
        },
        /*
@@ -7491,10 +7628,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,
@@ -7503,10 +7640,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
                },
        },
        /*
@@ -7517,10 +7654,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,
@@ -7529,10 +7666,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
                },
        },
        /*
@@ -7543,10 +7680,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,
@@ -7555,10 +7692,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
                },
        },
 /* 
@@ -7572,10 +7709,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,
@@ -7584,10 +7721,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
                },
        },
        /*
@@ -7598,10 +7735,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,
@@ -7610,10 +7747,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
                },
        },
        /*
@@ -7624,10 +7761,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,
@@ -7636,10 +7773,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
                },
        },
        /*
@@ -7650,10 +7787,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,
@@ -7662,10 +7799,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
                },
        },
 /* 
@@ -7679,10 +7816,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,
@@ -7691,10 +7828,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
                },
        },
        /*
@@ -7705,10 +7842,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,
@@ -7717,10 +7854,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
                },
        },
        /*
@@ -7731,10 +7868,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,
@@ -7743,10 +7880,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
                },
        },
        /*
@@ -7757,10 +7894,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,
@@ -7769,10 +7906,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
                },
        },
 /* 
@@ -7786,10 +7923,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,
@@ -7798,10 +7935,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
                },
        },
        /*
@@ -7812,10 +7949,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,
@@ -7824,10 +7961,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
                },
        },
        /*
@@ -7838,10 +7975,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,
@@ -7850,10 +7987,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
                },
        },
        /*
@@ -7864,10 +8001,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,
@@ -7876,10 +8013,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
                },
        },
 /* 
@@ -7893,10 +8030,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,
@@ -7905,10 +8042,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
                },
        },
        /*
@@ -7919,23 +8056,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
                },
        },
        /*
@@ -7946,14 +8083,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,
                },
@@ -7961,10 +8098,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
                },
        },
        /*
@@ -7975,23 +8112,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
                },
        },
        /*
@@ -8002,10 +8139,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,
@@ -8014,10 +8151,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
                },
        },
        /*
@@ -8028,10 +8165,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,
@@ -8040,10 +8177,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
                },
        },
 /* 
@@ -8057,23 +8194,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
                },
        },
        /*
@@ -8084,23 +8221,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
                },
        },
        /*
@@ -8111,10 +8248,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,
@@ -8123,10 +8260,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
                },
        },
        /*
@@ -8137,10 +8274,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,
@@ -8149,10 +8286,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
                },
        },
 /* 
@@ -8166,23 +8303,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
                },
        },
        /*
@@ -8193,23 +8330,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
                },
        },
        /*
@@ -8220,10 +8357,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,
@@ -8232,10 +8369,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
                },
        },
        /*
@@ -8246,10 +8383,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,
@@ -8258,10 +8395,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
                },
        },
 /* 
@@ -8275,10 +8412,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,
@@ -8287,10 +8424,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
                },
        },
        /*
@@ -8301,10 +8438,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,
@@ -8313,10 +8450,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
                },
        },
        /*
@@ -8327,23 +8464,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
                },
        },
        /*
@@ -8354,14 +8491,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,
                },
@@ -8369,10 +8506,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
                },
        },
        /*
@@ -8383,23 +8520,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
                },
        },
        /*
@@ -8410,10 +8547,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,
@@ -8422,10 +8559,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
                },
        },
        /*
@@ -8436,10 +8573,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,
@@ -8448,10 +8585,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
                },
        },
 /*
@@ -8468,10 +8605,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,
@@ -8480,10 +8617,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
                },
        },
        /*
@@ -8496,10 +8633,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,
@@ -8508,10 +8645,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
                },
        },
        /*
@@ -8524,23 +8661,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
                },
        },
        /*
@@ -8553,14 +8690,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,
                },
@@ -8568,10 +8705,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
                },
        },
        /*
@@ -8586,26 +8723,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
                },
        },
        /*
@@ -8618,14 +8755,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,
                },
@@ -8633,10 +8770,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
                },
        },
        /*
@@ -8649,23 +8786,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
                },
        },
 /*
@@ -8682,23 +8819,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
                },
        },
        /*
@@ -8713,26 +8850,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,
                },
        },
        /*
@@ -8745,14 +8882,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,
                },
@@ -8760,10 +8897,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,
                },
        },
        /*
@@ -8776,14 +8913,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,
                },
@@ -8791,10 +8928,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,
                },
        },
 /*
@@ -8810,10 +8947,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,
@@ -8822,10 +8959,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,
-                       .sgroup_merge   = True
+                       .sgroup_merge   = true
                },
        },
        /*
@@ -8837,10 +8974,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,
@@ -8849,10 +8986,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
                },
        },
        /*
@@ -8864,10 +9001,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,
@@ -8876,10 +9013,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
                },
        },
        /*
@@ -8891,10 +9028,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,
@@ -8903,10 +9040,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
                },
        },
        /*
@@ -8918,10 +9055,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,
@@ -8930,10 +9067,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
                },
        },
        /*
@@ -8945,10 +9082,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,
@@ -8957,10 +9094,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
                },
        },
        /*
@@ -8972,10 +9109,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,
@@ -8984,10 +9121,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
                },
        },
        /*
@@ -8999,10 +9136,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,
@@ -9011,21 +9148,21 @@ 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
                },
        },
        };
 
        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;
@@ -9038,11 +9175,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;
                }
 
@@ -9056,7 +9193,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:""),
@@ -9065,7 +9202,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]);
@@ -9083,10 +9220,11 @@ static BOOL test_conflict_owned_active_vs_replica(struct test_wrepl_conflict_con
 
                        name_register->in.name          = records[i].name;
                        name_register->in.dest_addr     = ctx->address;
+                       name_register->in.dest_port     = lp_nbt_port(tctx->lp_ctx);
                        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;
@@ -9104,7 +9242,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;
@@ -9114,20 +9252,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 */
@@ -9158,14 +9296,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;
@@ -9174,13 +9312,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;
@@ -9189,20 +9327,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);
                }
 
@@ -9211,40 +9349,41 @@ 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;
 
-                               if (ctx->myaddr2 && strcmp(records[i].wins.ips[j].ip, ctx->myaddr2) == 0) {
+                               if (ctx->myaddr2 && strcmp(records[i].wins.ips[j].ip, ctx->myaddr2->addr) == 0) {
                                        nbtsock = ctx->nbtsock2;
                                }
 
                                release->in.name        = records[i].name;
                                release->in.dest_addr   = ctx->address;
+                               release->in.dest_port   = lp_nbt_port(tctx->lp_ctx);
                                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) {
@@ -9252,41 +9391,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;
                }
        }
@@ -9314,11 +9452,12 @@ done:
 
 static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_socket *nbtsock, 
                                                                struct nbt_name_packet *req_packet, 
-                                                               const struct nbt_peer_socket *src)
+                                                               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);
@@ -9330,7 +9469,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;
@@ -9400,20 +9539,24 @@ static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_
        talloc_free(rep_packet);
 
        /* make sure we push the reply to the wire */
-       event_loop_once(nbtsock->event_ctx);
-       msleep(25);
+       while (nbtsock->send_queue) {
+               event_loop_once(nbtsock->event_ctx);
+       }
+       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, 
-                                                                 const struct nbt_peer_socket *src)
+                                                                 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);
@@ -9425,7 +9568,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;
@@ -9453,20 +9596,23 @@ static void test_conflict_owned_active_vs_replica_handler_release(struct nbt_nam
        talloc_free(rep_packet);
 
        /* make sure we push the reply to the wire */
-       event_loop_once(nbtsock->event_ctx);
-       msleep(25);
+       while (nbtsock->send_queue) {
+               event_loop_once(nbtsock->event_ctx);
+       }
+       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, 
-                                                         const struct nbt_peer_socket *src)
+                                                         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:
@@ -9482,42 +9628,78 @@ static void test_conflict_owned_active_vs_replica_handler(struct nbt_name_socket
 }
 
 /*
-  test WINS replication operations
+  test WINS replication replica conflicts operations
 */
-BOOL torture_nbt_winsreplication(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;
-       struct test_wrepl_conflict_conn *ctx;
 
-       make_nbt_name_server(&name, lp_parm_string(-1, "torture", "host"));
+       if (!torture_nbt_get_name(tctx, &name, &address))
+               return false;
 
-       /* 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;
-       }
+       ctx = test_create_conflict_ctx(tctx, address);
+       if (!ctx) return false;
 
-       ret &= test_assoc_ctx1(mem_ctx, address);
-       ret &= test_assoc_ctx2(mem_ctx, address);
+       ret &= test_conflict_same_owner(tctx, ctx);
+       ret &= test_conflict_different_owner(tctx, ctx);
 
-       ret &= test_wins_replication(mem_ctx, address);
+       return ret;
+}
 
-       ctx = test_create_conflict_ctx(mem_ctx, address);
-       if (!ctx) return False;
+/*
+  test WINS replication owned conflicts operations
+*/
+static bool torture_nbt_winsreplication_owned(struct torture_context *tctx)
+{
+       const char *address;
+       struct nbt_name name;
+       bool ret = true;
+       struct test_wrepl_conflict_conn *ctx;
+
+       if (torture_setting_bool(tctx, "quick", false))
+               torture_skip(tctx, 
+                       "skip NBT-WINSREPLICATION-OWNED test in quick test mode\n");
+
+       if (!torture_nbt_get_name(tctx, &name, &address))
+               return false;
 
-       ret &= test_conflict_same_owner(ctx);
-       ret &= test_conflict_different_owner(ctx);
-       ret &= test_conflict_owned_released_vs_replica(ctx);
-       ret &= test_conflict_owned_active_vs_replica(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 simple WINS replication operations
+*/
+struct torture_suite *torture_nbt_winsreplication(TALLOC_CTX *mem_ctx)
+{
+       struct torture_suite *suite = torture_suite_create(
+               mem_ctx, "WINSREPLICATION");
+       struct torture_tcase *tcase;
+
+       tcase = torture_suite_add_simple_test(suite, "assoc_ctx1", 
+                                            test_assoc_ctx1);
+       tcase->tests->dangerous = true;
+
+       torture_suite_add_simple_test(suite, "assoc_ctx2", 
+                                     test_assoc_ctx2);
+       
+       torture_suite_add_simple_test(suite, "wins_replication",
+                                     test_wins_replication);
+
+       torture_suite_add_simple_test(suite, "replica",
+                                     torture_nbt_winsreplication_replica);
+
+       torture_suite_add_simple_test(suite, "owned",
+                                     torture_nbt_winsreplication_owned);
+
+       return suite;
+}