diff --git a/apps/cli/cli_common.c b/apps/cli/cli_common.c
index 28a31cfd..38edfe9e 100644
--- a/apps/cli/cli_common.c
+++ b/apps/cli/cli_common.c
@@ -273,7 +273,7 @@ identityref_add_ns(cxobj *x,
     return retval;
 }
 
-/*! Given a top-level yspec and mountpoint xpath compute a set of  
+/*! Given a top-level yspec and mountpoint xpath compute api-path
  *
  * Manipulate top-level and a mountpoint:
  * YSPEC:    yspec0        yspec1
@@ -290,10 +290,10 @@ identityref_add_ns(cxobj *x,
  * @retval    -1    Error
  */
 int
-mtpoint_paths(yang_stmt  *yspec0,
-              char       *mtpoint,
-              char       *api_path_fmt1,
-              char      **api_path_fmt01)
+mtpoint_paths(yang_stmt *yspec0,
+              char      *mtpoint,
+              char      *api_path_fmt1,
+              char     **api_path_fmt01)
 {
     int        retval = -1;
     yang_stmt *yu = NULL;
diff --git a/docker/test/Makefile.in b/docker/test/Makefile.in
index e119ac13..1312b782 100644
--- a/docker/test/Makefile.in
+++ b/docker/test/Makefile.in
@@ -91,6 +91,10 @@ test: docker
 	./cleanup.sh ; ./start.sh # kill (ignore error) and the start it
 	sudo docker exec -t clixon-test bash -c 'cd /usr/local/bin/test && detail=true ./sum.sh'
 
+mem: docker
+	./cleanup.sh ; ./start.sh # kill (ignore error) and the start it
+	sudo docker exec -t clixon-test bash -c 'sudo apk add --update valgrind; cd /usr/local/bin/test && ./mem.sh'
+
 # Special-purpose memory test for snmp
 memsnmp: docker
 	./cleanup.sh ; ./start.sh # kill (ignore error) and the start it
diff --git a/test/cicd/clixon-mk.sh b/test/cicd/clixon-mk.sh
index 4445e242..b2aa8702 100644
--- a/test/cicd/clixon-mk.sh
+++ b/test/cicd/clixon-mk.sh
@@ -10,6 +10,5 @@ $MAKE clean
 $MAKE -j10
 sudo $MAKE install
 (cd example; $MAKE)
-(cd util; $MAKE)
 (cd example; sudo $MAKE install)
-(cd util; sudo $MAKE install)
+
diff --git a/test/cicd/coverage.sh b/test/cicd/coverage.sh
index 264fe1f1..32fec6f2 100755
--- a/test/cicd/coverage.sh
+++ b/test/cicd/coverage.sh
@@ -24,9 +24,7 @@ make CLIGEN_LIB=/usr/local/lib/libcligen.a
 sudo make install
 sudo make install-include
 (cd example; make)
-(cd util; make)
 (cd example; sudo make install)
-(cd util; sudo make install)
 
 # Kludge for netconf to touch all gcda files as root
 (cd test; sudo ./test_netconf_hello.sh) || true
diff --git a/test/test_yang_schema_mount.sh b/test/test_yang_schema_mount.sh
index 7bfd30c5..7689c4a7 100755
--- a/test/test_yang_schema_mount.sh
+++ b/test/test_yang_schema_mount.sh
@@ -184,7 +184,7 @@ if [ $BE -ne 0 ]; then
     if [ $? -ne 0 ]; then
         err
     fi
-    new "start backend -s init -f $cfg  -- -m clixon-mount0 -M urn:example:mount0"
+    new "start backend -s init -f $cfg -- -m clixon-mount0 -M urn:example:mount0"
     start_backend -s init -f $cfg -- -m clixon-mount0 -M urn:example:mount0
 fi
 
diff --git a/test/vagrant/clixon.sh b/test/vagrant/clixon.sh
index 5427aa01..d5765808 100755
--- a/test/vagrant/clixon.sh
+++ b/test/vagrant/clixon.sh
@@ -72,10 +72,19 @@ $MAKE clean
 $MAKE -j10
 sudo $MAKE install
 (cd example; $MAKE)
-(cd util; $MAKE)
 (cd example; sudo $MAKE install)
-(cd util; sudo $MAKE install)
 sudo ldconfig
+
+
+# Clixon-util
+test -d src/clixon-util || (cd src;git clone https://github.com/clicon/clixon-util.git)
+cd src/clixon
+git pull origin master
+./configure --with-cligen=/ --with-clixon=/ 
+$MAKE clean
+$MAKE -j10
+sudo $MAKE install
+
 cd test
 echo "#!/usr/bin/env bash" > ./site.sh
 echo "IPv6=true" >> ./site.sh