diff --git a/README.md b/README.md
index 8bb7e996..2ccc87b1 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
   <img src="https://www.clicon.org/Clixon_logga_liggande_med-ikon.png" width="400">
 </div>
 
-[![Build Status](https://travis-ci.org/clicon/clixon.png)](https://travis-ci.org/clicon/clixon) [![Documentation Status](https://readthedocs.org/projects/clixon-docs/badge/?version=latest)](https://clixon-docs.readthedocs.io/en/latest/?badge=latest) [![codecov](https://codecov.io/gh/clicon/clixon/branch/master/graph/badge.svg?token=6HXN51SARU)](https://codecov.io/gh/clicon/clixon)
+[![Build Status](https://travis-ci.org/clicon/clixon.png)](https://travis-ci.org/clicon/clixon) [![Documentation Status](https://readthedocs.org/projects/clixon-docs/badge/?version=latest)](https://clixon-docs.readthedocs.io/en/latest/?badge=latest) [![codecov](https://codecov.io/gh/clicon/clixon/branch/master/graph/badge.svg?token=qyc6ssg9E7)](https://codecov.io/gh/clicon/clixon)
 
 Clixon is a YANG-based configuration manager, with interactive CLI,
 NETCONF and RESTCONF interfaces, an embedded database and transaction
diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 00000000..0a0c5744
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,23 @@
+codecov:
+  require_ci_to_pass: yes
+
+coverage:
+  precision: 2
+  round: down
+  range: "70...100"
+
+parsers:
+  gcov:
+    branch_detection:
+      conditional: yes
+      loop: yes
+      method: no
+      macro: no
+
+comment:
+  layout: "reach,diff,flags,files,footer"
+  behavior: default
+  require_changes: no
+
+ignore:
+  - "util"  # ignore folders and all its contents
diff --git a/test/lib.sh b/test/lib.sh
index 35726212..201dc9ef 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -390,14 +390,18 @@ function wait_restconf(){
 # @note assumes port=80 if RCPROTO=http and port=443 if RCPROTO=https
 # @see wait_restconf
 function wait_restconf_stopped(){
+#    echo "curl $CURLOPTS $* $RCPROTO://localhost/restconf"
     hdr=$(curl $CURLOPTS $* $RCPROTO://localhost/restconf 2> /dev/null)
+#    echo "hdr:\"$hdr\""
     let i=0;
     while [[ $hdr = *"200 OK"* ]]; do
+#	echo "wait_restconf_stopped $i"
 	if [ $i -ge $DEMLOOP ]; then
 	    err1 "restconf timeout $DEMWAIT seconds"
 	fi
 	sleep $DEMSLEEP
 	hdr=$(curl $CURLOPTS $* $RCPROTO://localhost/restconf 2> /dev/null)
+#	echo "hdr:\"$hdr\""
 	let i++;
     done
     if [ $valgrindtest -eq 3 ]; then