diff -r 99a34860c105 -r d938228c382e src/server/test/testutils.c
--- a/src/server/test/testutils.c	Wed Nov 02 19:19:01 2022 +0100
+++ b/src/server/test/testutils.c	Sun Nov 06 15:53:32 2022 +0100
@@ -29,8 +29,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <ucx/string.h>
-#include <ucx/utils.h>
+#include <cx/string.h>
+#include <cx/utils.h>
+#include <cx/printf.h>
 
 #include "../util/pblock.h"
 
@@ -54,7 +55,7 @@
     ZERO(&httprequest, sizeof(HTTPRequest));
     request_initialize(pool, &httprequest, rq);
     
-    sstr_t clf = ucx_sprintf("%s %s HTTP/1.1", method, uri);
+    cxmutstr clf = cx_asprintf("%s %s HTTP/1.1", method, uri);
     pblock_kvinsert(
             pb_key_clf_request,
             clf.ptr,
@@ -100,7 +101,7 @@
 }
 
 void testutil_request_body(Session *sn, Request *rq, const char *body, size_t len) {
-    sstr_t cl = ucx_sprintf("%d", (int)len);
+    cxmutstr cl = cx_asprintf("%d", (int)len);
     pblock_nvreplace("content-length", cl.ptr, rq->headers);
     free(cl.ptr);
     
@@ -122,7 +123,7 @@
 
 static ssize_t test_io_write(IOStream *io, void *buf, size_t size) {
     TestIOStream *st = (TestIOStream*)io;
-    return ucx_buffer_write(buf, 1, size, st->buf);
+    return cxBufferWrite(buf, 1, size, st->buf);
 }
 
 static ssize_t test_io_writev(IOStream *io, struct iovec *iovec, int iovctn) {
@@ -153,9 +154,10 @@
     TestIOStream *stream = calloc(1, sizeof(TestIOStream));
     int flags = 0;
     if(autoextend) {
-        flags = UCX_BUFFER_AUTOEXTEND;
+        flags = CX_BUFFER_AUTO_EXTEND|CX_BUFFER_FREE_CONTENTS;
     }
-    stream->buf = ucx_buffer_new(NULL, size, flags);
+    stream->buf = malloc(sizeof(CxBuffer));
+    cxBufferInit(stream->buf, NULL, size, cxDefaultAllocator, flags);
     
     stream->io.st.write = test_io_write;
     stream->io.st.writev = test_io_writev;
@@ -166,6 +168,7 @@
 }
 
 void testutil_iostream_destroy(TestIOStream *stream) {
-    ucx_buffer_free(stream->buf);
+    cxBufferDestroy(stream->buf);
+    free(stream->buf);
     free(stream);
 }