15 files changed, 1132 insertions, 1161 deletions

diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 31d79df6..7798a72e 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -8,9 +8,9 @@ check_PROGRAMS = @EXTRA_TEST@
 AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
         -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 
-EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3
+EXTRA_PROGRAMS = test_utils test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3 test_generic_output
 
-np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini1.t test_ini3.t test_opts1.t test_opts2.t test_opts3.t test_tcp.t test_utils.t
+np_test_scripts = test_base64.t test_cmd.t test_ini1.t test_ini3.t test_opts1.t test_opts2.t test_opts3.t test_tcp.t test_utils.t test_generic_output.t
 np_test_files = config-dos.ini config-opts.ini config-tiny.ini plugin.ini plugins.ini
 EXTRA_DIST = $(np_test_scripts) $(np_test_files) var
 
@@ -29,7 +29,7 @@ AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags)
 AM_LDFLAGS = $(tap_ldflags) -ltap
 LDADD = $(top_srcdir)/lib/libmonitoringplug.a $(top_srcdir)/gl/libgnu.a $(LIB_CRYPTO)
 
-SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c
+SOURCES = test_utils.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c test_generic_output.c
 
 test: ${noinst_PROGRAMS}
         perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
diff --git a/lib/tests/test_base64.c b/lib/tests/test_base64.c
index 05dd7943..798244da 100644
--- a/lib/tests/test_base64.c
+++ b/lib/tests/test_base64.c
@@ -1,29 +1,27 @@
 /*****************************************************************************
-*
-* 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 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* 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, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #include "common.h"
 #include "gl/base64.h"
 #include "tap.h"
 
-int
-main (int argc, char **argv)
-{
-#if 0  /* The current base64 function doesn't work on 8bit data */
+int main(int argc, char **argv) {
+#if 0 /* The current base64 function doesn't work on 8bit data */
         char random[1024] = {
         0x8b,0xb0,0xc4,0xe2,0xfc,0x22,0x9f,0x0d,0x85,0xe7,0x2c,0xaa,0x39,0xa1,0x46,0x88,
         0x50,0xe6,0x34,0x37,0x0b,0x45,0x4b,0xb8,0xb2,0x86,0x7a,0x3e,0x7f,0x0c,0x40,0x18,
@@ -182,168 +180,175 @@ main (int argc, char **argv)
 #endif
 
         char random[1024] = {
-        0x0b,0x30,0x44,0x62,0x7c,0x22,0x1f,0x0d,0x05,0x67,0x2c,0x2a,0x39,0x21,0x46,0x08,
-        0x50,0x66,0x34,0x37,0x0b,0x45,0x4b,0x38,0x32,0x06,0x7a,0x3e,0x7f,0x0c,0x40,0x18,
-        0x6b,0x2d,0x60,0x4c,0x60,0x0c,0x23,0x43,0x3b,0x3e,0x1b,0x16,0x04,0x46,0x58,0x3f,
-        0x40,0x6a,0x11,0x05,0x63,0x71,0x14,0x35,0x47,0x79,0x13,0x6f,0x6b,0x27,0x18,0x5b,
-        0x48,0x27,0x3e,0x6f,0x15,0x33,0x4f,0x3e,0x5e,0x51,0x73,0x68,0x25,0x0f,0x06,0x5b,
-        0x7c,0x72,0x75,0x3e,0x3f,0x1b,0x5c,0x6d,0x6a,0x39,0x7c,0x63,0x63,0x60,0x6c,0x7a,
-        0x33,0x76,0x52,0x13,0x25,0x33,0x7d,0x65,0x23,0x27,0x11,0x06,0x06,0x47,0x71,0x1e,
-        0x14,0x74,0x63,0x70,0x2d,0x15,0x27,0x18,0x51,0x06,0x05,0x33,0x11,0x2c,0x6b,0x00,
-        0x2d,0x77,0x20,0x48,0x0d,0x73,0x51,0x45,0x25,0x7f,0x7f,0x35,0x26,0x2e,0x26,0x53,
-        0x24,0x68,0x1e,0x0e,0x58,0x3a,0x59,0x50,0x56,0x37,0x5f,0x66,0x01,0x4c,0x5a,0x64,
-        0x32,0x50,0x7b,0x6a,0x20,0x72,0x2b,0x1d,0x7e,0x43,0x7b,0x61,0x42,0x0b,0x61,0x73,
-        0x24,0x79,0x3a,0x6b,0x4a,0x79,0x6e,0x09,0x0f,0x27,0x2d,0x0c,0x5e,0x32,0x4b,0x0d,
-        0x79,0x46,0x39,0x21,0x0a,0x26,0x5f,0x3a,0x00,0x26,0x3f,0x13,0x2e,0x7e,0x50,0x2b,
-        0x67,0x46,0x72,0x3f,0x3b,0x01,0x46,0x1b,0x0b,0x35,0x49,0x39,0x19,0x70,0x3d,0x02,
-        0x41,0x0e,0x38,0x05,0x76,0x65,0x4f,0x31,0x6c,0x5e,0x17,0x04,0x15,0x36,0x26,0x64,
-        0x34,0x14,0x17,0x7c,0x0e,0x0b,0x5b,0x55,0x53,0x6b,0x00,0x42,0x41,0x4f,0x02,0x5c,
-        0x13,0x0a,0x2c,0x2c,0x3e,0x10,0x14,0x33,0x45,0x7c,0x7a,0x5a,0x31,0x61,0x39,0x08,
-        0x22,0x6a,0x1e,0x0f,0x6f,0x1b,0x6c,0x13,0x5e,0x79,0x20,0x79,0x50,0x62,0x06,0x2c,
-        0x76,0x17,0x04,0x2b,0x2a,0x75,0x1f,0x0c,0x37,0x4e,0x0f,0x7b,0x2d,0x34,0x75,0x60,
-        0x31,0x74,0x2e,0x0a,0x4a,0x11,0x6c,0x49,0x25,0x01,0x3a,0x3d,0x22,0x1e,0x6d,0x18,
-        0x51,0x78,0x2d,0x62,0x31,0x4c,0x50,0x40,0x17,0x4b,0x6f,0x22,0x00,0x7f,0x61,0x2a,
-        0x34,0x3e,0x00,0x5f,0x2f,0x5f,0x2f,0x14,0x2a,0x55,0x27,0x1f,0x46,0x1f,0x12,0x46,
-        0x5e,0x1e,0x0c,0x7c,0x38,0x01,0x61,0x64,0x76,0x22,0x6e,0x08,0x20,0x38,0x4f,0x73,
-        0x72,0x55,0x12,0x42,0x19,0x50,0x61,0x43,0x77,0x7d,0x41,0x2e,0x35,0x4f,0x3d,0x31,
-        0x28,0x58,0x67,0x1b,0x03,0x51,0x20,0x32,0x1c,0x08,0x6e,0x37,0x75,0x37,0x44,0x4f,
-        0x68,0x19,0x07,0x64,0x14,0x28,0x25,0x2b,0x69,0x35,0x18,0x27,0x26,0x14,0x13,0x70,
-        0x42,0x19,0x12,0x75,0x3e,0x02,0x5d,0x7c,0x13,0x1f,0x16,0x53,0x3b,0x74,0x48,0x3c,
-        0x5e,0x39,0x6c,0x1c,0x1c,0x74,0x39,0x1f,0x00,0x1b,0x06,0x0a,0x68,0x3b,0x52,0x4f,
-        0x1e,0x6e,0x3c,0x35,0x0c,0x38,0x0e,0x0b,0x3b,0x1a,0x76,0x23,0x29,0x53,0x1e,0x5f,
-        0x41,0x0c,0x4b,0x0a,0x65,0x28,0x78,0x67,0x48,0x59,0x26,0x6d,0x31,0x76,0x23,0x70,
-        0x61,0x64,0x3b,0x38,0x79,0x66,0x74,0x53,0x2c,0x64,0x64,0x54,0x03,0x54,0x65,0x44,
-        0x4c,0x18,0x4f,0x48,0x20,0x4f,0x72,0x10,0x3f,0x0c,0x52,0x2d,0x03,0x14,0x03,0x51,
-        0x42,0x10,0x77,0x6a,0x34,0x06,0x32,0x03,0x72,0x14,0x7c,0x08,0x5d,0x52,0x1a,0x62,
-        0x7c,0x3e,0x30,0x7e,0x5f,0x7f,0x54,0x0f,0x44,0x49,0x5d,0x5e,0x10,0x6a,0x06,0x2b,
-        0x06,0x53,0x10,0x39,0x37,0x32,0x4a,0x4e,0x3d,0x2b,0x65,0x38,0x39,0x07,0x72,0x54,
-        0x64,0x4d,0x56,0x6a,0x03,0x22,0x70,0x7b,0x5f,0x60,0x0b,0x2a,0x0b,0x6b,0x10,0x64,
-        0x14,0x05,0x22,0x00,0x73,0x40,0x23,0x5b,0x51,0x1f,0x2b,0x1a,0x5d,0x69,0x7a,0x46,
-        0x0c,0x5f,0x32,0x4b,0x4a,0x28,0x52,0x79,0x5b,0x12,0x42,0x18,0x00,0x5d,0x27,0x31,
-        0x53,0x3c,0x4c,0x36,0x4e,0x38,0x3f,0x72,0x03,0x71,0x02,0x5b,0x36,0x59,0x7f,0x75,
-        0x6e,0x08,0x54,0x0d,0x34,0x1c,0x34,0x57,0x5d,0x69,0x48,0x00,0x3b,0x05,0x07,0x6e,
-        0x27,0x65,0x6e,0x40,0x3d,0x3a,0x4f,0x72,0x5d,0x39,0x16,0x0f,0x63,0x12,0x12,0x15,
-        0x3a,0x70,0x0d,0x57,0x18,0x0d,0x5e,0x3d,0x22,0x68,0x68,0x7c,0x6d,0x4f,0x0c,0x7b,
-        0x09,0x2d,0x4a,0x73,0x20,0x47,0x07,0x57,0x75,0x5d,0x53,0x70,0x34,0x21,0x40,0x57,
-        0x51,0x5e,0x49,0x44,0x00,0x54,0x27,0x04,0x68,0x7e,0x59,0x56,0x58,0x74,0x14,0x3c,
-        0x16,0x33,0x41,0x16,0x4b,0x2f,0x49,0x37,0x0a,0x54,0x08,0x08,0x1f,0x39,0x67,0x76,
-        0x28,0x28,0x07,0x1d,0x61,0x47,0x51,0x4d,0x75,0x26,0x52,0x47,0x47,0x0c,0x57,0x58,
-        0x74,0x3e,0x62,0x6c,0x58,0x3a,0x44,0x1e,0x16,0x2e,0x21,0x1c,0x73,0x45,0x67,0x74,
-        0x4f,0x33,0x66,0x0e,0x74,0x66,0x26,0x1f,0x2e,0x38,0x44,0x40,0x7e,0x2a,0x50,0x52,
-        0x5e,0x43,0x01,0x7a,0x38,0x49,0x3c,0x55,0x4d,0x5a,0x44,0x08,0x26,0x59,0x4d,0x45,
-        0x0b,0x48,0x0a,0x33,0x5e,0x4a,0x4d,0x75,0x16,0x17,0x63,0x46,0x01,0x2a,0x55,0x7b,
-        0x0f,0x02,0x73,0x6a,0x4b,0x7f,0x75,0x65,0x3c,0x4c,0x33,0x39,0x6c,0x74,0x05,0x60,
-        0x0f,0x7f,0x2d,0x41,0x4d,0x4d,0x46,0x71,0x09,0x6f,0x4f,0x60,0x15,0x0f,0x46,0x73,
-        0x63,0x4c,0x5e,0x74,0x30,0x0d,0x28,0x43,0x08,0x72,0x32,0x04,0x2e,0x31,0x29,0x27,
-        0x44,0x6d,0x13,0x17,0x48,0x0f,0x49,0x52,0x10,0x13,0x7f,0x17,0x16,0x62,0x79,0x35,
-        0x78,0x3e,0x01,0x7c,0x2e,0x0f,0x76,0x3e,0x5e,0x53,0x6c,0x5b,0x5f,0x7c,0x19,0x41,
-        0x02,0x2f,0x17,0x64,0x41,0x75,0x10,0x04,0x47,0x7c,0x3d,0x4b,0x52,0x00,0x10,0x5d,
-        0x51,0x4e,0x7a,0x27,0x25,0x55,0x40,0x12,0x35,0x60,0x05,0x1b,0x34,0x2d,0x04,0x7a,
-        0x6a,0x69,0x02,0x79,0x03,0x3a,0x2f,0x06,0x0a,0x79,0x7b,0x12,0x5d,0x7c,0x52,0x29,
-        0x47,0x58,0x12,0x73,0x3f,0x27,0x56,0x05,0x0c,0x48,0x32,0x58,0x6b,0x57,0x5c,0x03,
-        0x64,0x56,0x11,0x52,0x7a,0x30,0x36,0x29,0x17,0x3b,0x68,0x7a,0x7c,0x05,0x6b,0x6b,
-        0x13,0x6a,0x24,0x5c,0x68,0x42,0x18,0x32,0x03,0x73,0x6e,0x04,0x21,0x2e,0x01,0x04,
-        0x63,0x7d,0x44,0x41,0x12,0x31,0x0b,0x15,0x1f,0x70,0x00,0x2e,0x66,0x14,0x3c,0x7f,
-        0x2b,0x00,0x1f,0x0c,0x28,0x59,0x0a,0x16,0x49,0x5a,0x5c,0x64,0x65,0x4b,0x11,0x29,
-        0x15,0x36,0x5a,0x65,0x19,0x4f,0x60,0x23,0x3a,0x3a,0x13,0x25,0x02,0x78,0x4c,0x54
-        };
-  char b64_known[1369] = {
-        0x43,0x7a,0x42,0x45,0x59,0x6e,0x77,0x69,0x48,0x77,0x30,0x46,0x5a,0x79,0x77,0x71,
-        0x4f,0x53,0x46,0x47,0x43,0x46,0x42,0x6d,0x4e,0x44,0x63,0x4c,0x52,0x55,0x73,0x34,
-        0x4d,0x67,0x5a,0x36,0x50,0x6e,0x38,0x4d,0x51,0x42,0x68,0x72,0x4c,0x57,0x42,0x4d,
-        0x59,0x41,0x77,0x6a,0x51,0x7a,0x73,0x2b,0x47,0x78,0x59,0x45,0x52,0x6c,0x67,0x2f,
-        0x51,0x47,0x6f,0x52,0x42,0x57,0x4e,0x78,0x46,0x44,0x56,0x48,0x65,0x52,0x4e,0x76,
-        0x61,0x79,0x63,0x59,0x57,0x30,0x67,0x6e,0x50,0x6d,0x38,0x56,0x4d,0x30,0x38,0x2b,
-        0x58,0x6c,0x46,0x7a,0x61,0x43,0x55,0x50,0x42,0x6c,0x74,0x38,0x63,0x6e,0x55,0x2b,
-        0x50,0x78,0x74,0x63,0x62,0x57,0x6f,0x35,0x66,0x47,0x4e,0x6a,0x59,0x47,0x78,0x36,
-        0x4d,0x33,0x5a,0x53,0x45,0x79,0x55,0x7a,0x66,0x57,0x55,0x6a,0x4a,0x78,0x45,0x47,
-        0x42,0x6b,0x64,0x78,0x48,0x68,0x52,0x30,0x59,0x33,0x41,0x74,0x46,0x53,0x63,0x59,
-        0x55,0x51,0x59,0x46,0x4d,0x78,0x45,0x73,0x61,0x77,0x41,0x74,0x64,0x79,0x42,0x49,
-        0x44,0x58,0x4e,0x52,0x52,0x53,0x56,0x2f,0x66,0x7a,0x55,0x6d,0x4c,0x69,0x5a,0x54,
-        0x4a,0x47,0x67,0x65,0x44,0x6c,0x67,0x36,0x57,0x56,0x42,0x57,0x4e,0x31,0x39,0x6d,
-        0x41,0x55,0x78,0x61,0x5a,0x44,0x4a,0x51,0x65,0x32,0x6f,0x67,0x63,0x69,0x73,0x64,
-        0x66,0x6b,0x4e,0x37,0x59,0x55,0x49,0x4c,0x59,0x58,0x4d,0x6b,0x65,0x54,0x70,0x72,
-        0x53,0x6e,0x6c,0x75,0x43,0x51,0x38,0x6e,0x4c,0x51,0x78,0x65,0x4d,0x6b,0x73,0x4e,
-        0x65,0x55,0x59,0x35,0x49,0x51,0x6f,0x6d,0x58,0x7a,0x6f,0x41,0x4a,0x6a,0x38,0x54,
-        0x4c,0x6e,0x35,0x51,0x4b,0x32,0x64,0x47,0x63,0x6a,0x38,0x37,0x41,0x55,0x59,0x62,
-        0x43,0x7a,0x56,0x4a,0x4f,0x52,0x6c,0x77,0x50,0x51,0x4a,0x42,0x44,0x6a,0x67,0x46,
-        0x64,0x6d,0x56,0x50,0x4d,0x57,0x78,0x65,0x46,0x77,0x51,0x56,0x4e,0x69,0x5a,0x6b,
-        0x4e,0x42,0x51,0x58,0x66,0x41,0x34,0x4c,0x57,0x31,0x56,0x54,0x61,0x77,0x42,0x43,
-        0x51,0x55,0x38,0x43,0x58,0x42,0x4d,0x4b,0x4c,0x43,0x77,0x2b,0x45,0x42,0x51,0x7a,
-        0x52,0x58,0x78,0x36,0x57,0x6a,0x46,0x68,0x4f,0x51,0x67,0x69,0x61,0x68,0x34,0x50,
-        0x62,0x78,0x74,0x73,0x45,0x31,0x35,0x35,0x49,0x48,0x6c,0x51,0x59,0x67,0x59,0x73,
-        0x64,0x68,0x63,0x45,0x4b,0x79,0x70,0x31,0x48,0x77,0x77,0x33,0x54,0x67,0x39,0x37,
-        0x4c,0x54,0x52,0x31,0x59,0x44,0x46,0x30,0x4c,0x67,0x70,0x4b,0x45,0x57,0x78,0x4a,
-        0x4a,0x51,0x45,0x36,0x50,0x53,0x49,0x65,0x62,0x52,0x68,0x52,0x65,0x43,0x31,0x69,
-        0x4d,0x55,0x78,0x51,0x51,0x42,0x64,0x4c,0x62,0x79,0x49,0x41,0x66,0x32,0x45,0x71,
-        0x4e,0x44,0x34,0x41,0x58,0x79,0x39,0x66,0x4c,0x78,0x51,0x71,0x56,0x53,0x63,0x66,
-        0x52,0x68,0x38,0x53,0x52,0x6c,0x34,0x65,0x44,0x48,0x77,0x34,0x41,0x57,0x46,0x6b,
-        0x64,0x69,0x4a,0x75,0x43,0x43,0x41,0x34,0x54,0x33,0x4e,0x79,0x56,0x52,0x4a,0x43,
-        0x47,0x56,0x42,0x68,0x51,0x33,0x64,0x39,0x51,0x53,0x34,0x31,0x54,0x7a,0x30,0x78,
-        0x4b,0x46,0x68,0x6e,0x47,0x77,0x4e,0x52,0x49,0x44,0x49,0x63,0x43,0x47,0x34,0x33,
-        0x64,0x54,0x64,0x45,0x54,0x32,0x67,0x5a,0x42,0x32,0x51,0x55,0x4b,0x43,0x55,0x72,
-        0x61,0x54,0x55,0x59,0x4a,0x79,0x59,0x55,0x45,0x33,0x42,0x43,0x47,0x52,0x4a,0x31,
-        0x50,0x67,0x4a,0x64,0x66,0x42,0x4d,0x66,0x46,0x6c,0x4d,0x37,0x64,0x45,0x67,0x38,
-        0x58,0x6a,0x6c,0x73,0x48,0x42,0x78,0x30,0x4f,0x52,0x38,0x41,0x47,0x77,0x59,0x4b,
-        0x61,0x44,0x74,0x53,0x54,0x78,0x35,0x75,0x50,0x44,0x55,0x4d,0x4f,0x41,0x34,0x4c,
-        0x4f,0x78,0x70,0x32,0x49,0x79,0x6c,0x54,0x48,0x6c,0x39,0x42,0x44,0x45,0x73,0x4b,
-        0x5a,0x53,0x68,0x34,0x5a,0x30,0x68,0x5a,0x4a,0x6d,0x30,0x78,0x64,0x69,0x4e,0x77,
-        0x59,0x57,0x51,0x37,0x4f,0x48,0x6c,0x6d,0x64,0x46,0x4d,0x73,0x5a,0x47,0x52,0x55,
-        0x41,0x31,0x52,0x6c,0x52,0x45,0x77,0x59,0x54,0x30,0x67,0x67,0x54,0x33,0x49,0x51,
-        0x50,0x77,0x78,0x53,0x4c,0x51,0x4d,0x55,0x41,0x31,0x46,0x43,0x45,0x48,0x64,0x71,
-        0x4e,0x41,0x59,0x79,0x41,0x33,0x49,0x55,0x66,0x41,0x68,0x64,0x55,0x68,0x70,0x69,
-        0x66,0x44,0x34,0x77,0x66,0x6c,0x39,0x2f,0x56,0x41,0x39,0x45,0x53,0x56,0x31,0x65,
-        0x45,0x47,0x6f,0x47,0x4b,0x77,0x5a,0x54,0x45,0x44,0x6b,0x33,0x4d,0x6b,0x70,0x4f,
-        0x50,0x53,0x74,0x6c,0x4f,0x44,0x6b,0x48,0x63,0x6c,0x52,0x6b,0x54,0x56,0x5a,0x71,
-        0x41,0x79,0x4a,0x77,0x65,0x31,0x39,0x67,0x43,0x79,0x6f,0x4c,0x61,0x78,0x42,0x6b,
-        0x46,0x41,0x55,0x69,0x41,0x48,0x4e,0x41,0x49,0x31,0x74,0x52,0x48,0x79,0x73,0x61,
-        0x58,0x57,0x6c,0x36,0x52,0x67,0x78,0x66,0x4d,0x6b,0x74,0x4b,0x4b,0x46,0x4a,0x35,
-        0x57,0x78,0x4a,0x43,0x47,0x41,0x42,0x64,0x4a,0x7a,0x46,0x54,0x50,0x45,0x77,0x32,
-        0x54,0x6a,0x67,0x2f,0x63,0x67,0x4e,0x78,0x41,0x6c,0x73,0x32,0x57,0x58,0x39,0x31,
-        0x62,0x67,0x68,0x55,0x44,0x54,0x51,0x63,0x4e,0x46,0x64,0x64,0x61,0x55,0x67,0x41,
-        0x4f,0x77,0x55,0x48,0x62,0x69,0x64,0x6c,0x62,0x6b,0x41,0x39,0x4f,0x6b,0x39,0x79,
-        0x58,0x54,0x6b,0x57,0x44,0x32,0x4d,0x53,0x45,0x68,0x55,0x36,0x63,0x41,0x31,0x58,
-        0x47,0x41,0x31,0x65,0x50,0x53,0x4a,0x6f,0x61,0x48,0x78,0x74,0x54,0x77,0x78,0x37,
-        0x43,0x53,0x31,0x4b,0x63,0x79,0x42,0x48,0x42,0x31,0x64,0x31,0x58,0x56,0x4e,0x77,
-        0x4e,0x43,0x46,0x41,0x56,0x31,0x46,0x65,0x53,0x55,0x51,0x41,0x56,0x43,0x63,0x45,
-        0x61,0x48,0x35,0x5a,0x56,0x6c,0x68,0x30,0x46,0x44,0x77,0x57,0x4d,0x30,0x45,0x57,
-        0x53,0x79,0x39,0x4a,0x4e,0x77,0x70,0x55,0x43,0x41,0x67,0x66,0x4f,0x57,0x64,0x32,
-        0x4b,0x43,0x67,0x48,0x48,0x57,0x46,0x48,0x55,0x55,0x31,0x31,0x4a,0x6c,0x4a,0x48,
-        0x52,0x77,0x78,0x58,0x57,0x48,0x51,0x2b,0x59,0x6d,0x78,0x59,0x4f,0x6b,0x51,0x65,
-        0x46,0x69,0x34,0x68,0x48,0x48,0x4e,0x46,0x5a,0x33,0x52,0x50,0x4d,0x32,0x59,0x4f,
-        0x64,0x47,0x59,0x6d,0x48,0x79,0x34,0x34,0x52,0x45,0x42,0x2b,0x4b,0x6c,0x42,0x53,
-        0x58,0x6b,0x4d,0x42,0x65,0x6a,0x68,0x4a,0x50,0x46,0x56,0x4e,0x57,0x6b,0x51,0x49,
-        0x4a,0x6c,0x6c,0x4e,0x52,0x51,0x74,0x49,0x43,0x6a,0x4e,0x65,0x53,0x6b,0x31,0x31,
-        0x46,0x68,0x64,0x6a,0x52,0x67,0x45,0x71,0x56,0x58,0x73,0x50,0x41,0x6e,0x4e,0x71,
-        0x53,0x33,0x39,0x31,0x5a,0x54,0x78,0x4d,0x4d,0x7a,0x6c,0x73,0x64,0x41,0x56,0x67,
-        0x44,0x33,0x38,0x74,0x51,0x55,0x31,0x4e,0x52,0x6e,0x45,0x4a,0x62,0x30,0x39,0x67,
-        0x46,0x51,0x39,0x47,0x63,0x32,0x4e,0x4d,0x58,0x6e,0x51,0x77,0x44,0x53,0x68,0x44,
-        0x43,0x48,0x49,0x79,0x42,0x43,0x34,0x78,0x4b,0x53,0x64,0x45,0x62,0x52,0x4d,0x58,
-        0x53,0x41,0x39,0x4a,0x55,0x68,0x41,0x54,0x66,0x78,0x63,0x57,0x59,0x6e,0x6b,0x31,
-        0x65,0x44,0x34,0x42,0x66,0x43,0x34,0x50,0x64,0x6a,0x35,0x65,0x55,0x32,0x78,0x62,
-        0x58,0x33,0x77,0x5a,0x51,0x51,0x49,0x76,0x46,0x32,0x52,0x42,0x64,0x52,0x41,0x45,
-        0x52,0x33,0x77,0x39,0x53,0x31,0x49,0x41,0x45,0x46,0x31,0x52,0x54,0x6e,0x6f,0x6e,
-        0x4a,0x56,0x56,0x41,0x45,0x6a,0x56,0x67,0x42,0x52,0x73,0x30,0x4c,0x51,0x52,0x36,
-        0x61,0x6d,0x6b,0x43,0x65,0x51,0x4d,0x36,0x4c,0x77,0x59,0x4b,0x65,0x58,0x73,0x53,
-        0x58,0x58,0x78,0x53,0x4b,0x55,0x64,0x59,0x45,0x6e,0x4d,0x2f,0x4a,0x31,0x59,0x46,
-        0x44,0x45,0x67,0x79,0x57,0x47,0x74,0x58,0x58,0x41,0x4e,0x6b,0x56,0x68,0x46,0x53,
-        0x65,0x6a,0x41,0x32,0x4b,0x52,0x63,0x37,0x61,0x48,0x70,0x38,0x42,0x57,0x74,0x72,
-        0x45,0x32,0x6f,0x6b,0x58,0x47,0x68,0x43,0x47,0x44,0x49,0x44,0x63,0x32,0x34,0x45,
-        0x49,0x53,0x34,0x42,0x42,0x47,0x4e,0x39,0x52,0x45,0x45,0x53,0x4d,0x51,0x73,0x56,
-        0x48,0x33,0x41,0x41,0x4c,0x6d,0x59,0x55,0x50,0x48,0x38,0x72,0x41,0x42,0x38,0x4d,
-        0x4b,0x46,0x6b,0x4b,0x46,0x6b,0x6c,0x61,0x58,0x47,0x52,0x6c,0x53,0x78,0x45,0x70,
-        0x46,0x54,0x5a,0x61,0x5a,0x52,0x6c,0x50,0x59,0x43,0x4d,0x36,0x4f,0x68,0x4d,0x6c,
-        0x41,0x6e,0x68,0x4d,0x56,0x41,0x3d,0x3d,0x00
-        };
+                0x0b, 0x30, 0x44, 0x62, 0x7c, 0x22, 0x1f, 0x0d, 0x05, 0x67, 0x2c, 0x2a, 0x39, 0x21, 0x46,
+                0x08, 0x50, 0x66, 0x34, 0x37, 0x0b, 0x45, 0x4b, 0x38, 0x32, 0x06, 0x7a, 0x3e, 0x7f, 0x0c,
+                0x40, 0x18, 0x6b, 0x2d, 0x60, 0x4c, 0x60, 0x0c, 0x23, 0x43, 0x3b, 0x3e, 0x1b, 0x16, 0x04,
+                0x46, 0x58, 0x3f, 0x40, 0x6a, 0x11, 0x05, 0x63, 0x71, 0x14, 0x35, 0x47, 0x79, 0x13, 0x6f,
+                0x6b, 0x27, 0x18, 0x5b, 0x48, 0x27, 0x3e, 0x6f, 0x15, 0x33, 0x4f, 0x3e, 0x5e, 0x51, 0x73,
+                0x68, 0x25, 0x0f, 0x06, 0x5b, 0x7c, 0x72, 0x75, 0x3e, 0x3f, 0x1b, 0x5c, 0x6d, 0x6a, 0x39,
+                0x7c, 0x63, 0x63, 0x60, 0x6c, 0x7a, 0x33, 0x76, 0x52, 0x13, 0x25, 0x33, 0x7d, 0x65, 0x23,
+                0x27, 0x11, 0x06, 0x06, 0x47, 0x71, 0x1e, 0x14, 0x74, 0x63, 0x70, 0x2d, 0x15, 0x27, 0x18,
+                0x51, 0x06, 0x05, 0x33, 0x11, 0x2c, 0x6b, 0x00, 0x2d, 0x77, 0x20, 0x48, 0x0d, 0x73, 0x51,
+                0x45, 0x25, 0x7f, 0x7f, 0x35, 0x26, 0x2e, 0x26, 0x53, 0x24, 0x68, 0x1e, 0x0e, 0x58, 0x3a,
+                0x59, 0x50, 0x56, 0x37, 0x5f, 0x66, 0x01, 0x4c, 0x5a, 0x64, 0x32, 0x50, 0x7b, 0x6a, 0x20,
+                0x72, 0x2b, 0x1d, 0x7e, 0x43, 0x7b, 0x61, 0x42, 0x0b, 0x61, 0x73, 0x24, 0x79, 0x3a, 0x6b,
+                0x4a, 0x79, 0x6e, 0x09, 0x0f, 0x27, 0x2d, 0x0c, 0x5e, 0x32, 0x4b, 0x0d, 0x79, 0x46, 0x39,
+                0x21, 0x0a, 0x26, 0x5f, 0x3a, 0x00, 0x26, 0x3f, 0x13, 0x2e, 0x7e, 0x50, 0x2b, 0x67, 0x46,
+                0x72, 0x3f, 0x3b, 0x01, 0x46, 0x1b, 0x0b, 0x35, 0x49, 0x39, 0x19, 0x70, 0x3d, 0x02, 0x41,
+                0x0e, 0x38, 0x05, 0x76, 0x65, 0x4f, 0x31, 0x6c, 0x5e, 0x17, 0x04, 0x15, 0x36, 0x26, 0x64,
+                0x34, 0x14, 0x17, 0x7c, 0x0e, 0x0b, 0x5b, 0x55, 0x53, 0x6b, 0x00, 0x42, 0x41, 0x4f, 0x02,
+                0x5c, 0x13, 0x0a, 0x2c, 0x2c, 0x3e, 0x10, 0x14, 0x33, 0x45, 0x7c, 0x7a, 0x5a, 0x31, 0x61,
+                0x39, 0x08, 0x22, 0x6a, 0x1e, 0x0f, 0x6f, 0x1b, 0x6c, 0x13, 0x5e, 0x79, 0x20, 0x79, 0x50,
+                0x62, 0x06, 0x2c, 0x76, 0x17, 0x04, 0x2b, 0x2a, 0x75, 0x1f, 0x0c, 0x37, 0x4e, 0x0f, 0x7b,
+                0x2d, 0x34, 0x75, 0x60, 0x31, 0x74, 0x2e, 0x0a, 0x4a, 0x11, 0x6c, 0x49, 0x25, 0x01, 0x3a,
+                0x3d, 0x22, 0x1e, 0x6d, 0x18, 0x51, 0x78, 0x2d, 0x62, 0x31, 0x4c, 0x50, 0x40, 0x17, 0x4b,
+                0x6f, 0x22, 0x00, 0x7f, 0x61, 0x2a, 0x34, 0x3e, 0x00, 0x5f, 0x2f, 0x5f, 0x2f, 0x14, 0x2a,
+                0x55, 0x27, 0x1f, 0x46, 0x1f, 0x12, 0x46, 0x5e, 0x1e, 0x0c, 0x7c, 0x38, 0x01, 0x61, 0x64,
+                0x76, 0x22, 0x6e, 0x08, 0x20, 0x38, 0x4f, 0x73, 0x72, 0x55, 0x12, 0x42, 0x19, 0x50, 0x61,
+                0x43, 0x77, 0x7d, 0x41, 0x2e, 0x35, 0x4f, 0x3d, 0x31, 0x28, 0x58, 0x67, 0x1b, 0x03, 0x51,
+                0x20, 0x32, 0x1c, 0x08, 0x6e, 0x37, 0x75, 0x37, 0x44, 0x4f, 0x68, 0x19, 0x07, 0x64, 0x14,
+                0x28, 0x25, 0x2b, 0x69, 0x35, 0x18, 0x27, 0x26, 0x14, 0x13, 0x70, 0x42, 0x19, 0x12, 0x75,
+                0x3e, 0x02, 0x5d, 0x7c, 0x13, 0x1f, 0x16, 0x53, 0x3b, 0x74, 0x48, 0x3c, 0x5e, 0x39, 0x6c,
+                0x1c, 0x1c, 0x74, 0x39, 0x1f, 0x00, 0x1b, 0x06, 0x0a, 0x68, 0x3b, 0x52, 0x4f, 0x1e, 0x6e,
+                0x3c, 0x35, 0x0c, 0x38, 0x0e, 0x0b, 0x3b, 0x1a, 0x76, 0x23, 0x29, 0x53, 0x1e, 0x5f, 0x41,
+                0x0c, 0x4b, 0x0a, 0x65, 0x28, 0x78, 0x67, 0x48, 0x59, 0x26, 0x6d, 0x31, 0x76, 0x23, 0x70,
+                0x61, 0x64, 0x3b, 0x38, 0x79, 0x66, 0x74, 0x53, 0x2c, 0x64, 0x64, 0x54, 0x03, 0x54, 0x65,
+                0x44, 0x4c, 0x18, 0x4f, 0x48, 0x20, 0x4f, 0x72, 0x10, 0x3f, 0x0c, 0x52, 0x2d, 0x03, 0x14,
+                0x03, 0x51, 0x42, 0x10, 0x77, 0x6a, 0x34, 0x06, 0x32, 0x03, 0x72, 0x14, 0x7c, 0x08, 0x5d,
+                0x52, 0x1a, 0x62, 0x7c, 0x3e, 0x30, 0x7e, 0x5f, 0x7f, 0x54, 0x0f, 0x44, 0x49, 0x5d, 0x5e,
+                0x10, 0x6a, 0x06, 0x2b, 0x06, 0x53, 0x10, 0x39, 0x37, 0x32, 0x4a, 0x4e, 0x3d, 0x2b, 0x65,
+                0x38, 0x39, 0x07, 0x72, 0x54, 0x64, 0x4d, 0x56, 0x6a, 0x03, 0x22, 0x70, 0x7b, 0x5f, 0x60,
+                0x0b, 0x2a, 0x0b, 0x6b, 0x10, 0x64, 0x14, 0x05, 0x22, 0x00, 0x73, 0x40, 0x23, 0x5b, 0x51,
+                0x1f, 0x2b, 0x1a, 0x5d, 0x69, 0x7a, 0x46, 0x0c, 0x5f, 0x32, 0x4b, 0x4a, 0x28, 0x52, 0x79,
+                0x5b, 0x12, 0x42, 0x18, 0x00, 0x5d, 0x27, 0x31, 0x53, 0x3c, 0x4c, 0x36, 0x4e, 0x38, 0x3f,
+                0x72, 0x03, 0x71, 0x02, 0x5b, 0x36, 0x59, 0x7f, 0x75, 0x6e, 0x08, 0x54, 0x0d, 0x34, 0x1c,
+                0x34, 0x57, 0x5d, 0x69, 0x48, 0x00, 0x3b, 0x05, 0x07, 0x6e, 0x27, 0x65, 0x6e, 0x40, 0x3d,
+                0x3a, 0x4f, 0x72, 0x5d, 0x39, 0x16, 0x0f, 0x63, 0x12, 0x12, 0x15, 0x3a, 0x70, 0x0d, 0x57,
+                0x18, 0x0d, 0x5e, 0x3d, 0x22, 0x68, 0x68, 0x7c, 0x6d, 0x4f, 0x0c, 0x7b, 0x09, 0x2d, 0x4a,
+                0x73, 0x20, 0x47, 0x07, 0x57, 0x75, 0x5d, 0x53, 0x70, 0x34, 0x21, 0x40, 0x57, 0x51, 0x5e,
+                0x49, 0x44, 0x00, 0x54, 0x27, 0x04, 0x68, 0x7e, 0x59, 0x56, 0x58, 0x74, 0x14, 0x3c, 0x16,
+                0x33, 0x41, 0x16, 0x4b, 0x2f, 0x49, 0x37, 0x0a, 0x54, 0x08, 0x08, 0x1f, 0x39, 0x67, 0x76,
+                0x28, 0x28, 0x07, 0x1d, 0x61, 0x47, 0x51, 0x4d, 0x75, 0x26, 0x52, 0x47, 0x47, 0x0c, 0x57,
+                0x58, 0x74, 0x3e, 0x62, 0x6c, 0x58, 0x3a, 0x44, 0x1e, 0x16, 0x2e, 0x21, 0x1c, 0x73, 0x45,
+                0x67, 0x74, 0x4f, 0x33, 0x66, 0x0e, 0x74, 0x66, 0x26, 0x1f, 0x2e, 0x38, 0x44, 0x40, 0x7e,
+                0x2a, 0x50, 0x52, 0x5e, 0x43, 0x01, 0x7a, 0x38, 0x49, 0x3c, 0x55, 0x4d, 0x5a, 0x44, 0x08,
+                0x26, 0x59, 0x4d, 0x45, 0x0b, 0x48, 0x0a, 0x33, 0x5e, 0x4a, 0x4d, 0x75, 0x16, 0x17, 0x63,
+                0x46, 0x01, 0x2a, 0x55, 0x7b, 0x0f, 0x02, 0x73, 0x6a, 0x4b, 0x7f, 0x75, 0x65, 0x3c, 0x4c,
+                0x33, 0x39, 0x6c, 0x74, 0x05, 0x60, 0x0f, 0x7f, 0x2d, 0x41, 0x4d, 0x4d, 0x46, 0x71, 0x09,
+                0x6f, 0x4f, 0x60, 0x15, 0x0f, 0x46, 0x73, 0x63, 0x4c, 0x5e, 0x74, 0x30, 0x0d, 0x28, 0x43,
+                0x08, 0x72, 0x32, 0x04, 0x2e, 0x31, 0x29, 0x27, 0x44, 0x6d, 0x13, 0x17, 0x48, 0x0f, 0x49,
+                0x52, 0x10, 0x13, 0x7f, 0x17, 0x16, 0x62, 0x79, 0x35, 0x78, 0x3e, 0x01, 0x7c, 0x2e, 0x0f,
+                0x76, 0x3e, 0x5e, 0x53, 0x6c, 0x5b, 0x5f, 0x7c, 0x19, 0x41, 0x02, 0x2f, 0x17, 0x64, 0x41,
+                0x75, 0x10, 0x04, 0x47, 0x7c, 0x3d, 0x4b, 0x52, 0x00, 0x10, 0x5d, 0x51, 0x4e, 0x7a, 0x27,
+                0x25, 0x55, 0x40, 0x12, 0x35, 0x60, 0x05, 0x1b, 0x34, 0x2d, 0x04, 0x7a, 0x6a, 0x69, 0x02,
+                0x79, 0x03, 0x3a, 0x2f, 0x06, 0x0a, 0x79, 0x7b, 0x12, 0x5d, 0x7c, 0x52, 0x29, 0x47, 0x58,
+                0x12, 0x73, 0x3f, 0x27, 0x56, 0x05, 0x0c, 0x48, 0x32, 0x58, 0x6b, 0x57, 0x5c, 0x03, 0x64,
+                0x56, 0x11, 0x52, 0x7a, 0x30, 0x36, 0x29, 0x17, 0x3b, 0x68, 0x7a, 0x7c, 0x05, 0x6b, 0x6b,
+                0x13, 0x6a, 0x24, 0x5c, 0x68, 0x42, 0x18, 0x32, 0x03, 0x73, 0x6e, 0x04, 0x21, 0x2e, 0x01,
+                0x04, 0x63, 0x7d, 0x44, 0x41, 0x12, 0x31, 0x0b, 0x15, 0x1f, 0x70, 0x00, 0x2e, 0x66, 0x14,
+                0x3c, 0x7f, 0x2b, 0x00, 0x1f, 0x0c, 0x28, 0x59, 0x0a, 0x16, 0x49, 0x5a, 0x5c, 0x64, 0x65,
+                0x4b, 0x11, 0x29, 0x15, 0x36, 0x5a, 0x65, 0x19, 0x4f, 0x60, 0x23, 0x3a, 0x3a, 0x13, 0x25,
+                0x02, 0x78, 0x4c, 0x54};
+        char b64_known[1369] = {
+                0x43, 0x7a, 0x42, 0x45, 0x59, 0x6e, 0x77, 0x69, 0x48, 0x77, 0x30, 0x46, 0x5a, 0x79, 0x77,
+                0x71, 0x4f, 0x53, 0x46, 0x47, 0x43, 0x46, 0x42, 0x6d, 0x4e, 0x44, 0x63, 0x4c, 0x52, 0x55,
+                0x73, 0x34, 0x4d, 0x67, 0x5a, 0x36, 0x50, 0x6e, 0x38, 0x4d, 0x51, 0x42, 0x68, 0x72, 0x4c,
+                0x57, 0x42, 0x4d, 0x59, 0x41, 0x77, 0x6a, 0x51, 0x7a, 0x73, 0x2b, 0x47, 0x78, 0x59, 0x45,
+                0x52, 0x6c, 0x67, 0x2f, 0x51, 0x47, 0x6f, 0x52, 0x42, 0x57, 0x4e, 0x78, 0x46, 0x44, 0x56,
+                0x48, 0x65, 0x52, 0x4e, 0x76, 0x61, 0x79, 0x63, 0x59, 0x57, 0x30, 0x67, 0x6e, 0x50, 0x6d,
+                0x38, 0x56, 0x4d, 0x30, 0x38, 0x2b, 0x58, 0x6c, 0x46, 0x7a, 0x61, 0x43, 0x55, 0x50, 0x42,
+                0x6c, 0x74, 0x38, 0x63, 0x6e, 0x55, 0x2b, 0x50, 0x78, 0x74, 0x63, 0x62, 0x57, 0x6f, 0x35,
+                0x66, 0x47, 0x4e, 0x6a, 0x59, 0x47, 0x78, 0x36, 0x4d, 0x33, 0x5a, 0x53, 0x45, 0x79, 0x55,
+                0x7a, 0x66, 0x57, 0x55, 0x6a, 0x4a, 0x78, 0x45, 0x47, 0x42, 0x6b, 0x64, 0x78, 0x48, 0x68,
+                0x52, 0x30, 0x59, 0x33, 0x41, 0x74, 0x46, 0x53, 0x63, 0x59, 0x55, 0x51, 0x59, 0x46, 0x4d,
+                0x78, 0x45, 0x73, 0x61, 0x77, 0x41, 0x74, 0x64, 0x79, 0x42, 0x49, 0x44, 0x58, 0x4e, 0x52,
+                0x52, 0x53, 0x56, 0x2f, 0x66, 0x7a, 0x55, 0x6d, 0x4c, 0x69, 0x5a, 0x54, 0x4a, 0x47, 0x67,
+                0x65, 0x44, 0x6c, 0x67, 0x36, 0x57, 0x56, 0x42, 0x57, 0x4e, 0x31, 0x39, 0x6d, 0x41, 0x55,
+                0x78, 0x61, 0x5a, 0x44, 0x4a, 0x51, 0x65, 0x32, 0x6f, 0x67, 0x63, 0x69, 0x73, 0x64, 0x66,
+                0x6b, 0x4e, 0x37, 0x59, 0x55, 0x49, 0x4c, 0x59, 0x58, 0x4d, 0x6b, 0x65, 0x54, 0x70, 0x72,
+                0x53, 0x6e, 0x6c, 0x75, 0x43, 0x51, 0x38, 0x6e, 0x4c, 0x51, 0x78, 0x65, 0x4d, 0x6b, 0x73,
+                0x4e, 0x65, 0x55, 0x59, 0x35, 0x49, 0x51, 0x6f, 0x6d, 0x58, 0x7a, 0x6f, 0x41, 0x4a, 0x6a,
+                0x38, 0x54, 0x4c, 0x6e, 0x35, 0x51, 0x4b, 0x32, 0x64, 0x47, 0x63, 0x6a, 0x38, 0x37, 0x41,
+                0x55, 0x59, 0x62, 0x43, 0x7a, 0x56, 0x4a, 0x4f, 0x52, 0x6c, 0x77, 0x50, 0x51, 0x4a, 0x42,
+                0x44, 0x6a, 0x67, 0x46, 0x64, 0x6d, 0x56, 0x50, 0x4d, 0x57, 0x78, 0x65, 0x46, 0x77, 0x51,
+                0x56, 0x4e, 0x69, 0x5a, 0x6b, 0x4e, 0x42, 0x51, 0x58, 0x66, 0x41, 0x34, 0x4c, 0x57, 0x31,
+                0x56, 0x54, 0x61, 0x77, 0x42, 0x43, 0x51, 0x55, 0x38, 0x43, 0x58, 0x42, 0x4d, 0x4b, 0x4c,
+                0x43, 0x77, 0x2b, 0x45, 0x42, 0x51, 0x7a, 0x52, 0x58, 0x78, 0x36, 0x57, 0x6a, 0x46, 0x68,
+                0x4f, 0x51, 0x67, 0x69, 0x61, 0x68, 0x34, 0x50, 0x62, 0x78, 0x74, 0x73, 0x45, 0x31, 0x35,
+                0x35, 0x49, 0x48, 0x6c, 0x51, 0x59, 0x67, 0x59, 0x73, 0x64, 0x68, 0x63, 0x45, 0x4b, 0x79,
+                0x70, 0x31, 0x48, 0x77, 0x77, 0x33, 0x54, 0x67, 0x39, 0x37, 0x4c, 0x54, 0x52, 0x31, 0x59,
+                0x44, 0x46, 0x30, 0x4c, 0x67, 0x70, 0x4b, 0x45, 0x57, 0x78, 0x4a, 0x4a, 0x51, 0x45, 0x36,
+                0x50, 0x53, 0x49, 0x65, 0x62, 0x52, 0x68, 0x52, 0x65, 0x43, 0x31, 0x69, 0x4d, 0x55, 0x78,
+                0x51, 0x51, 0x42, 0x64, 0x4c, 0x62, 0x79, 0x49, 0x41, 0x66, 0x32, 0x45, 0x71, 0x4e, 0x44,
+                0x34, 0x41, 0x58, 0x79, 0x39, 0x66, 0x4c, 0x78, 0x51, 0x71, 0x56, 0x53, 0x63, 0x66, 0x52,
+                0x68, 0x38, 0x53, 0x52, 0x6c, 0x34, 0x65, 0x44, 0x48, 0x77, 0x34, 0x41, 0x57, 0x46, 0x6b,
+                0x64, 0x69, 0x4a, 0x75, 0x43, 0x43, 0x41, 0x34, 0x54, 0x33, 0x4e, 0x79, 0x56, 0x52, 0x4a,
+                0x43, 0x47, 0x56, 0x42, 0x68, 0x51, 0x33, 0x64, 0x39, 0x51, 0x53, 0x34, 0x31, 0x54, 0x7a,
+                0x30, 0x78, 0x4b, 0x46, 0x68, 0x6e, 0x47, 0x77, 0x4e, 0x52, 0x49, 0x44, 0x49, 0x63, 0x43,
+                0x47, 0x34, 0x33, 0x64, 0x54, 0x64, 0x45, 0x54, 0x32, 0x67, 0x5a, 0x42, 0x32, 0x51, 0x55,
+                0x4b, 0x43, 0x55, 0x72, 0x61, 0x54, 0x55, 0x59, 0x4a, 0x79, 0x59, 0x55, 0x45, 0x33, 0x42,
+                0x43, 0x47, 0x52, 0x4a, 0x31, 0x50, 0x67, 0x4a, 0x64, 0x66, 0x42, 0x4d, 0x66, 0x46, 0x6c,
+                0x4d, 0x37, 0x64, 0x45, 0x67, 0x38, 0x58, 0x6a, 0x6c, 0x73, 0x48, 0x42, 0x78, 0x30, 0x4f,
+                0x52, 0x38, 0x41, 0x47, 0x77, 0x59, 0x4b, 0x61, 0x44, 0x74, 0x53, 0x54, 0x78, 0x35, 0x75,
+                0x50, 0x44, 0x55, 0x4d, 0x4f, 0x41, 0x34, 0x4c, 0x4f, 0x78, 0x70, 0x32, 0x49, 0x79, 0x6c,
+                0x54, 0x48, 0x6c, 0x39, 0x42, 0x44, 0x45, 0x73, 0x4b, 0x5a, 0x53, 0x68, 0x34, 0x5a, 0x30,
+                0x68, 0x5a, 0x4a, 0x6d, 0x30, 0x78, 0x64, 0x69, 0x4e, 0x77, 0x59, 0x57, 0x51, 0x37, 0x4f,
+                0x48, 0x6c, 0x6d, 0x64, 0x46, 0x4d, 0x73, 0x5a, 0x47, 0x52, 0x55, 0x41, 0x31, 0x52, 0x6c,
+                0x52, 0x45, 0x77, 0x59, 0x54, 0x30, 0x67, 0x67, 0x54, 0x33, 0x49, 0x51, 0x50, 0x77, 0x78,
+                0x53, 0x4c, 0x51, 0x4d, 0x55, 0x41, 0x31, 0x46, 0x43, 0x45, 0x48, 0x64, 0x71, 0x4e, 0x41,
+                0x59, 0x79, 0x41, 0x33, 0x49, 0x55, 0x66, 0x41, 0x68, 0x64, 0x55, 0x68, 0x70, 0x69, 0x66,
+                0x44, 0x34, 0x77, 0x66, 0x6c, 0x39, 0x2f, 0x56, 0x41, 0x39, 0x45, 0x53, 0x56, 0x31, 0x65,
+                0x45, 0x47, 0x6f, 0x47, 0x4b, 0x77, 0x5a, 0x54, 0x45, 0x44, 0x6b, 0x33, 0x4d, 0x6b, 0x70,
+                0x4f, 0x50, 0x53, 0x74, 0x6c, 0x4f, 0x44, 0x6b, 0x48, 0x63, 0x6c, 0x52, 0x6b, 0x54, 0x56,
+                0x5a, 0x71, 0x41, 0x79, 0x4a, 0x77, 0x65, 0x31, 0x39, 0x67, 0x43, 0x79, 0x6f, 0x4c, 0x61,
+                0x78, 0x42, 0x6b, 0x46, 0x41, 0x55, 0x69, 0x41, 0x48, 0x4e, 0x41, 0x49, 0x31, 0x74, 0x52,
+                0x48, 0x79, 0x73, 0x61, 0x58, 0x57, 0x6c, 0x36, 0x52, 0x67, 0x78, 0x66, 0x4d, 0x6b, 0x74,
+                0x4b, 0x4b, 0x46, 0x4a, 0x35, 0x57, 0x78, 0x4a, 0x43, 0x47, 0x41, 0x42, 0x64, 0x4a, 0x7a,
+                0x46, 0x54, 0x50, 0x45, 0x77, 0x32, 0x54, 0x6a, 0x67, 0x2f, 0x63, 0x67, 0x4e, 0x78, 0x41,
+                0x6c, 0x73, 0x32, 0x57, 0x58, 0x39, 0x31, 0x62, 0x67, 0x68, 0x55, 0x44, 0x54, 0x51, 0x63,
+                0x4e, 0x46, 0x64, 0x64, 0x61, 0x55, 0x67, 0x41, 0x4f, 0x77, 0x55, 0x48, 0x62, 0x69, 0x64,
+                0x6c, 0x62, 0x6b, 0x41, 0x39, 0x4f, 0x6b, 0x39, 0x79, 0x58, 0x54, 0x6b, 0x57, 0x44, 0x32,
+                0x4d, 0x53, 0x45, 0x68, 0x55, 0x36, 0x63, 0x41, 0x31, 0x58, 0x47, 0x41, 0x31, 0x65, 0x50,
+                0x53, 0x4a, 0x6f, 0x61, 0x48, 0x78, 0x74, 0x54, 0x77, 0x78, 0x37, 0x43, 0x53, 0x31, 0x4b,
+                0x63, 0x79, 0x42, 0x48, 0x42, 0x31, 0x64, 0x31, 0x58, 0x56, 0x4e, 0x77, 0x4e, 0x43, 0x46,
+                0x41, 0x56, 0x31, 0x46, 0x65, 0x53, 0x55, 0x51, 0x41, 0x56, 0x43, 0x63, 0x45, 0x61, 0x48,
+                0x35, 0x5a, 0x56, 0x6c, 0x68, 0x30, 0x46, 0x44, 0x77, 0x57, 0x4d, 0x30, 0x45, 0x57, 0x53,
+                0x79, 0x39, 0x4a, 0x4e, 0x77, 0x70, 0x55, 0x43, 0x41, 0x67, 0x66, 0x4f, 0x57, 0x64, 0x32,
+                0x4b, 0x43, 0x67, 0x48, 0x48, 0x57, 0x46, 0x48, 0x55, 0x55, 0x31, 0x31, 0x4a, 0x6c, 0x4a,
+                0x48, 0x52, 0x77, 0x78, 0x58, 0x57, 0x48, 0x51, 0x2b, 0x59, 0x6d, 0x78, 0x59, 0x4f, 0x6b,
+                0x51, 0x65, 0x46, 0x69, 0x34, 0x68, 0x48, 0x48, 0x4e, 0x46, 0x5a, 0x33, 0x52, 0x50, 0x4d,
+                0x32, 0x59, 0x4f, 0x64, 0x47, 0x59, 0x6d, 0x48, 0x79, 0x34, 0x34, 0x52, 0x45, 0x42, 0x2b,
+                0x4b, 0x6c, 0x42, 0x53, 0x58, 0x6b, 0x4d, 0x42, 0x65, 0x6a, 0x68, 0x4a, 0x50, 0x46, 0x56,
+                0x4e, 0x57, 0x6b, 0x51, 0x49, 0x4a, 0x6c, 0x6c, 0x4e, 0x52, 0x51, 0x74, 0x49, 0x43, 0x6a,
+                0x4e, 0x65, 0x53, 0x6b, 0x31, 0x31, 0x46, 0x68, 0x64, 0x6a, 0x52, 0x67, 0x45, 0x71, 0x56,
+                0x58, 0x73, 0x50, 0x41, 0x6e, 0x4e, 0x71, 0x53, 0x33, 0x39, 0x31, 0x5a, 0x54, 0x78, 0x4d,
+                0x4d, 0x7a, 0x6c, 0x73, 0x64, 0x41, 0x56, 0x67, 0x44, 0x33, 0x38, 0x74, 0x51, 0x55, 0x31,
+                0x4e, 0x52, 0x6e, 0x45, 0x4a, 0x62, 0x30, 0x39, 0x67, 0x46, 0x51, 0x39, 0x47, 0x63, 0x32,
+                0x4e, 0x4d, 0x58, 0x6e, 0x51, 0x77, 0x44, 0x53, 0x68, 0x44, 0x43, 0x48, 0x49, 0x79, 0x42,
+                0x43, 0x34, 0x78, 0x4b, 0x53, 0x64, 0x45, 0x62, 0x52, 0x4d, 0x58, 0x53, 0x41, 0x39, 0x4a,
+                0x55, 0x68, 0x41, 0x54, 0x66, 0x78, 0x63, 0x57, 0x59, 0x6e, 0x6b, 0x31, 0x65, 0x44, 0x34,
+                0x42, 0x66, 0x43, 0x34, 0x50, 0x64, 0x6a, 0x35, 0x65, 0x55, 0x32, 0x78, 0x62, 0x58, 0x33,
+                0x77, 0x5a, 0x51, 0x51, 0x49, 0x76, 0x46, 0x32, 0x52, 0x42, 0x64, 0x52, 0x41, 0x45, 0x52,
+                0x33, 0x77, 0x39, 0x53, 0x31, 0x49, 0x41, 0x45, 0x46, 0x31, 0x52, 0x54, 0x6e, 0x6f, 0x6e,
+                0x4a, 0x56, 0x56, 0x41, 0x45, 0x6a, 0x56, 0x67, 0x42, 0x52, 0x73, 0x30, 0x4c, 0x51, 0x52,
+                0x36, 0x61, 0x6d, 0x6b, 0x43, 0x65, 0x51, 0x4d, 0x36, 0x4c, 0x77, 0x59, 0x4b, 0x65, 0x58,
+                0x73, 0x53, 0x58, 0x58, 0x78, 0x53, 0x4b, 0x55, 0x64, 0x59, 0x45, 0x6e, 0x4d, 0x2f, 0x4a,
+                0x31, 0x59, 0x46, 0x44, 0x45, 0x67, 0x79, 0x57, 0x47, 0x74, 0x58, 0x58, 0x41, 0x4e, 0x6b,
+                0x56, 0x68, 0x46, 0x53, 0x65, 0x6a, 0x41, 0x32, 0x4b, 0x52, 0x63, 0x37, 0x61, 0x48, 0x70,
+                0x38, 0x42, 0x57, 0x74, 0x72, 0x45, 0x32, 0x6f, 0x6b, 0x58, 0x47, 0x68, 0x43, 0x47, 0x44,
+                0x49, 0x44, 0x63, 0x32, 0x34, 0x45, 0x49, 0x53, 0x34, 0x42, 0x42, 0x47, 0x4e, 0x39, 0x52,
+                0x45, 0x45, 0x53, 0x4d, 0x51, 0x73, 0x56, 0x48, 0x33, 0x41, 0x41, 0x4c, 0x6d, 0x59, 0x55,
+                0x50, 0x48, 0x38, 0x72, 0x41, 0x42, 0x38, 0x4d, 0x4b, 0x46, 0x6b, 0x4b, 0x46, 0x6b, 0x6c,
+                0x61, 0x58, 0x47, 0x52, 0x6c, 0x53, 0x78, 0x45, 0x70, 0x46, 0x54, 0x5a, 0x61, 0x5a, 0x52,
+                0x6c, 0x50, 0x59, 0x43, 0x4d, 0x36, 0x4f, 0x68, 0x4d, 0x6c, 0x41, 0x6e, 0x68, 0x4d, 0x56,
+                0x41, 0x3d, 0x3d, 0x00};
         char *b64_test;
 
         plan_tests(1);
 
-        base64_encode_alloc (random, 1024, &b64_test);
+        base64_encode_alloc(random, 1024, &b64_test);
 
-        ok(strcmp(b64_known, b64_test) == 0,
-           "Test matching a base64 encoded 1024 bytes random string");
+        ok(strcmp(b64_known, b64_test) == 0, "Test matching a base64 encoded 1024 bytes random string");
 
         return exit_status();
 }
-
diff --git a/lib/tests/test_cmd.c b/lib/tests/test_cmd.c
index 02ae11f5..d51016cc 100644
--- a/lib/tests/test_cmd.c
+++ b/lib/tests/test_cmd.c
@@ -1,20 +1,20 @@
 /*****************************************************************************
-*
-* 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 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* 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, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #include "common.h"
 #include "utils_cmd.h"
@@ -22,212 +22,186 @@
 #include "tap.h"
 
 #define COMMAND_LINE 1024
-#define UNSET 65530
+#define UNSET        65530
 
-char *
-get_command (char *const *line)
-{
+char *get_command(char *const *line) {
         char *cmd;
         int i = 0;
 
-        asprintf (&cmd, " %s", line[i++]);
+        asprintf(&cmd, " %s", line[i++]);
         while (line[i] != NULL) {
-                asprintf (&cmd, "%s %s", cmd, line[i]);
+                asprintf(&cmd, "%s %s", cmd, line[i]);
                 i++;
         }
 
         return cmd;
 }
 
-int
-main (int argc, char **argv)
-{
-        char **command_line = malloc (sizeof (char *) * COMMAND_LINE);
-        char *command = NULL;
-        char *perl;
-        output chld_out, chld_err;
-        int c;
-        int result = UNSET;
-
+int main(int argc, char **argv) {
         plan_tests(51);
 
-        diag ("Running plain echo command, set one");
+        diag("Running plain echo command, set one");
 
         /* ensure everything is empty before we begin */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
-        ok (chld_out.lines == 0, "(initialised) Checking stdout is reset");
-        ok (chld_err.lines == 0, "(initialised) Checking stderr is reset");
-        ok (result == UNSET, "(initialised) Checking exit code is reset");
-
-        command_line[0] = strdup ("/bin/echo");
-        command_line[1] = strdup ("this");
-        command_line[2] = strdup ("is");
-        command_line[3] = strdup ("test");
-        command_line[4] = strdup ("one");
-
-        command = get_command (command_line);
-
-        result = cmd_run_array (command_line, &chld_out, &chld_err, 0);
-        ok (chld_out.lines == 1,
-                        "(array) Check for expected number of stdout lines");
-        ok (chld_err.lines == 0,
-                        "(array) Check for expected number of stderr lines");
-        ok (strcmp (chld_out.line[0], "this is test one") == 0,
-                        "(array) Check for expected stdout output");
-        ok (result == 0, "(array) Checking exit code");
+
+        output chld_out;
+        memset(&chld_out, 0, sizeof(output));
+        output chld_err;
+        memset(&chld_err, 0, sizeof(output));
+        ok(chld_out.lines == 0, "(initialised) Checking stdout is reset");
+        ok(chld_err.lines == 0, "(initialised) Checking stderr is reset");
+        int result = UNSET;
+        ok(result == UNSET, "(initialised) Checking exit code is reset");
+
+        char **command_line = malloc(sizeof(char *) * COMMAND_LINE);
+        command_line[0] = strdup("/bin/echo");
+        command_line[1] = strdup("this");
+        command_line[2] = strdup("is");
+        command_line[3] = strdup("test");
+        command_line[4] = strdup("one");
+
+        char *command = get_command(command_line);
+
+        result = cmd_run_array(command_line, &chld_out, &chld_err, 0);
+        ok(chld_out.lines == 1, "(array) Check for expected number of stdout lines");
+        ok(chld_err.lines == 0, "(array) Check for expected number of stderr lines");
+        ok(strcmp(chld_out.line[0], "this is test one") == 0,
+           "(array) Check for expected stdout output");
+        ok(result == 0, "(array) Checking exit code");
 
         /* ensure everything is empty again */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
+        memset(&chld_out, 0, sizeof(output));
+        memset(&chld_err, 0, sizeof(output));
         result = UNSET;
-        ok (chld_out.lines == 0, "(initialised) Checking stdout is reset");
-        ok (chld_err.lines == 0, "(initialised) Checking stderr is reset");
-        ok (result == UNSET, "(initialised) Checking exit code is reset");
+        ok(chld_out.lines == 0, "(initialised) Checking stdout is reset");
+        ok(chld_err.lines == 0, "(initialised) Checking stderr is reset");
+        ok(result == UNSET, "(initialised) Checking exit code is reset");
 
-        result = cmd_run (command, &chld_out, &chld_err, 0);
+        result = cmd_run(command, &chld_out, &chld_err, 0);
 
-        ok (chld_out.lines == 1,
-                        "(string) Check for expected number of stdout lines");
-        ok (chld_err.lines == 0,
-                        "(string) Check for expected number of stderr lines");
-        ok (strcmp (chld_out.line[0], "this is test one") == 0,
-                        "(string) Check for expected stdout output");
-        ok (result == 0, "(string) Checking exit code");
+        ok(chld_out.lines == 1, "(string) Check for expected number of stdout lines");
+        ok(chld_err.lines == 0, "(string) Check for expected number of stderr lines");
+        ok(strcmp(chld_out.line[0], "this is test one") == 0,
+           "(string) Check for expected stdout output");
+        ok(result == 0, "(string) Checking exit code");
 
-        diag ("Running plain echo command, set two");
+        diag("Running plain echo command, set two");
 
         /* ensure everything is empty again */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
+        memset(&chld_out, 0, sizeof(output));
+        memset(&chld_err, 0, sizeof(output));
         result = UNSET;
-        ok (chld_out.lines == 0, "(initialised) Checking stdout is reset");
-        ok (chld_err.lines == 0, "(initialised) Checking stderr is reset");
-        ok (result == UNSET, "(initialised) Checking exit code is reset");
+        ok(chld_out.lines == 0, "(initialised) Checking stdout is reset");
+        ok(chld_err.lines == 0, "(initialised) Checking stderr is reset");
+        ok(result == UNSET, "(initialised) Checking exit code is reset");
 
-        command_line[0] = strdup ("/bin/echo");
-        command_line[1] = strdup ("this is test two");
+        command_line[0] = strdup("/bin/echo");
+        command_line[1] = strdup("this is test two");
         command_line[2] = NULL;
         command_line[3] = NULL;
         command_line[4] = NULL;
 
-        result = cmd_run_array (command_line, &chld_out, &chld_err, 0);
-        ok (chld_out.lines == 1,
-                        "(array) Check for expected number of stdout lines");
-        ok (chld_err.lines == 0,
-                        "(array) Check for expected number of stderr lines");
-        ok (strcmp (chld_out.line[0], "this is test two") == 0,
-                        "(array) Check for expected stdout output");
-        ok (result == 0, "(array) Checking exit code");
+        result = cmd_run_array(command_line, &chld_out, &chld_err, 0);
+        ok(chld_out.lines == 1, "(array) Check for expected number of stdout lines");
+        ok(chld_err.lines == 0, "(array) Check for expected number of stderr lines");
+        ok(strcmp(chld_out.line[0], "this is test two") == 0,
+           "(array) Check for expected stdout output");
+        ok(result == 0, "(array) Checking exit code");
 
         /* ensure everything is empty again */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
+        memset(&chld_out, 0, sizeof(output));
+        memset(&chld_err, 0, sizeof(output));
         result = UNSET;
-        ok (chld_out.lines == 0, "(initialised) Checking stdout is reset");
-        ok (chld_err.lines == 0, "(initialised) Checking stderr is reset");
-        ok (result == UNSET, "(initialised) Checking exit code is reset");
-
-        result = cmd_run (command, &chld_out, &chld_err, 0);
+        ok(chld_out.lines == 0, "(initialised) Checking stdout is reset");
+        ok(chld_err.lines == 0, "(initialised) Checking stderr is reset");
+        ok(result == UNSET, "(initialised) Checking exit code is reset");
 
-        ok (chld_out.lines == 1,
-                        "(string) Check for expected number of stdout lines");
-        ok (chld_err.lines == 0,
-                        "(string) Check for expected number of stderr lines");
-        ok (strcmp (chld_out.line[0], "this is test one") == 0,
-                        "(string) Check for expected stdout output");
-        ok (result == 0, "(string) Checking exit code");
+        result = cmd_run(command, &chld_out, &chld_err, 0);
 
+        ok(chld_out.lines == 1, "(string) Check for expected number of stdout lines");
+        ok(chld_err.lines == 0, "(string) Check for expected number of stderr lines");
+        ok(strcmp(chld_out.line[0], "this is test one") == 0,
+           "(string) Check for expected stdout output");
+        ok(result == 0, "(string) Checking exit code");
 
         /* ensure everything is empty again */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
+        memset(&chld_out, 0, sizeof(output));
+        memset(&chld_err, 0, sizeof(output));
         result = UNSET;
-        ok (chld_out.lines == 0, "(initialised) Checking stdout is reset");
-        ok (chld_err.lines == 0, "(initialised) Checking stderr is reset");
-        ok (result == UNSET, "(initialised) Checking exit code is reset");
+        ok(chld_out.lines == 0, "(initialised) Checking stdout is reset");
+        ok(chld_err.lines == 0, "(initialised) Checking stderr is reset");
+        ok(result == UNSET, "(initialised) Checking exit code is reset");
 
-        /* Pass linefeeds via parameters through - those should be evaluated by echo to give multi line output */
+        /* Pass linefeeds via parameters through - those should be evaluated by echo to give multi line
+         * output */
         command_line[0] = strdup("/bin/echo");
         command_line[1] = strdup("this is a test via echo\nline two\nit's line 3");
         command_line[2] = strdup("and (note space between '3' and 'and') $$ will not get evaluated");
 
-        result = cmd_run_array (command_line, &chld_out, &chld_err, 0);
-        ok (chld_out.lines == 3,
-                        "(array) Check for expected number of stdout lines");
-        ok (chld_err.lines == 0,
-                        "(array) Check for expected number of stderr lines");
-        ok (strcmp (chld_out.line[0], "this is a test via echo") == 0,
-                        "(array) Check line 1 for expected stdout output");
-        ok (strcmp (chld_out.line[1], "line two") == 0,
-                        "(array) Check line 2 for expected stdout output");
-        ok (strcmp (chld_out.line[2], "it's line 3 and (note space between '3' and 'and') $$ will not get evaluated") == 0,
-                        "(array) Check line 3 for expected stdout output");
-        ok (result == 0, "(array) Checking exit code");
-
-
+        result = cmd_run_array(command_line, &chld_out, &chld_err, 0);
+        ok(chld_out.lines == 3, "(array) Check for expected number of stdout lines");
+        ok(chld_err.lines == 0, "(array) Check for expected number of stderr lines");
+        ok(strcmp(chld_out.line[0], "this is a test via echo") == 0,
+           "(array) Check line 1 for expected stdout output");
+        ok(strcmp(chld_out.line[1], "line two") == 0,
+           "(array) Check line 2 for expected stdout output");
+        ok(strcmp(chld_out.line[2],
+                          "it's line 3 and (note space between '3' and 'and') $$ will not get evaluated") == 0,
+           "(array) Check line 3 for expected stdout output");
+        ok(result == 0, "(array) Checking exit code");
 
         /* ensure everything is empty again */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
+        memset(&chld_out, 0, sizeof(output));
+        memset(&chld_err, 0, sizeof(output));
         result = UNSET;
-        ok (chld_out.lines == 0, "(initialised) Checking stdout is reset");
-        ok (chld_err.lines == 0, "(initialised) Checking stderr is reset");
-        ok (result == UNSET, "(initialised) Checking exit code is reset");
+        ok(chld_out.lines == 0, "(initialised) Checking stdout is reset");
+        ok(chld_err.lines == 0, "(initialised) Checking stderr is reset");
+        ok(result == UNSET, "(initialised) Checking exit code is reset");
 
         command = (char *)malloc(COMMAND_LINE);
         strcpy(command, "/bin/echo3456 non-existent command");
-        result = cmd_run (command, &chld_out, &chld_err, 0);
-
-        ok (chld_out.lines == 0,
-                        "Non existent command, so no output");
-        ok (chld_err.lines == 0,
-                        "No stderr either");
-        ok (result == 3, "Get return code 3 (?) for non-existent command");
+        result = cmd_run(command, &chld_out, &chld_err, 0);
 
+        ok(chld_out.lines == 0, "Non existent command, so no output");
+        ok(chld_err.lines == 0, "No stderr either");
+        ok(result == 3, "Get return code 3 (?) for non-existent command");
 
         /* ensure everything is empty again */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
+        memset(&chld_out, 0, sizeof(output));
+        memset(&chld_err, 0, sizeof(output));
         result = UNSET;
 
         command = (char *)malloc(COMMAND_LINE);
         strcpy(command, "/bin/sh non-existent-file");
-        result = cmd_run (command, &chld_out, &chld_err, 0);
-
-        ok (chld_out.lines == 0,
-                        "/bin/sh returns no stdout when file is missing...");
-        ok (chld_err.lines == 1,
-                        "...but does give an error line");
-        ok (strstr(chld_err.line[0],"non-existent-file") != NULL, "And missing filename is in error message");
-        ok (result != 0, "Get non-zero return code from /bin/sh");
+        result = cmd_run(command, &chld_out, &chld_err, 0);
 
+        ok(chld_out.lines == 0, "/bin/sh returns no stdout when file is missing...");
+        ok(chld_err.lines == 1, "...but does give an error line");
+        ok(strstr(chld_err.line[0], "non-existent-file") != NULL,
+           "And missing filename is in error message");
+        ok(result != 0, "Get non-zero return code from /bin/sh");
 
         /* ensure everything is empty again */
         result = UNSET;
 
         command = (char *)malloc(COMMAND_LINE);
-  strcpy(command, "/bin/sh -c 'exit 7'");
-  result = cmd_run (command, NULL, NULL, 0);
-
-  ok (result == 7, "Get return code 7 from /bin/sh");
+        strcpy(command, "/bin/sh -c 'exit 7'");
+        result = cmd_run(command, NULL, NULL, 0);
 
+        ok(result == 7, "Get return code 7 from /bin/sh");
 
         /* ensure everything is empty again */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
+        memset(&chld_out, 0, sizeof(output));
+        memset(&chld_err, 0, sizeof(output));
         result = UNSET;
 
         command = (char *)malloc(COMMAND_LINE);
         strcpy(command, "/bin/non-existent-command");
-        result = cmd_run (command, &chld_out, &chld_err, 0);
-
-        ok (chld_out.lines == 0,
-                        "/bin/non-existent-command returns no stdout...");
-        ok (chld_err.lines == 0,
-                        "...and no stderr output either");
-        ok (result == 3, "Get return code 3 = UNKNOWN when command does not exist");
+        result = cmd_run(command, &chld_out, &chld_err, 0);
 
+        ok(chld_out.lines == 0, "/bin/non-existent-command returns no stdout...");
+        ok(chld_err.lines == 0, "...and no stderr output either");
+        ok(result == 3, "Get return code 3 = UNKNOWN when command does not exist");
 
-        return exit_status ();
+        return exit_status();
 }
diff --git a/lib/tests/test_disk.c b/lib/tests/test_disk.c
deleted file mode 100644
index e283fe2e..00000000
--- a/lib/tests/test_disk.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*****************************************************************************
-*
-* 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 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* 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, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
-
-#include "common.h"
-#include "utils_disk.h"
-#include "tap.h"
-#include "regex.h"
-
-void np_test_mount_entry_regex (struct mount_entry *dummy_mount_list,
-                                char *regstr, int cflags, int expect,
-                                char *desc);
-
-
-int
-main (int argc, char **argv)
-{
-        struct name_list *exclude_filesystem=NULL;
-        struct name_list *exclude_fstype=NULL;
-        struct name_list *dummy_mountlist = NULL;
-        struct name_list *temp_name;
-        struct parameter_list *paths = NULL;
-        struct parameter_list *p, *prev = NULL, *last = NULL;
-
-        struct mount_entry *dummy_mount_list;
-        struct mount_entry *me;
-        struct mount_entry **mtail = &dummy_mount_list;
-        int cflags = REG_NOSUB | REG_EXTENDED;
-        int found = 0, count = 0;
-
-        plan_tests(33);
-
-        ok( np_find_name(exclude_filesystem, "/var/log") == false, "/var/log not in list");
-        np_add_name(&exclude_filesystem, "/var/log");
-        ok( np_find_name(exclude_filesystem, "/var/log") == true, "is in list now");
-        ok( np_find_name(exclude_filesystem, "/home") == false, "/home not in list");
-        np_add_name(&exclude_filesystem, "/home");
-        ok( np_find_name(exclude_filesystem, "/home") == true, "is in list now");
-        ok( np_find_name(exclude_filesystem, "/var/log") == true, "/var/log still in list");
-
-        ok( np_find_name(exclude_fstype, "iso9660") == false, "iso9660 not in list");
-        np_add_name(&exclude_fstype, "iso9660");
-        ok( np_find_name(exclude_fstype, "iso9660") == true, "is in list now");
-
-        ok( np_find_name(exclude_filesystem, "iso9660") == false, "Make sure no clashing in variables");
-
-        /*
-        for (temp_name = exclude_filesystem; temp_name; temp_name = temp_name->next) {
-                printf("Name: %s\n", temp_name->name);
-        }
-        */
-
-        me = (struct mount_entry *) malloc(sizeof *me);
-        me->me_devname = strdup("/dev/c0t0d0s0");
-        me->me_mountdir = strdup("/");
-        *mtail = me;
-        mtail = &me->me_next;
-
-        me = (struct mount_entry *) malloc(sizeof *me);
-        me->me_devname = strdup("/dev/c1t0d1s0");
-        me->me_mountdir = strdup("/var");
-        *mtail = me;
-        mtail = &me->me_next;
-
-        me = (struct mount_entry *) malloc(sizeof *me);
-        me->me_devname = strdup("/dev/c2t0d0s0");
-        me->me_mountdir = strdup("/home");
-        *mtail = me;
-        mtail = &me->me_next;
-
-        np_test_mount_entry_regex(dummy_mount_list, strdup("/"),
-                                  cflags, 3, strdup("a"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("/dev"),
-                                  cflags, 3,strdup("regex on dev names:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("/foo"),
-                                  cflags, 0,
-                                  strdup("regex on non existent dev/path:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("/Foo"),
-                                  cflags | REG_ICASE,0,
-                                  strdup("regi on non existent dev/path:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("/c.t0"),
-                                  cflags, 3,
-                                  strdup("partial devname regex match:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("c0t0"),
-                                  cflags, 1,
-                                  strdup("partial devname regex match:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("C0t0"),
-                                  cflags | REG_ICASE, 1,
-                                  strdup("partial devname regi match:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("home"),
-                                  cflags, 1,
-                                  strdup("partial pathname regex match:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("hOme"),
-                                  cflags | REG_ICASE, 1,
-                                  strdup("partial pathname regi match:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("(/home)|(/var)"),
-                                  cflags, 2,
-                                  strdup("grouped regex pathname match:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("(/homE)|(/Var)"),
-                                  cflags | REG_ICASE, 2,
-                                  strdup("grouped regi pathname match:"));
-
-        np_add_parameter(&paths, "/home/groups");
-        np_add_parameter(&paths, "/var");
-        np_add_parameter(&paths, "/tmp");
-        np_add_parameter(&paths, "/home/tonvoon");
-        np_add_parameter(&paths, "/dev/c2t0d0s0");
-
-        np_set_best_match(paths, dummy_mount_list, false);
-        for (p = paths; p; p = p->name_next) {
-                struct mount_entry *temp_me;
-                temp_me = p->best_match;
-                if (! strcmp(p->name, "/home/groups")) {
-                        ok( temp_me && !strcmp(temp_me->me_mountdir, "/home"), "/home/groups got right best match: /home");
-                } else if (! strcmp(p->name, "/var")) {
-                        ok( temp_me && !strcmp(temp_me->me_mountdir, "/var"), "/var got right best match: /var");
-                } else if (! strcmp(p->name, "/tmp")) {
-                        ok( temp_me && !strcmp(temp_me->me_mountdir, "/"), "/tmp got right best match: /");
-                } else if (! strcmp(p->name, "/home/tonvoon")) {
-                        ok( temp_me && !strcmp(temp_me->me_mountdir, "/home"), "/home/tonvoon got right best match: /home");
-                } else if (! strcmp(p->name, "/dev/c2t0d0s0")) {
-                        ok( temp_me && !strcmp(temp_me->me_devname, "/dev/c2t0d0s0"), "/dev/c2t0d0s0 got right best match: /dev/c2t0d0s0");
-                }
-        }
-
-        paths = NULL;   /* Bad boy - should free, but this is a test suite */
-        np_add_parameter(&paths, "/home/groups");
-        np_add_parameter(&paths, "/var");
-        np_add_parameter(&paths, "/tmp");
-        np_add_parameter(&paths, "/home/tonvoon");
-        np_add_parameter(&paths, "/home");
-
-        np_set_best_match(paths, dummy_mount_list, true);
-        for (p = paths; p; p = p->name_next) {
-                if (! strcmp(p->name, "/home/groups")) {
-                        ok( ! p->best_match , "/home/groups correctly not found");
-                } else if (! strcmp(p->name, "/var")) {
-                        ok( p->best_match, "/var found");
-                } else if (! strcmp(p->name, "/tmp")) {
-                        ok(! p->best_match, "/tmp correctly not found");
-                } else if (! strcmp(p->name, "/home/tonvoon")) {
-                        ok(! p->best_match, "/home/tonvoon not found");
-                } else if (! strcmp(p->name, "/home")) {
-                        ok( p->best_match, "/home found");
-                }
-        }
-
-        /* test deleting first element in paths */
-        paths = np_del_parameter(paths, NULL);
-        for (p = paths; p; p = p->name_next) {
-                if (! strcmp(p->name, "/home/groups"))
-                        found = 1;
-        }
-        ok(found == 0, "first element successfully deleted");
-        found = 0;
-
-        p=paths;
-        while (p) {
-                if (! strcmp(p->name, "/tmp"))
-                        p = np_del_parameter(p, prev);
-                else {
-                        prev = p;
-                        p = p->name_next;
-                }
-        }
-
-        for (p = paths; p; p = p->name_next) {
-                if (! strcmp(p->name, "/tmp"))
-                        found = 1;
-                if (p->name_next)
-                        prev = p;
-                else
-                        last = p;
-        }
-        ok(found == 0, "/tmp element successfully deleted");
-
-        p = np_del_parameter(last, prev);
-        for (p = paths; p; p = p->name_next) {
-                if (! strcmp(p->name, "/home"))
-                        found = 1;
-                last = p;
-                count++;
-        }
-        ok(found == 0, "last (/home) element successfully deleted");
-        ok(count == 2, "two elements remaining");
-
-
-        return exit_status();
-}
-
-
-void
-np_test_mount_entry_regex (struct mount_entry *dummy_mount_list, char *regstr, int cflags, int expect, char *desc)
-{
-        int matches = 0;
-        regex_t re;
-        struct mount_entry *me;
-        if (regcomp(&re,regstr, cflags) == 0) {
-                for (me = dummy_mount_list; me; me= me->me_next) {
-                        if(np_regex_match_mount_entry(me,&re))
-                                matches++;
-                }
-                ok( matches == expect,
-                    "%s '%s' matched %i/3 entries. ok: %i/3",
-                    desc, regstr, expect, matches);
-
-        } else
-                ok ( false, "regex '%s' not compilable", regstr);
-}
-
diff --git a/lib/tests/test_disk.t b/lib/tests/test_disk.t
deleted file mode 100755
index da84dfdf..00000000
--- a/lib/tests/test_disk.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/perl
-use Test::More;
-if (! -e "./test_disk") {
-        plan skip_all => "./test_disk not compiled - please enable libtap library to test";
-}
-exec "./test_disk";
diff --git a/lib/tests/test_generic_output b/lib/tests/test_generic_output
new file mode 100755
index 00000000..51e299a0
--- /dev/null
+++ b/lib/tests/test_generic_output
diff --git a/lib/tests/test_generic_output.c b/lib/tests/test_generic_output.c
new file mode 100644
index 00000000..e4a78bcd
--- /dev/null
+++ b/lib/tests/test_generic_output.c
@@ -0,0 +1,317 @@
+#include "../lib/output.h"
+#include "../../tap/tap.h"
+#include "./states.h"
+
+#include <string.h>
+
+void test_one_subcheck(void);
+void test_two_subchecks(void);
+
+void test_perfdata_formatting(void);
+void test_perfdata_formatting2(void);
+
+void test_deep_check_hierarchy(void);
+void test_deep_check_hierarchy2(void);
+
+void test_default_states1(void);
+void test_default_states2(void);
+
+int main(void) {
+        plan_tests(19);
+
+        diag("Simple test with one subcheck");
+        test_one_subcheck();
+
+        diag("Test with two subchecks");
+        test_two_subchecks();
+
+        diag("Test for performance data formatting");
+        test_perfdata_formatting();
+
+        diag("Another test for performance data formatting");
+        test_perfdata_formatting2();
+
+        diag("Test for deeper hierarchies");
+        test_deep_check_hierarchy();
+
+        diag("Another test for deeper hierarchies");
+        test_deep_check_hierarchy2();
+
+        diag("Testing the default state logic");
+        test_default_states1();
+
+        diag("Testing the default state logic #2");
+        test_default_states2();
+
+        return exit_status();
+}
+
+void test_one_subcheck(void) {
+        mp_subcheck sc1 = mp_subcheck_init();
+
+        sc1.output = "foobar";
+        sc1 = mp_set_subcheck_state(sc1, STATE_WARNING);
+
+        mp_check check = mp_check_init();
+        mp_add_subcheck_to_check(&check, sc1);
+
+        ok(mp_compute_check_state(check) == STATE_WARNING, "Main state should be warning");
+
+        char *output = mp_fmt_output(check);
+
+        // diag("Formatted output");
+        // diag(output);
+
+        char expected[] = "[WARNING] - ok=0, warning=1, critical=0, unknown=0\n"
+                                          "\t\\_[WARNING] - foobar\n";
+
+        // diag("Expected output");
+        // diag(expected);
+
+        ok(strcmp(output, expected) == 0, "Simple output test");
+}
+
+void test_perfdata_formatting2(void) {
+        mp_perfdata pd1 = perfdata_init();
+        mp_perfdata pd2 = perfdata_init();
+
+        pd1.label = "foo";
+        pd2.label = "bar";
+
+        pd1 = mp_set_pd_value(pd1, 23);
+        pd2 = mp_set_pd_value(pd2, 1LL);
+
+        pd_list *tmp = pd_list_init();
+
+        pd_list_append(tmp, pd1);
+        pd_list_append(tmp, pd2);
+
+        char *result = pd_list_to_string(*tmp);
+
+        ok(strcmp(result, "foo=23;;; bar=1;;;") == 0, "Perfdata string formatting");
+}
+
+void test_perfdata_formatting(void) {
+        mp_perfdata pd1 = perfdata_init();
+
+        pd1.uom = "s";
+        pd1.label = "foo";
+
+        pd1 = mp_set_pd_value(pd1, 23);
+
+        char *pd_string = pd_to_string(pd1);
+
+        ok(strcmp(pd_string, "foo=23s;;;") == 0, "Perfdata string formatting");
+}
+
+void test_two_subchecks(void) {
+        mp_subcheck sc1 = mp_subcheck_init();
+
+        sc1.output = "foobar";
+        sc1 = mp_set_subcheck_state(sc1, STATE_WARNING);
+
+        ok(mp_compute_subcheck_state(sc1) == STATE_WARNING,
+           "Test subcheck state directly after setting it");
+
+        mp_perfdata pd1 = perfdata_init();
+
+        pd1 = mp_set_pd_value(pd1, 23);
+
+        pd1.uom = "s";
+        pd1.label = "foo";
+
+        mp_add_perfdata_to_subcheck(&sc1, pd1);
+
+        mp_subcheck sc2 = mp_subcheck_init();
+        sc2.output = "baz";
+        sc2 = mp_set_subcheck_state(sc2, STATE_OK);
+
+        ok(mp_compute_subcheck_state(sc2) == STATE_OK, "Test subcheck 2 state after setting it");
+
+        mp_add_subcheck_to_subcheck(&sc1, sc2);
+
+        ok(mp_compute_subcheck_state(sc1) == STATE_WARNING,
+           "Test subcheck state after adding a subcheck");
+
+        mp_check check = mp_check_init();
+        mp_add_subcheck_to_check(&check, sc1);
+
+        ok(mp_compute_check_state(check) == STATE_WARNING, "Test main check result");
+
+        char *output = mp_fmt_output(check);
+
+        // diag("Formatted output. Length: %u", strlen(output));
+        // diag(output);
+
+        ok(output != NULL, "Output should not be NULL");
+
+        char expected[] = "[WARNING] - ok=0, warning=1, critical=0, unknown=0\n"
+                                          "\t\\_[WARNING] - foobar\n"
+                                          "\t\t\\_[OK] - baz\n"
+                                          "|foo=23s;;; \n";
+
+        // diag("Expected output. Length: %u", strlen(expected));
+        // diag(expected);
+
+        ok(strcmp(output, expected) == 0, "Output is as expected");
+}
+
+void test_deep_check_hierarchy(void) {
+        // level 4
+        mp_subcheck sc4 = mp_subcheck_init();
+        sc4.output = "level4";
+        sc4 = mp_set_subcheck_state(sc4, STATE_OK);
+
+        // level 3
+        mp_subcheck sc3 = mp_subcheck_init();
+        sc3.output = "level3";
+        sc3 = mp_set_subcheck_state(sc3, STATE_OK);
+
+        // level 2
+        mp_subcheck sc2 = mp_subcheck_init();
+        sc2.output = "baz";
+        sc2 = mp_set_subcheck_state(sc2, STATE_OK);
+
+        // level 1
+        mp_subcheck sc1 = mp_subcheck_init();
+
+        sc1.output = "foobar";
+        sc1 = mp_set_subcheck_state(sc1, STATE_WARNING);
+
+        mp_perfdata pd1 = perfdata_init();
+
+        pd1.uom = "s";
+        pd1.label = "foo";
+        pd1 = mp_set_pd_value(pd1, 23);
+
+        mp_add_perfdata_to_subcheck(&sc1, pd1);
+
+        // main check
+        mp_check check = mp_check_init();
+
+        mp_add_subcheck_to_subcheck(&sc3, sc4);
+        mp_add_subcheck_to_subcheck(&sc2, sc3);
+        mp_add_subcheck_to_subcheck(&sc1, sc2);
+        mp_add_subcheck_to_check(&check, sc1);
+
+        char *output = mp_fmt_output(check);
+
+        size_t output_length = strlen(output);
+
+        // diag("Formatted output of length %i", output_length);
+        // diag(output);
+
+        ok(output != NULL, "Output should not be NULL");
+
+        char expected[] = "[WARNING] - ok=0, warning=1, critical=0, unknown=0\n"
+                                          "\t\\_[WARNING] - foobar\n"
+                                          "\t\t\\_[OK] - baz\n"
+                                          "\t\t\t\\_[OK] - level3\n"
+                                          "\t\t\t\t\\_[OK] - level4\n"
+                                          "|foo=23s;;; \n";
+
+        size_t expected_length = strlen(expected);
+
+        // diag("Expected output of length: %i", expected_length);
+        // diag(expected);
+
+        ok(output_length == expected_length, "Outputs are of equal length");
+        ok(strcmp(output, expected) == 0, "Output is as expected");
+}
+
+void test_deep_check_hierarchy2(void) {
+        // level 1
+        mp_subcheck sc1 = mp_subcheck_init();
+
+        sc1.output = "foobar";
+        sc1 = mp_set_subcheck_state(sc1, STATE_WARNING);
+
+        mp_perfdata pd1 = perfdata_init();
+        pd1.uom = "s";
+        pd1.label = "foo";
+        pd1 = mp_set_pd_value(pd1, 23);
+
+        mp_add_perfdata_to_subcheck(&sc1, pd1);
+
+        // level 2
+        mp_subcheck sc2 = mp_subcheck_init();
+        sc2.output = "baz";
+        sc2 = mp_set_subcheck_state(sc2, STATE_OK);
+
+        mp_perfdata pd2 = perfdata_init();
+        pd2.uom = "B";
+        pd2.label = "baz";
+        pd2 = mp_set_pd_value(pd2, 1024);
+        mp_add_perfdata_to_subcheck(&sc2, pd2);
+
+        // level 3
+        mp_subcheck sc3 = mp_subcheck_init();
+        sc3.output = "level3";
+        sc3 = mp_set_subcheck_state(sc3, STATE_OK);
+
+        mp_perfdata pd3 = perfdata_init();
+        pd3.label = "floatMe";
+        pd3 = mp_set_pd_value(pd3, 1024.1024);
+        mp_add_perfdata_to_subcheck(&sc3, pd3);
+
+        // level 4
+        mp_subcheck sc4 = mp_subcheck_init();
+        sc4.output = "level4";
+        sc4 = mp_set_subcheck_state(sc4, STATE_OK);
+
+        mp_check check = mp_check_init();
+
+        mp_add_subcheck_to_subcheck(&sc3, sc4);
+        mp_add_subcheck_to_subcheck(&sc2, sc3);
+        mp_add_subcheck_to_subcheck(&sc1, sc2);
+        mp_add_subcheck_to_check(&check, sc1);
+
+        char *output = mp_fmt_output(check);
+
+        // diag("Formatted output of length: %i", strlen(output));
+        // diag(output);
+
+        ok(output != NULL, "Output should not be NULL");
+
+        char expected[] = "[WARNING] - ok=0, warning=1, critical=0, unknown=0\n"
+                                          "\t\\_[WARNING] - foobar\n"
+                                          "\t\t\\_[OK] - baz\n"
+                                          "\t\t\t\\_[OK] - level3\n"
+                                          "\t\t\t\t\\_[OK] - level4\n"
+                                          "|foo=23s;;; baz=1024B;;; floatMe=1024.102400;;; \n";
+
+        // diag("Expected output of length: %i", strlen(expected));
+        // diag(expected);
+
+        ok(strcmp(output, expected) == 0, "Output is as expected");
+}
+
+void test_default_states1(void) {
+        mp_subcheck sc = mp_subcheck_init();
+
+        mp_state_enum state1 = mp_compute_subcheck_state(sc);
+        ok(state1 == STATE_UNKNOWN, "Default default state is Unknown");
+
+        sc = mp_set_subcheck_default_state(sc, STATE_CRITICAL);
+
+        mp_state_enum state2 = mp_compute_subcheck_state(sc);
+        ok(state2 == STATE_CRITICAL, "Default state is Critical");
+
+        sc = mp_set_subcheck_state(sc, STATE_OK);
+
+        mp_state_enum state3 = mp_compute_subcheck_state(sc);
+        ok(state3 == STATE_OK, "Default state is Critical");
+}
+
+void test_default_states2(void) {
+        mp_check check = mp_check_init();
+
+        mp_subcheck sc = mp_subcheck_init();
+        sc.output = "placeholder";
+        sc = mp_set_subcheck_default_state(sc, STATE_CRITICAL);
+
+        mp_add_subcheck_to_check(&check, sc);
+
+        mp_state_enum result_state = mp_compute_check_state(check);
+        ok(result_state == STATE_CRITICAL, "Derived state is the proper default state");
+}
diff --git a/lib/tests/test_generic_output.t b/lib/tests/test_generic_output.t
new file mode 100644
index 00000000..48c2ddf4
--- /dev/null
+++ b/lib/tests/test_generic_output.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_generic_output") {
+        plan skip_all => "./test_generic_output not compiled - please enable libtap library to test";
+}
+exec "./test_generic_output";
diff --git a/lib/tests/test_ini1.c b/lib/tests/test_ini1.c
index 6843bac2..de983764 100644
--- a/lib/tests/test_ini1.c
+++ b/lib/tests/test_ini1.c
@@ -1,20 +1,20 @@
 /*****************************************************************************
-*
-* 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 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* 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, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #include "common.h"
 #include "utils_base.h"
@@ -29,81 +29,109 @@ void my_free(char *string) {
         }
 }
 
-char*
-list2str(np_arg_list *optlst)
-{
-        char *optstr=NULL;
+char *list2str(np_arg_list *optlst) {
+        char *optstr = NULL;
         np_arg_list *optltmp;
 
         /* Put everything as a space-separated string */
         asprintf(&optstr, "");
         while (optlst) {
                 asprintf(&optstr, "%s%s ", optstr, optlst->arg);
-                optltmp=optlst;
-                optlst=optlst->next;
+                optltmp = optlst;
+                optlst = optlst->next;
                 free(optltmp);
         }
         /* Strip last whitespace */
-        if (strlen(optstr)>1) optstr[strlen(optstr)-1]='\0';
+        if (strlen(optstr) > 1) {
+                optstr[strlen(optstr) - 1] = '\0';
+        }
 
         return optstr;
 }
 
-int
-main (int argc, char **argv)
-{
-        char *optstr=NULL;
+int main(int argc, char **argv) {
 
         plan_tests(12);
 
-        optstr=list2str(np_get_defaults("section@./config-tiny.ini", "check_disk"));
-        ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "config-tiny.ini's section as expected");
+        char *optstr = list2str(np_get_defaults("section@./config-tiny.ini", "check_disk"));
+        ok(!strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"),
+           "config-tiny.ini's section as expected");
         my_free(optstr);
 
-        optstr=list2str(np_get_defaults("@./config-tiny.ini", "section"));
-        ok( !strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "Used default section name, without specific");
+        optstr = list2str(np_get_defaults("@./config-tiny.ini", "section"));
+        ok(!strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"),
+           "Used default section name, without specific");
         my_free(optstr);
 
-        optstr=list2str(np_get_defaults("Section Two@./config-tiny.ini", "check_disk"));
-        ok( !strcmp(optstr, "--something else=blah --remove=whitespace"), "config-tiny.ini's Section Two as expected");
+        optstr = list2str(np_get_defaults("Section Two@./config-tiny.ini", "check_disk"));
+        ok(!strcmp(optstr, "--something else=blah --remove=whitespace"),
+           "config-tiny.ini's Section Two as expected");
         my_free(optstr);
 
-        optstr=list2str(np_get_defaults("/path/to/file.txt@./config-tiny.ini", "check_disk"));
-        ok( !strcmp(optstr, "--this=that"), "config-tiny.ini's filename as section name");
+        optstr = list2str(np_get_defaults("/path/to/file.txt@./config-tiny.ini", "check_disk"));
+        ok(!strcmp(optstr, "--this=that"), "config-tiny.ini's filename as section name");
         my_free(optstr);
 
-        optstr=list2str(np_get_defaults("section2@./config-tiny.ini", "check_disk"));
-        ok( !strcmp(optstr, "--this=that"), "config-tiny.ini's section2 with whitespace before section name");
+        optstr = list2str(np_get_defaults("section2@./config-tiny.ini", "check_disk"));
+        ok(!strcmp(optstr, "--this=that"),
+           "config-tiny.ini's section2 with whitespace before section name");
         my_free(optstr);
 
-        optstr=list2str(np_get_defaults("section3@./config-tiny.ini", "check_disk"));
-        ok( !strcmp(optstr, "--this=that"), "config-tiny.ini's section3 with whitespace after section name");
+        optstr = list2str(np_get_defaults("section3@./config-tiny.ini", "check_disk"));
+        ok(!strcmp(optstr, "--this=that"),
+           "config-tiny.ini's section3 with whitespace after section name");
         my_free(optstr);
 
-        optstr=list2str(np_get_defaults("check_mysql@./plugin.ini", "check_disk"));
-        ok( !strcmp(optstr, "--username=operator --password=secret"), "plugin.ini's check_mysql as expected");
+        optstr = list2str(np_get_defaults("check_mysql@./plugin.ini", "check_disk"));
+        ok(!strcmp(optstr, "--username=operator --password=secret"),
+           "plugin.ini's check_mysql as expected");
         my_free(optstr);
 
-        optstr=list2str(np_get_defaults("check_mysql2@./plugin.ini", "check_disk"));
-        ok( !strcmp(optstr, "-u=admin -p=secret"), "plugin.ini's check_mysql2 as expected");
+        optstr = list2str(np_get_defaults("check_mysql2@./plugin.ini", "check_disk"));
+        ok(!strcmp(optstr, "-u=admin -p=secret"), "plugin.ini's check_mysql2 as expected");
         my_free(optstr);
 
-        optstr=list2str(np_get_defaults("check space_and_flags@./plugin.ini", "check_disk"));
-        ok( !strcmp(optstr, "--foo=bar -a -b --bar"), "plugin.ini space in stanza and flag arguments");
+        optstr = list2str(np_get_defaults("check space_and_flags@./plugin.ini", "check_disk"));
+        ok(!strcmp(optstr, "--foo=bar -a -b --bar"), "plugin.ini space in stanza and flag arguments");
         my_free(optstr);
 
-        optstr=list2str(np_get_defaults("Section Two@./config-dos.ini", "check_disk"));
-        ok( !strcmp(optstr, "--something else=blah --remove=whitespace"), "config-dos.ini's Section Two as expected");
+        optstr = list2str(np_get_defaults("Section Two@./config-dos.ini", "check_disk"));
+        ok(!strcmp(optstr, "--something else=blah --remove=whitespace"),
+           "config-dos.ini's Section Two as expected");
         my_free(optstr);
 
-        optstr=list2str(np_get_defaults("section_twice@./plugin.ini", "check_disk"));
-        ok( !strcmp(optstr, "--foo=bar --bar=foo"), "plugin.ini's section_twice defined twice in the file");
+        optstr = list2str(np_get_defaults("section_twice@./plugin.ini", "check_disk"));
+        ok(!strcmp(optstr, "--foo=bar --bar=foo"),
+           "plugin.ini's section_twice defined twice in the file");
         my_free(optstr);
 
-        optstr=list2str(np_get_defaults("tcp_long_lines@plugins.ini", "check_tcp"));
-        ok( !strcmp(optstr, "--escape --send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda --expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda --jail"), "Long options");
+        optstr = list2str(np_get_defaults("tcp_long_lines@plugins.ini", "check_tcp"));
+        ok(!strcmp(optstr, "--escape --send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                           "yadda Foo bar BAZ yadda yadda yadda Foo bar "
+                                           "BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                           "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar "
+                                           "BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                           "yadda yadda Foo bar BAZ yadda yadda yadda Foo "
+                                           "bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                           "yadda yadda Foo bar BAZ yadda yadda "
+                                           "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
+                                           "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                           "yadda --expect=Foo bar BAZ yadda yadda "
+                                           "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
+                                           "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                           "yadda Foo bar BAZ yadda yadda yadda Foo "
+                                           "bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                           "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar "
+                                           "BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                           "yadda yadda Foo bar BAZ yadda yadda yadda Foo "
+                                           "bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                           "yadda yadda Foo bar BAZ yadda yadda "
+                                           "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
+                                           "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                           "yadda Foo bar BAZ yadda yadda yadda Foo "
+                                           "bar BAZ yadda yadda yadda --jail"),
+           "Long options");
         my_free(optstr);
 
         return exit_status();
 }
-
diff --git a/lib/tests/test_ini3.c b/lib/tests/test_ini3.c
index 8a2a0414..2186e4bb 100644
--- a/lib/tests/test_ini3.c
+++ b/lib/tests/test_ini3.c
@@ -1,26 +1,24 @@
 /*****************************************************************************
-*
-* 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 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* 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, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #include "parse_ini.h"
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
 
         /*
          * This is for testing arguments expected to die.
@@ -30,4 +28,3 @@ main (int argc, char **argv)
 
         return 0;
 }
-
diff --git a/lib/tests/test_opts1.c b/lib/tests/test_opts1.c
index 077c5b63..fa95c4d4 100644
--- a/lib/tests/test_opts1.c
+++ b/lib/tests/test_opts1.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-*
-* 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 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* 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, see <http://www.gnu.org/licenses/>.
-*
-*****************************************************************************/
+ *
+ * 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
 
 #include "common.h"
 #include "utils_base.h"
@@ -40,36 +40,41 @@ void my_free(int *argc, char **newargv, char **argv) {
 #else
 void my_free(int *argc, char **newargv, char **argv) {
         /* Free stuff (and print while we're at it) */
-        int i, freeflag=1;
-        printf ("    Arg(%i): ", *argc+1);
-        printf ("'%s' ", newargv[0]);
-        for (i=1; i<*argc; i++) {
-                printf ("'%s' ", newargv[i]);
+        bool freeflag = true;
+        printf("    Arg(%i): ", *argc + 1);
+        printf("'%s' ", newargv[0]);
+
+        for (int i = 1; i < *argc; i++) {
+                printf("'%s' ", newargv[i]);
                 /* Stop freeing when we get to the start of the original array */
                 if (freeflag) {
-                        if (newargv[i] == argv[1])
-                                freeflag=0;
-                        else
+                        if (newargv[i] == argv[1]) {
+                                freeflag = false;
+                        } else {
                                 free(newargv[i]);
+                        }
                 }
         }
-        printf ("\n");
+        printf("\n");
         /* Free only if it's a different array */
-        if (newargv != argv) free(newargv);
-        *argc=0;
+        if (newargv != argv) {
+                free(newargv);
+        }
+        *argc = 0;
 }
 #endif
 
 int array_diff(int i1, char **a1, int i2, char **a2) {
-        int i;
-
         if (i1 != i2) {
                 printf("    Argument count doesn't match!\n");
                 return 0;
         }
-        for (i=0; i<=i1; i++) {
-                if (a1[i]==NULL && a2[i]==NULL) continue;
-                if (a1[i]==NULL || a2[i]==NULL) {
+
+        for (int i = 0; i <= i1; i++) {
+                if (a1[i] == NULL && a2[i] == NULL) {
+                        continue;
+                }
+                if (a1[i] == NULL || a2[i] == NULL) {
                         printf("    Argument # %i null in one array!\n", i);
                         return 0;
                 }
@@ -81,59 +86,66 @@ int array_diff(int i1, char **a1, int i2, char **a2) {
         return 1;
 }
 
-int
-main (int argc, char **argv)
-{
-        char **argv_new=NULL;
-        int i, argc_test;
-
+int main(int argc, char **argv) {
         plan_tests(5);
 
+        char **argv_new = NULL;
+        int argc_test;
         {
-                char *argv_test[] = {"prog_name", (char *) NULL};
-                argc_test=1;
-                char *argv_known[] = {"prog_name", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_test[] = {"prog_name", (char *)NULL};
+                argc_test = 1;
+                char *argv_known[] = {"prog_name", (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 1, argv_known), "No opts, returns correct argv/argc");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *) NULL};
-                argc_test=5;
-                char *argv_known[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_test[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *)NULL};
+                argc_test = 5;
+                char *argv_known[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 5, argv_known), "No extra opts, verbatim copy of argv");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"prog_name", "--extra-opts=@./config-opts.ini", (char *) NULL};
-                argc_test=2;
-                char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_test[] = {"prog_name", "--extra-opts=@./config-opts.ini", (char *)NULL};
+                argc_test = 2;
+                char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank",
+                                                          (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts using default section");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"prog_name", "--extra-opts=sect1@./config-opts.ini", "--extra-opts", "sect2@./config-opts.ini", (char *) NULL};
-                argc_test=4;
-                char *argv_known[] = {"prog_name", "--one=two", "--something else=oops", "--this=that", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_test[] = {"prog_name", "--extra-opts=sect1@./config-opts.ini", "--extra-opts",
+                                                         "sect2@./config-opts.ini", (char *)NULL};
+                argc_test = 4;
+                char *argv_known[] = {"prog_name", "--one=two", "--something else=oops", "--this=that",
+                                                          (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts specified twice");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"prog_name", "--arg1=val1", "--extra-opts=@./config-opts.ini", "--extra-opts", "sect1@./config-opts.ini", "--arg2", (char *) NULL};
-                argc_test=6;
-                char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank", "--one=two", "--arg1=val1", "--arg2", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_test[] = {"prog_name",
+                                                         "--arg1=val1",
+                                                         "--extra-opts=@./config-opts.ini",
+                                                         "--extra-opts",
+                                                         "sect1@./config-opts.ini",
+                                                         "--arg2",
+                                                         (char *)NULL};
+                argc_test = 6;
+                char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!",
+                                                          "--blank",   "--one=two", "--arg1=val1",
+                                                          "--arg2",    (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 7, argv_known), "twice extra opts using two sections");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         return exit_status();
 }
-
diff --git a/lib/tests/test_opts2.c b/lib/tests/test_opts2.c
index 780220ee..3dd1b039 100644
--- a/lib/tests/test_opts2.c
+++ b/lib/tests/test_opts2.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-*
-* 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 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* 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, see <http://www.gnu.org/licenses/>.
-*
-*****************************************************************************/
+ *
+ * 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
 
 #include "common.h"
 #include "utils_base.h"
@@ -23,35 +23,40 @@
 
 void my_free(int *argc, char **newargv, char **argv) {
         /* Free stuff (and print while we're at it) */
-        int i, freeflag=1;
-        printf ("    Arg(%i): ", *argc+1);
-        printf ("'%s' ", newargv[0]);
-        for (i=1; i<*argc; i++) {
-                printf ("'%s' ", newargv[i]);
+        bool freeflag = true;
+
+        printf("    Arg(%i): ", *argc + 1);
+        printf("'%s' ", newargv[0]);
+        for (int i = 1; i < *argc; i++) {
+                printf("'%s' ", newargv[i]);
                 /* Stop freeing when we get to the start of the original array */
                 if (freeflag) {
-                        if (newargv[i] == argv[1])
-                                freeflag=0;
-                        else
+                        if (newargv[i] == argv[1]) {
+                                freeflag = false;
+                        } else {
                                 free(newargv[i]);
+                        }
                 }
         }
-        printf ("\n");
+        printf("\n");
         /* Free only if it's a different array */
-        if (newargv != argv) free(newargv);
-        *argc=0;
+        if (newargv != argv) {
+                free(newargv);
+        }
+        *argc = 0;
 }
 
 int array_diff(int i1, char **a1, int i2, char **a2) {
-        int i;
-
         if (i1 != i2) {
                 printf("    Argument count doesn't match!\n");
                 return 0;
         }
-        for (i=0; i<=i1; i++) {
-                if (a1[i]==NULL && a2[i]==NULL) continue;
-                if (a1[i]==NULL || a2[i]==NULL) {
+
+        for (int i = 0; i <= i1; i++) {
+                if (a1[i] == NULL && a2[i] == NULL) {
+                        continue;
+                }
+                if (a1[i] == NULL || a2[i] == NULL) {
                         printf("    Argument # %i null in one array!\n", i);
                         return 0;
                 }
@@ -63,59 +68,86 @@ int array_diff(int i1, char **a1, int i2, char **a2) {
         return 1;
 }
 
-int
-main (int argc, char **argv)
-{
-        char **argv_new=NULL;
-        int i, argc_test;
-
+int main(int argc, char **argv) {
         plan_tests(5);
 
+        char **argv_new = NULL;
+        int argc_test;
         {
-                char *argv_test[] = {"prog_name", "arg1", "--extra-opts", "--arg3", "val2", (char *) NULL};
-                argc_test=5;
-                char *argv_known[] = {"prog_name", "--foo=bar", "arg1", "--arg3", "val2", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_test[] = {"prog_name", "arg1", "--extra-opts", "--arg3", "val2", (char *)NULL};
+                argc_test = 5;
+                char *argv_known[] = {"prog_name", "--foo=bar", "arg1", "--arg3", "val2", (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 5, argv_known), "Default section 1");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"prog_name", "--extra-opts", (char *) NULL};
-                argc_test=2;
-                char *argv_known[] = {"prog_name", "--foo=bar", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_test[] = {"prog_name", "--extra-opts", (char *)NULL};
+                argc_test = 2;
+                char *argv_known[] = {"prog_name", "--foo=bar", (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 2, argv_known), "Default section 2");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"prog_name", "arg1", "--extra-opts=section1", "--arg3", "val2", (char *) NULL};
-                argc_test=5;
-                char *argv_known[] = {"prog_name", "--foobar=baz", "arg1", "--arg3", "val2", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_test[] = {"prog_name", "arg1", "--extra-opts=section1",
+                                                         "--arg3",    "val2", (char *)NULL};
+                argc_test = 5;
+                char *argv_known[] = {"prog_name", "--foobar=baz", "arg1", "--arg3", "val2", (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 5, argv_known), "Default section 3");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"prog_name", "arg1", "--extra-opts", "-arg3", "val2", (char *) NULL};
-                argc_test=5;
-                char *argv_known[] = {"prog_name", "--foo=bar", "arg1", "-arg3", "val2", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_test[] = {"prog_name", "arg1", "--extra-opts", "-arg3", "val2", (char *)NULL};
+                argc_test = 5;
+                char *argv_known[] = {"prog_name", "--foo=bar", "arg1", "-arg3", "val2", (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 5, argv_known), "Default section 4");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"check_tcp", "--extra-opts", "--extra-opts=tcp_long_lines", (char *) NULL};
-                argc_test=3;
-                char *argv_known[] = {"check_tcp", "--timeout=10", "--escape", "--send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda", "--expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda", "--jail", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_tcp");
+                char *argv_test[] = {"check_tcp", "--extra-opts", "--extra-opts=tcp_long_lines",
+                                                         (char *)NULL};
+                argc_test = 3;
+                char *argv_known[] = {"check_tcp",
+                                                          "--timeout=10",
+                                                          "--escape",
+                                                          "--send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda "
+                                                          "Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                                          "yadda Foo bar BAZ yadda "
+                                                          "yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                                          "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                                          "yadda Foo bar BAZ "
+                                                          "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                                          "yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                                          "yadda yadda Foo bar "
+                                                          "BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
+                                                          "yadda yadda yadda Foo bar BAZ yadda yadda yadda",
+                                                          "--expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                                          "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                                          "yadda Foo bar BAZ yadda "
+                                                          "yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                                          "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                                          "yadda Foo bar BAZ "
+                                                          "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                                          "yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                                          "yadda yadda Foo bar "
+                                                          "BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
+                                                          "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
+                                                          "yadda yadda yadda Foo "
+                                                          "bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
+                                                          "yadda yadda yadda Foo bar BAZ yadda yadda yadda",
+                                                          "--jail",
+                                                          (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_tcp");
                 ok(array_diff(argc_test, argv_new, 6, argv_known), "Long lines test");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         return exit_status();
 }
-
diff --git a/lib/tests/test_opts3.c b/lib/tests/test_opts3.c
index b64270da..cecea437 100644
--- a/lib/tests/test_opts3.c
+++ b/lib/tests/test_opts3.c
@@ -1,31 +1,28 @@
 /*****************************************************************************
-*
-* 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 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* 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, see <http://www.gnu.org/licenses/>.
-*
-*****************************************************************************/
+ *
+ * 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
 
 #include "extra_opts.h"
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
 
         /*
          * This is for testing arguments expected to die.
          */
-        argv=np_extra_opts(&argc, argv, argv[0]);
+        argv = np_extra_opts(&argc, argv, argv[0]);
 
         return 0;
 }
-
diff --git a/lib/tests/test_tcp.c b/lib/tests/test_tcp.c
index 1954b0fb..37c818c9 100644
--- a/lib/tests/test_tcp.c
+++ b/lib/tests/test_tcp.c
@@ -1,58 +1,60 @@
 /*****************************************************************************
-*
-* 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 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* 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, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #include "common.h"
 #include "utils_tcp.h"
 #include "tap.h"
 
-int
-main(void)
-{
-        char **server_expect;
-        int server_expect_count = 3;
-
+int main(void) {
         plan_tests(9);
 
-        server_expect = malloc(sizeof(char*) * server_expect_count);
+        char **server_expect;
+        const int server_expect_count = 3;
+        server_expect = malloc(sizeof(char *) * server_expect_count);
 
         server_expect[0] = strdup("AA");
         server_expect[1] = strdup("bb");
         server_expect[2] = strdup("CC");
 
-        ok(np_expect_match("AA bb CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) == NP_MATCH_SUCCESS,
+        ok(np_expect_match("AA bb CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) ==
+                   NP_MATCH_SUCCESS,
            "Test matching any string at the beginning (first expect string)");
-        ok(np_expect_match("bb AA CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) == NP_MATCH_SUCCESS,
+        ok(np_expect_match("bb AA CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) ==
+                   NP_MATCH_SUCCESS,
            "Test matching any string at the beginning (second expect string)");
         ok(np_expect_match("b", server_expect, server_expect_count, NP_MATCH_EXACT) == NP_MATCH_RETRY,
            "Test matching any string at the beginning (substring match)");
-        ok(np_expect_match("XX bb AA CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) == NP_MATCH_FAILURE,
+        ok(np_expect_match("XX bb AA CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) ==
+                   NP_MATCH_FAILURE,
            "Test with strings not matching at the beginning");
-        ok(np_expect_match("XX CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) == NP_MATCH_FAILURE,
+        ok(np_expect_match("XX CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) ==
+                   NP_MATCH_FAILURE,
            "Test matching any string");
         ok(np_expect_match("XX", server_expect, server_expect_count, 0) == NP_MATCH_RETRY,
            "Test not matching any string");
-        ok(np_expect_match("XX AA bb CC XX", server_expect, server_expect_count, NP_MATCH_ALL) == NP_MATCH_SUCCESS,
+        ok(np_expect_match("XX AA bb CC XX", server_expect, server_expect_count, NP_MATCH_ALL) ==
+                   NP_MATCH_SUCCESS,
            "Test matching all strings");
-        ok(np_expect_match("XX bb CC XX", server_expect, server_expect_count, NP_MATCH_ALL) == NP_MATCH_RETRY,
+        ok(np_expect_match("XX bb CC XX", server_expect, server_expect_count, NP_MATCH_ALL) ==
+                   NP_MATCH_RETRY,
            "Test not matching all strings");
         ok(np_expect_match("XX XX", server_expect, server_expect_count, NP_MATCH_ALL) == NP_MATCH_RETRY,
            "Test not matching any string (testing all)");
 
-
         return exit_status();
 }
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index 01afacdc..8040dec8 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -1,20 +1,20 @@
 /*****************************************************************************
-*
-* 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 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* 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, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #include "common.h"
 #include "utils_base.h"
@@ -27,484 +27,315 @@
 
 #include "utils_base.c"
 
-int
-main (int argc, char **argv)
-{
-        char state_path[1024];
-        range   *range;
-        double  temp;
-        thresholds *thresholds = NULL;
-        int     i, rc;
-        char    *temp_string;
-        state_key *temp_state_key = NULL;
-        state_data *temp_state_data;
-        time_t  current_time;
-
-        plan_tests(185);
+int main(int argc, char **argv) {
+        plan_tests(155);
 
-        ok( this_monitoring_plugin==NULL, "monitoring_plugin not initialised");
+        ok(this_monitoring_plugin == NULL, "monitoring_plugin not initialised");
 
-        np_init( "check_test", argc, argv );
+        np_init("check_test", argc, argv);
 
-        ok( this_monitoring_plugin!=NULL, "monitoring_plugin now initialised");
-        ok( !strcmp(this_monitoring_plugin->plugin_name, "check_test"), "plugin name initialised" );
+        ok(this_monitoring_plugin != NULL, "monitoring_plugin now initialised");
+        ok(!strcmp(this_monitoring_plugin->plugin_name, "check_test"), "plugin name initialised");
 
-        ok( this_monitoring_plugin->argc==argc, "Argc set" );
-        ok( this_monitoring_plugin->argv==argv, "Argv set" );
+        ok(this_monitoring_plugin->argc == argc, "Argc set");
+        ok(this_monitoring_plugin->argv == argv, "Argv set");
 
-        np_set_args(0,0);
+        np_set_args(0, 0);
 
-        ok( this_monitoring_plugin->argc==0, "argc changed" );
-        ok( this_monitoring_plugin->argv==0, "argv changed" );
+        ok(this_monitoring_plugin->argc == 0, "argc changed");
+        ok(this_monitoring_plugin->argv == 0, "argv changed");
 
         np_set_args(argc, argv);
 
-        range = parse_range_string("6");
-        ok( range != NULL, "'6' is valid range");
-        ok( range->start == 0, "Start correct");
-        ok( range->start_infinity == false, "Not using negative infinity");
-        ok( range->end == 6, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
+        range *range = parse_range_string("6");
+        ok(range != NULL, "'6' is valid range");
+        ok(range->start == 0, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end == 6, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string("1:12%%");
-        ok( range != NULL, "'1:12%%' is valid - percentages are ignored");
-        ok( range->start == 1, "Start correct");
-        ok( range->start_infinity == false, "Not using negative infinity");
-        ok( range->end == 12, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
+        ok(range != NULL, "'1:12%%' is valid - percentages are ignored");
+        ok(range->start == 1, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end == 12, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string("-7:23");
-        ok( range != NULL, "'-7:23' is valid range");
-        ok( range->start == -7, "Start correct");
-        ok( range->start_infinity == false, "Not using negative infinity");
-        ok( range->end == 23, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
+        ok(range != NULL, "'-7:23' is valid range");
+        ok(range->start == -7, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end == 23, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string(":5.75");
-        ok( range != NULL, "':5.75' is valid range");
-        ok( range->start == 0, "Start correct");
-        ok( range->start_infinity == false, "Not using negative infinity");
-        ok( range->end == 5.75, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
+        ok(range != NULL, "':5.75' is valid range");
+        ok(range->start == 0, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end == 5.75, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string("~:-95.99");
-        ok( range != NULL, "~:-95.99' is valid range");
-        ok( range->start_infinity == true, "Using negative infinity");
-        ok( range->end == -95.99, "End correct (with rounding errors)");
-        ok( range->end_infinity == false, "Not using infinity");
+        ok(range != NULL, "~:-95.99' is valid range");
+        ok(range->start_infinity == true, "Using negative infinity");
+        ok(range->end == -95.99, "End correct (with rounding errors)");
+        ok(range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string("12345678901234567890:");
-        temp = atof("12345678901234567890");            /* Can't just use this because number too large */
-        ok( range != NULL, "'12345678901234567890:' is valid range");
-        ok( range->start == temp, "Start correct");
-        ok( range->start_infinity == false, "Not using negative infinity");
-        ok( range->end_infinity == true, "Using infinity");
+        double temp = atof("12345678901234567890"); /* Can't just use this because number too large */
+        ok(range != NULL, "'12345678901234567890:' is valid range");
+        ok(range->start == temp, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end_infinity == true, "Using infinity");
         /* Cannot do a "-1" on temp, as it appears to be same value */
-        ok( check_range(temp/1.1, range) == true, "12345678901234567890/1.1 - alert");
-        ok( check_range(temp, range) == false, "12345678901234567890 - no alert");
-        ok( check_range(temp*2, range) == false, "12345678901234567890*2 - no alert");
+        ok(check_range(temp / 1.1, range) == true, "12345678901234567890/1.1 - alert");
+        ok(check_range(temp, range) == false, "12345678901234567890 - no alert");
+        ok(check_range(temp * 2, range) == false, "12345678901234567890*2 - no alert");
         free(range);
 
         range = parse_range_string("~:0");
-        ok( range != NULL, "'~:0' is valid range");
-        ok( range->start_infinity == true, "Using negative infinity");
-        ok( range->end == 0, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
-        ok( range->alert_on == OUTSIDE, "Will alert on outside of this range");
-        ok( check_range(0.5, range) == true, "0.5 - alert");
-        ok( check_range(-10, range) == false, "-10 - no alert");
-        ok( check_range(0, range)   == false, "0 - no alert");
+        ok(range != NULL, "'~:0' is valid range");
+        ok(range->start_infinity == true, "Using negative infinity");
+        ok(range->end == 0, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
+        ok(range->alert_on == OUTSIDE, "Will alert on outside of this range");
+        ok(check_range(0.5, range) == true, "0.5 - alert");
+        ok(check_range(-10, range) == false, "-10 - no alert");
+        ok(check_range(0, range) == false, "0 - no alert");
         free(range);
 
         range = parse_range_string("@0:657.8210567");
-        ok( range != 0, "@0:657.8210567' is a valid range");
-        ok( range->start == 0, "Start correct");
-        ok( range->start_infinity == false, "Not using negative infinity");
-        ok( range->end == 657.8210567, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
-        ok( range->alert_on == INSIDE, "Will alert on inside of this range" );
-        ok( check_range(32.88, range) == true, "32.88 - alert");
-        ok( check_range(-2, range)    == false, "-2 - no alert");
-        ok( check_range(657.8210567, range) == true, "657.8210567 - alert");
-        ok( check_range(0, range)     == true, "0 - alert");
+        ok(range != 0, "@0:657.8210567' is a valid range");
+        ok(range->start == 0, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end == 657.8210567, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
+        ok(range->alert_on == INSIDE, "Will alert on inside of this range");
+        ok(check_range(32.88, range) == true, "32.88 - alert");
+        ok(check_range(-2, range) == false, "-2 - no alert");
+        ok(check_range(657.8210567, range) == true, "657.8210567 - alert");
+        ok(check_range(0, range) == true, "0 - alert");
         free(range);
 
         range = parse_range_string("@1:1");
-        ok( range != NULL, "'@1:1' is a valid range");
-        ok( range->start == 1, "Start correct");
-        ok( range->start_infinity == false, "Not using negative infinity");
-        ok( range->end == 1, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
-        ok( range->alert_on == INSIDE, "Will alert on inside of this range" );
-        ok( check_range(0.5, range) == false, "0.5 - no alert");
-        ok( check_range(1, range) == true, "1 - alert");
-        ok( check_range(5.2, range) == false, "5.2 - no alert");
+        ok(range != NULL, "'@1:1' is a valid range");
+        ok(range->start == 1, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end == 1, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
+        ok(range->alert_on == INSIDE, "Will alert on inside of this range");
+        ok(check_range(0.5, range) == false, "0.5 - no alert");
+        ok(check_range(1, range) == true, "1 - alert");
+        ok(check_range(5.2, range) == false, "5.2 - no alert");
         free(range);
 
         range = parse_range_string("1:1");
-        ok( range != NULL, "'1:1' is a valid range");
-        ok( range->start == 1, "Start correct");
-        ok( range->start_infinity == false, "Not using negative infinity");
-        ok( range->end == 1, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
-        ok( check_range(0.5, range) == true, "0.5 - alert");
-        ok( check_range(1, range) == false, "1 - no alert");
-        ok( check_range(5.2, range) == true, "5.2 - alert");
+        ok(range != NULL, "'1:1' is a valid range");
+        ok(range->start == 1, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end == 1, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
+        ok(check_range(0.5, range) == true, "0.5 - alert");
+        ok(check_range(1, range) == false, "1 - no alert");
+        ok(check_range(5.2, range) == true, "5.2 - alert");
         free(range);
 
         range = parse_range_string("2:1");
-        ok( range == NULL, "'2:1' rejected");
-
-        rc = _set_thresholds(&thresholds, NULL, NULL);
-        ok( rc == 0, "Thresholds (NULL, NULL) set");
-        ok( thresholds->warning == NULL, "Warning not set");
-        ok( thresholds->critical == NULL, "Critical not set");
-
-        rc = _set_thresholds(&thresholds, NULL, "80");
-        ok( rc == 0, "Thresholds (NULL, '80') set");
-        ok( thresholds->warning == NULL, "Warning not set");
-        ok( thresholds->critical->end == 80, "Critical set correctly");
-
-        rc = _set_thresholds(&thresholds, "5:33", NULL);
-        ok( rc == 0, "Thresholds ('5:33', NULL) set");
-        ok( thresholds->warning->start == 5, "Warning start set");
-        ok( thresholds->warning->end == 33, "Warning end set");
-        ok( thresholds->critical == NULL, "Critical not set");
-
-        rc = _set_thresholds(&thresholds, "30", "60");
-        ok( rc == 0, "Thresholds ('30', '60') set");
-        ok( thresholds->warning->end == 30, "Warning set correctly");
-        ok( thresholds->critical->end == 60, "Critical set correctly");
-        ok( get_status(15.3, thresholds) == STATE_OK, "15.3 - ok");
-        ok( get_status(30.0001, thresholds) == STATE_WARNING, "30.0001 - warning");
-        ok( get_status(69, thresholds) == STATE_CRITICAL, "69 - critical");
-
-        rc = _set_thresholds(&thresholds, "-10:-2", "-30:20");
-        ok( rc == 0, "Thresholds ('-30:20', '-10:-2') set");
-        ok( thresholds->warning->start == -10, "Warning start set correctly");
-        ok( thresholds->warning->end == -2, "Warning end set correctly");
-        ok( thresholds->critical->start == -30, "Critical start set correctly");
-        ok( thresholds->critical->end == 20, "Critical end set correctly");
-        ok( get_status(-31, thresholds) == STATE_CRITICAL, "-31 - critical");
-        ok( get_status(-29, thresholds) == STATE_WARNING, "-29 - warning");
-        ok( get_status(-11, thresholds) == STATE_WARNING, "-11 - warning");
-        ok( get_status(-10, thresholds) == STATE_OK, "-10 - ok");
-        ok( get_status(-2, thresholds) == STATE_OK, "-2 - ok");
-        ok( get_status(-1, thresholds) == STATE_WARNING, "-1 - warning");
-        ok( get_status(19, thresholds) == STATE_WARNING, "19 - warning");
-        ok( get_status(21, thresholds) == STATE_CRITICAL, "21 - critical");
+        ok(range == NULL, "'2:1' rejected");
+
+        thresholds *thresholds = NULL;
+        int returnCode;
+        returnCode = _set_thresholds(&thresholds, NULL, NULL);
+        ok(returnCode == 0, "Thresholds (NULL, NULL) set");
+        ok(thresholds->warning == NULL, "Warning not set");
+        ok(thresholds->critical == NULL, "Critical not set");
+
+        returnCode = _set_thresholds(&thresholds, NULL, "80");
+        ok(returnCode == 0, "Thresholds (NULL, '80') set");
+        ok(thresholds->warning == NULL, "Warning not set");
+        ok(thresholds->critical->end == 80, "Critical set correctly");
+
+        returnCode = _set_thresholds(&thresholds, "5:33", NULL);
+        ok(returnCode == 0, "Thresholds ('5:33', NULL) set");
+        ok(thresholds->warning->start == 5, "Warning start set");
+        ok(thresholds->warning->end == 33, "Warning end set");
+        ok(thresholds->critical == NULL, "Critical not set");
+
+        returnCode = _set_thresholds(&thresholds, "30", "60");
+        ok(returnCode == 0, "Thresholds ('30', '60') set");
+        ok(thresholds->warning->end == 30, "Warning set correctly");
+        ok(thresholds->critical->end == 60, "Critical set correctly");
+        ok(get_status(15.3, thresholds) == STATE_OK, "15.3 - ok");
+        ok(get_status(30.0001, thresholds) == STATE_WARNING, "30.0001 - warning");
+        ok(get_status(69, thresholds) == STATE_CRITICAL, "69 - critical");
+
+        returnCode = _set_thresholds(&thresholds, "-10:-2", "-30:20");
+        ok(returnCode == 0, "Thresholds ('-30:20', '-10:-2') set");
+        ok(thresholds->warning->start == -10, "Warning start set correctly");
+        ok(thresholds->warning->end == -2, "Warning end set correctly");
+        ok(thresholds->critical->start == -30, "Critical start set correctly");
+        ok(thresholds->critical->end == 20, "Critical end set correctly");
+        ok(get_status(-31, thresholds) == STATE_CRITICAL, "-31 - critical");
+        ok(get_status(-29, thresholds) == STATE_WARNING, "-29 - warning");
+        ok(get_status(-11, thresholds) == STATE_WARNING, "-11 - warning");
+        ok(get_status(-10, thresholds) == STATE_OK, "-10 - ok");
+        ok(get_status(-2, thresholds) == STATE_OK, "-2 - ok");
+        ok(get_status(-1, thresholds) == STATE_WARNING, "-1 - warning");
+        ok(get_status(19, thresholds) == STATE_WARNING, "19 - warning");
+        ok(get_status(21, thresholds) == STATE_CRITICAL, "21 - critical");
 
         char *test;
         test = np_escaped_string("bob\\n");
-        ok( strcmp(test, "bob\n") == 0, "bob\\n ok");
+        ok(strcmp(test, "bob\n") == 0, "bob\\n ok");
         free(test);
 
         test = np_escaped_string("rhuba\\rb");
-        ok( strcmp(test, "rhuba\rb") == 0, "rhuba\\rb okay");
+        ok(strcmp(test, "rhuba\rb") == 0, "rhuba\\rb okay");
         free(test);
 
         test = np_escaped_string("ba\\nge\\r");
-        ok( strcmp(test, "ba\nge\r") == 0, "ba\\nge\\r okay");
+        ok(strcmp(test, "ba\nge\r") == 0, "ba\\nge\\r okay");
         free(test);
 
         test = np_escaped_string("\\rabbi\\t");
-        ok( strcmp(test, "\rabbi\t") == 0, "\\rabbi\\t okay");
+        ok(strcmp(test, "\rabbi\t") == 0, "\\rabbi\\t okay");
         free(test);
 
         test = np_escaped_string("and\\\\or");
-        ok( strcmp(test, "and\\or") == 0, "and\\\\or okay");
+        ok(strcmp(test, "and\\or") == 0, "and\\\\or okay");
         free(test);
 
         test = np_escaped_string("bo\\gus");
-        ok( strcmp(test, "bogus") == 0, "bo\\gus okay");
+        ok(strcmp(test, "bogus") == 0, "bo\\gus okay");
         free(test);
 
         test = np_escaped_string("everything");
-        ok( strcmp(test, "everything") == 0, "everything okay");
+        ok(strcmp(test, "everything") == 0, "everything okay");
 
         /* np_extract_ntpvar tests (23) */
-        test=np_extract_ntpvar("foo=bar, bar=foo, foobar=barfoo\n", "foo");
+        test = np_extract_ntpvar("foo=bar, bar=foo, foobar=barfoo\n", "foo");
         ok(test && !strcmp(test, "bar"), "1st test as expected");
         free(test);
 
-        test=np_extract_ntpvar("foo=bar,bar=foo,foobar=barfoo\n", "bar");
+        test = np_extract_ntpvar("foo=bar,bar=foo,foobar=barfoo\n", "bar");
         ok(test && !strcmp(test, "foo"), "2nd test as expected");
         free(test);
 
-        test=np_extract_ntpvar("foo=bar, bar=foo, foobar=barfoo\n", "foobar");
+        test = np_extract_ntpvar("foo=bar, bar=foo, foobar=barfoo\n", "foobar");
         ok(test && !strcmp(test, "barfoo"), "3rd test as expected");
         free(test);
 
-        test=np_extract_ntpvar("foo=bar\n", "foo");
+        test = np_extract_ntpvar("foo=bar\n", "foo");
         ok(test && !strcmp(test, "bar"), "Single test as expected");
         free(test);
 
-        test=np_extract_ntpvar("foo=bar, bar=foo, foobar=barfooi\n", "abcd");
+        test = np_extract_ntpvar("foo=bar, bar=foo, foobar=barfooi\n", "abcd");
         ok(!test, "Key not found 1");
 
-        test=np_extract_ntpvar("foo=bar\n", "abcd");
+        test = np_extract_ntpvar("foo=bar\n", "abcd");
         ok(!test, "Key not found 2");
 
-        test=np_extract_ntpvar("foo=bar=foobar", "foo");
+        test = np_extract_ntpvar("foo=bar=foobar", "foo");
         ok(test && !strcmp(test, "bar=foobar"), "Strange string 1");
         free(test);
 
-        test=np_extract_ntpvar("foo", "foo");
+        test = np_extract_ntpvar("foo", "foo");
         ok(!test, "Malformed string 1");
 
-        test=np_extract_ntpvar("foo,", "foo");
+        test = np_extract_ntpvar("foo,", "foo");
         ok(!test, "Malformed string 2");
 
-        test=np_extract_ntpvar("foo=", "foo");
+        test = np_extract_ntpvar("foo=", "foo");
         ok(!test, "Malformed string 3");
 
-        test=np_extract_ntpvar("foo=,bar=foo", "foo");
+        test = np_extract_ntpvar("foo=,bar=foo", "foo");
         ok(!test, "Malformed string 4");
 
-        test=np_extract_ntpvar(",foo", "foo");
+        test = np_extract_ntpvar(",foo", "foo");
         ok(!test, "Malformed string 5");
 
-        test=np_extract_ntpvar("=foo", "foo");
+        test = np_extract_ntpvar("=foo", "foo");
         ok(!test, "Malformed string 6");
 
-        test=np_extract_ntpvar("=foo,", "foo");
+        test = np_extract_ntpvar("=foo,", "foo");
         ok(!test, "Malformed string 7");
 
-        test=np_extract_ntpvar(",,,", "foo");
+        test = np_extract_ntpvar(",,,", "foo");
         ok(!test, "Malformed string 8");
 
-        test=np_extract_ntpvar("===", "foo");
+        test = np_extract_ntpvar("===", "foo");
         ok(!test, "Malformed string 9");
 
-        test=np_extract_ntpvar(",=,=,", "foo");
+        test = np_extract_ntpvar(",=,=,", "foo");
         ok(!test, "Malformed string 10");
 
-        test=np_extract_ntpvar("=,=,=", "foo");
+        test = np_extract_ntpvar("=,=,=", "foo");
         ok(!test, "Malformed string 11");
 
-        test=np_extract_ntpvar("  foo=bar  ,\n bar=foo\n , foobar=barfoo  \n  ", "foo");
+        test = np_extract_ntpvar("  foo=bar  ,\n bar=foo\n , foobar=barfoo  \n  ", "foo");
         ok(test && !strcmp(test, "bar"), "Random spaces and newlines 1");
         free(test);
 
-        test=np_extract_ntpvar("  foo=bar  ,\n bar=foo\n , foobar=barfoo  \n  ", "bar");
+        test = np_extract_ntpvar("  foo=bar  ,\n bar=foo\n , foobar=barfoo  \n  ", "bar");
         ok(test && !strcmp(test, "foo"), "Random spaces and newlines 2");
         free(test);
 
-        test=np_extract_ntpvar("  foo=bar  ,\n bar=foo\n , foobar=barfoo  \n  ", "foobar");
+        test = np_extract_ntpvar("  foo=bar  ,\n bar=foo\n , foobar=barfoo  \n  ", "foobar");
         ok(test && !strcmp(test, "barfoo"), "Random spaces and newlines 3");
         free(test);
 
-        test=np_extract_ntpvar("  foo=bar  ,\n bar\n \n= \n foo\n , foobar=barfoo  \n  ", "bar");
+        test = np_extract_ntpvar("  foo=bar  ,\n bar\n \n= \n foo\n , foobar=barfoo  \n  ", "bar");
         ok(test && !strcmp(test, "foo"), "Random spaces and newlines 4");
         free(test);
 
-        test=np_extract_ntpvar("", "foo");
+        test = np_extract_ntpvar("", "foo");
         ok(!test, "Empty string return NULL");
 
-
-        /* This is the result of running ./test_utils */
-        temp_string = (char *) _np_state_generate_key();
-        ok(!strcmp(temp_string, "e2d17f995fd4c020411b85e3e3d0ff7306d4147e"), "Got hash with exe and no parameters" ) ||
-        diag( "You are probably running in wrong directory. Must run as ./test_utils" );
-
-
-        this_monitoring_plugin->argc=4;
-        this_monitoring_plugin->argv[0] = "./test_utils";
-        this_monitoring_plugin->argv[1] = "here";
-        this_monitoring_plugin->argv[2] = "--and";
-        this_monitoring_plugin->argv[3] = "now";
-        temp_string = (char *) _np_state_generate_key();
-        ok(!strcmp(temp_string, "bd72da9f78ff1419fad921ea5e43ce56508aef6c"), "Got based on expected argv" );
-
-        unsetenv("MP_STATE_PATH");
-        temp_string = (char *) _np_state_calculate_location_prefix();
-        ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory" );
-
-        setenv("MP_STATE_PATH", "", 1);
-        temp_string = (char *) _np_state_calculate_location_prefix();
-        ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory even with empty string" );
-
-        setenv("MP_STATE_PATH", "/usr/local/nagios/var", 1);
-        temp_string = (char *) _np_state_calculate_location_prefix();
-        ok(!strcmp(temp_string, "/usr/local/nagios/var"), "Got default directory" );
-
-
-
-        ok(temp_state_key==NULL, "temp_state_key initially empty");
-
-        this_monitoring_plugin->argc=1;
-        this_monitoring_plugin->argv[0] = "./test_utils";
-        np_enable_state(NULL, 51);
-        temp_state_key = this_monitoring_plugin->state;
-        ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" );
-        ok( !strcmp(temp_state_key->name, "e2d17f995fd4c020411b85e3e3d0ff7306d4147e"), "Got generated filename" );
-
-
-        np_enable_state("allowedchars_in_keyname", 77);
-        temp_state_key = this_monitoring_plugin->state;
-        sprintf(state_path, "/usr/local/nagios/var/%lu/check_test/allowedchars_in_keyname", (unsigned long)geteuid());
-        ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" );
-        ok( !strcmp(temp_state_key->name, "allowedchars_in_keyname"), "Got key name with valid chars" );
-        ok( !strcmp(temp_state_key->_filename, state_path), "Got internal filename" );
-
-
-        /* Don't do this test just yet. Will die */
-        /*
-        np_enable_state("bad^chars$in@here", 77);
-        temp_state_key = this_monitoring_plugin->state;
-        ok( !strcmp(temp_state_key->name, "bad_chars_in_here"), "Got key name with bad chars replaced" );
-        */
-
-        np_enable_state("funnykeyname", 54);
-        temp_state_key = this_monitoring_plugin->state;
-        sprintf(state_path, "/usr/local/nagios/var/%lu/check_test/funnykeyname", (unsigned long)geteuid());
-        ok( !strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name" );
-        ok( !strcmp(temp_state_key->name, "funnykeyname"), "Got key name" );
-
-
-
-        ok( !strcmp(temp_state_key->_filename, state_path), "Got internal filename" );
-        ok( temp_state_key->data_version==54, "Version set" );
-
-        temp_state_data = np_state_read();
-        ok( temp_state_data==NULL, "Got no state data as file does not exist" );
-
-
-/*
-        temp_fp = fopen("var/statefile", "r");
-        if (temp_fp==NULL)
-                printf("Error opening. errno=%d\n", errno);
-        printf("temp_fp=%s\n", temp_fp);
-        ok( _np_state_read_file(temp_fp) == true, "Can read state file" );
-        fclose(temp_fp);
-*/
-
-        temp_state_key->_filename="var/statefile";
-        temp_state_data = np_state_read();
-        ok( this_monitoring_plugin->state->state_data!=NULL, "Got state data now" ) || diag("Are you running in right directory? Will get coredump next if not");
-        ok( this_monitoring_plugin->state->state_data->time==1234567890, "Got time" );
-        ok( !strcmp((char *)this_monitoring_plugin->state->state_data->data, "String to read"), "Data as expected" );
-
-        temp_state_key->data_version=53;
-        temp_state_data = np_state_read();
-        ok( temp_state_data==NULL, "Older data version gives NULL" );
-        temp_state_key->data_version=54;
-
-        temp_state_key->_filename="var/nonexistent";
-        temp_state_data = np_state_read();
-        ok( temp_state_data==NULL, "Missing file gives NULL" );
-        ok( this_monitoring_plugin->state->state_data==NULL, "No state information" );
-
-        temp_state_key->_filename="var/oldformat";
-        temp_state_data = np_state_read();
-        ok( temp_state_data==NULL, "Old file format gives NULL" );
-
-        temp_state_key->_filename="var/baddate";
-        temp_state_data = np_state_read();
-        ok( temp_state_data==NULL, "Bad date gives NULL" );
-
-        temp_state_key->_filename="var/missingdataline";
-        temp_state_data = np_state_read();
-        ok( temp_state_data==NULL, "Missing data line gives NULL" );
-
-
-
-
-        unlink("var/generated");
-        temp_state_key->_filename="var/generated";
-        current_time=1234567890;
-        np_state_write_string(current_time, "String to read");
-        ok(system("cmp var/generated var/statefile")==0, "Generated file same as expected");
-
-
-
-
-        unlink("var/generated_directory/statefile");
-        unlink("var/generated_directory");
-        temp_state_key->_filename="var/generated_directory/statefile";
-        current_time=1234567890;
-        np_state_write_string(current_time, "String to read");
-        ok(system("cmp var/generated_directory/statefile var/statefile")==0, "Have created directory");
-
-        /* This test to check cannot write to dir - can't automate yet */
-        /*
-        unlink("var/generated_bad_dir");
-        mkdir("var/generated_bad_dir", S_IRUSR);
-        np_state_write_string(current_time, "String to read");
-        */
-
-
-        temp_state_key->_filename="var/generated";
-        time(&current_time);
-        np_state_write_string(0, "String to read");
-        temp_state_data = np_state_read();
-        /* Check time is set to current_time */
-        ok(system("cmp var/generated var/statefile > /dev/null")!=0, "Generated file should be different this time");
-        ok(this_monitoring_plugin->state->state_data->time-current_time<=1, "Has time generated from current time");
-
-
-        /* Don't know how to automatically test this. Need to be able to redefine die and catch the error */
-        /*
-        temp_state_key->_filename="/dev/do/not/expect/to/be/able/to/write";
-        np_state_write_string(0, "Bad file");
-        */
-
-
-        np_cleanup();
-
-        ok(this_monitoring_plugin==NULL, "Free'd this_monitoring_plugin");
-
         ok(mp_suid() == false, "Test aren't suid");
 
         /* base states with random case */
-        char *states[] = {
-                "Ok",
-                "wArnINg",
-                "cRiTIcaL",
-                "UnKNoWN",
-                NULL
-        };
-
-        for (i=0; states[i]!=NULL; i++) {
-                /* out of the random case states, create the lower and upper versions + numeric string one */
+        char *states[] = {"Ok", "wArnINg", "cRiTIcaL", "UnKNoWN", NULL};
+
+        for (int i = 0; states[i] != NULL; i++) {
+                /* out of the random case states, create the lower and upper versions + numeric string one
+                 */
                 char *statelower = strdup(states[i]);
                 char *stateupper = strdup(states[i]);
                 char statenum[2];
-                char *temp_ptr;
-                for (temp_ptr = statelower; *temp_ptr; temp_ptr++) {
-                        *temp_ptr = tolower(*temp_ptr);
+                for (char *temp_ptr = statelower; *temp_ptr; temp_ptr++) {
+                        *temp_ptr = (char)tolower(*temp_ptr);
                 }
-                for (temp_ptr = stateupper; *temp_ptr; temp_ptr++) {
-                        *temp_ptr = toupper(*temp_ptr);
+                for (char *temp_ptr = stateupper; *temp_ptr; temp_ptr++) {
+                        *temp_ptr = (char)toupper(*temp_ptr);
                 }
                 snprintf(statenum, 2, "%i", i);
 
                 /* Base test names, we'll append the state string */
                 char testname[64] = "Translate state string: ";
-                int tlen = strlen(testname);
+                size_t tlen = strlen(testname);
 
-                strcpy(testname+tlen, states[i]);
-                ok(i==mp_translate_state(states[i]), testname);
+                strcpy(testname + tlen, states[i]);
+                ok(i == mp_translate_state(states[i]), testname);
 
-                strcpy(testname+tlen, statelower);
-                ok(i==mp_translate_state(statelower), testname);
+                strcpy(testname + tlen, statelower);
+                ok(i == mp_translate_state(statelower), testname);
 
-                strcpy(testname+tlen, stateupper);
-                ok(i==mp_translate_state(stateupper), testname);
+                strcpy(testname + tlen, stateupper);
+                ok(i == mp_translate_state(stateupper), testname);
 
-                strcpy(testname+tlen, statenum);
-                ok(i==mp_translate_state(statenum), testname);
+                strcpy(testname + tlen, statenum);
+                ok(i == mp_translate_state(statenum), testname);
         }
-        ok(ERROR==mp_translate_state("warningfewgw"), "Translate state string with garbage");
-        ok(ERROR==mp_translate_state("00"), "Translate state string: bad numeric string 1");
-        ok(ERROR==mp_translate_state("01"), "Translate state string: bad numeric string 2");
-        ok(ERROR==mp_translate_state("10"), "Translate state string: bad numeric string 3");
-        ok(ERROR==mp_translate_state(""), "Translate state string: empty string");
+        ok(ERROR == mp_translate_state("warningfewgw"), "Translate state string with garbage");
+        ok(ERROR == mp_translate_state("00"), "Translate state string: bad numeric string 1");
+        ok(ERROR == mp_translate_state("01"), "Translate state string: bad numeric string 2");
+        ok(ERROR == mp_translate_state("10"), "Translate state string: bad numeric string 3");
+        ok(ERROR == mp_translate_state(""), "Translate state string: empty string");
 
         return exit_status();
 }