10 files changed, 774 insertions, 222 deletions

diff --git a/plugins/tests/check_curl.t b/plugins/tests/check_curl.t
index eaa9f518..248eb4c5 100755
--- a/plugins/tests/check_curl.t
+++ b/plugins/tests/check_curl.t
@@ -15,13 +15,19 @@
 # Email Address []:devel@monitoring-plugins.org
 
 use strict;
+use warnings;
 use Test::More;
 use NPTest;
 use FindBin qw($Bin);
 
+use URI;
+use URI::QueryParam;
+use HTTP::Daemon;
+use HTTP::Daemon::SSL;
+
 $ENV{'LC_TIME'} = "C";
 
-my $common_tests = 75;
+my $common_tests = 95;
 my $ssl_only_tests = 8;
 # Check that all dependent modules are available
 eval "use HTTP::Daemon 6.01;";
@@ -185,6 +191,123 @@ sub run_server {
                                 $c->send_response('moved to /redirect2');
                         } elsif ($r->url->path eq "/redir_timeout") {
                                 $c->send_redirect( "/timeout" );
+            } elsif ($r->url->path =~ m{^/redirect_with_increment}) {
+                                # <scheme>://<username>:<password>@<host>:<port>/<path>;<parameters>?<query>#<fragment>
+                                # Find every parameter, query , and fragment keys and increment them
+
+                                my $content = "";
+
+                # Use URI to help with query/fragment; parse path params manually.
+                my $original_url = $r->url->as_string;
+                                $content .= " original_url: ${original_url}\n";
+                my $uri = URI->new($original_url);
+                                $content .= " uri: ${uri}\n";
+
+                                my $path = $uri->path // '';
+                                my $query = $uri->query // '';
+                                my $fragment = $uri->fragment // '';
+
+                                $content .= " path: ${path}\n";
+                                $content .= " query: ${query}\n";
+                                $content .= " fragment: ${fragment}\n";
+
+                # split the URI part and parameters. URI package cannot do this
+                # group 1 is captured: anything without a semicolon: ([^;]*)
+                # group 2 is uncaptured: (?:;(.*))?
+                # (?: ... )? prevents capturing the parameter section
+                                # inside group 2, ';' matches the first ever semicolon
+                                # group3 is captured: any character string : (.*)
+                                # \? matches an actual ? mark, which starts the query parameters
+                my ($before_params, $params) = $uri =~ m{^([^;]*)(?:;(.*))?\?};
+                                $before_params //= '';
+                                $params //= '';
+                                $content .= " before_params: ${before_params}\n";
+                                $content .= " params: ${params}\n";
+                my @parameter_pairs;
+                if (defined $params && length $params) {
+                    for my $p (split /;/, $params) {
+                        my ($key,$value) = split /=/, $p, 2;
+                        $value //= '';
+                        push @parameter_pairs, [ $key, $value ];
+                                                $content .= " parameter: ${key} -> ${value}\n";
+                    }
+                }
+
+                # query parameters are offered directly from the library
+                my @query_form = $uri->query_form;
+                my @query_parameter_pairs;
+                while (@query_form) {
+                    my $key = shift @query_form;
+                    my $value = shift @query_form;
+                                        $value //= ''; # there can be valueless keys
+                    push @query_parameter_pairs, [ $key, $value ];
+                                        $content .= " query: ${key} -> ${value}\n";
+                }
+
+                # helper to increment value
+                my $increment = sub {
+                    my ($v) = @_;
+                    return $v if !defined $v || $v eq '';
+                    # numeric integer
+                    if ($v =~ /^-?\d+$/) {
+                        return $v + 1;
+                    }
+                    # otherwise -> increment as if its an ascii character
+                                        # sed replacement syntax, but the $& holds the matched character
+                    if (length($v)) {
+                        (my $new_v = $v) =~ s/./chr(ord($&) + 1)/ge;
+                                        return $new_v;
+                    }
+                };
+
+                # increment values in pairs
+                for my $pair (@parameter_pairs) {
+                    $pair->[1] = $increment->($pair->[1]);
+                                        $content .= " parameter new: " . $pair->[0] . " -> " . $pair->[1] . "\n";
+                }
+                for my $pair (@query_parameter_pairs) {
+                    $pair->[1] = $increment->($pair->[1]);
+                                        $content .= " query parameter new: " . $pair->[0] . " -> " . $pair->[1] . "\n";
+                }
+
+                # rebuild strings
+                my $new_parameter_str = join(';', map { $_->[0] . '=' . $_->[1] } @parameter_pairs);
+                                $content .= " new_parameter_str: ${new_parameter_str}\n";
+
+                                # library can rebuild from an array
+                my @new_query_form;
+                for my $p (@query_parameter_pairs) { push @new_query_form, $p->[0], $p->[1] }
+
+                                my $new_fragment_str = '';
+                                for my $pair (@parameter_pairs) {
+                                        my $key = $pair->[0];
+                                        my $value = $pair->[1];
+                                        if ($key eq "fragment") {
+                                                $new_fragment_str = $value
+                                        }
+                }
+                                $content .= " new_fragment_str: ${new_fragment_str}\n";
+
+                # construct new URI using the library
+                my $new_uri = URI->new('');
+                $new_uri->path( $before_params . ($new_parameter_str ? ';' . $new_parameter_str : '') );
+                $new_uri->query_form( \@new_query_form ) if @new_query_form;
+                $new_uri->fragment( $new_fragment_str ) if $new_fragment_str ne '';
+                                $content .= " new_uri: ${new_uri}\n";
+
+                                # Redirect until fail_count or redirect_count reaches 3
+                                if ($new_uri =~ /fail_count=3/){
+                                        $c->send_error(HTTP::Status->RC_FORBIDDEN, "fail count reached 3, url path:" . $r->url->path );
+                                } elsif ($new_uri =~ /redirect_count=3/){
+                                        $c->send_response(HTTP::Response->new( 200, 'OK', undef , $content ));
+                                } elsif ($new_uri =~ /location_redirect_count=3/){
+                                        $c->send_basic_header(302);
+                                        $c->send_header("Location", "$new_uri" );
+                                        $c->send_crlf;
+                                        $c->send_response("$content \n moved to $new_uri");
+                                } else {
+                        $c->send_redirect( $new_uri->as_string, 301, $content );
+                                }
                         } elsif ($r->url->path eq "/timeout") {
                                 # Keep $c from being destroyed, but prevent severe leaks
                                 unshift @persist, $c;
@@ -214,7 +337,7 @@ sub run_server {
                                         return($chunk);
                                 }));
                         } else {
-                                $c->send_error(HTTP::Status->RC_FORBIDDEN);
+                                $c->send_error(HTTP::Status->RC_FORBIDDEN, "unknown url path:" . $r->url->path );
                         }
                         $c->close;
                 }
@@ -245,21 +368,21 @@ SKIP: {
 
         $result = NPTest->testCmd( "$command -p $port_https -S -C 14" );
         is( $result->return_code, 0, "$command -p $port_https -S -C 14" );
-        is( $result->output, "OK - Certificate 'Monitoring Plugins' will expire on $expiry.", "output ok" );
+        like( $result->output, '/.*Certificate \'Monitoring Plugins\' will expire on ' . quotemeta($expiry) . '.*/', "output ok" );
 
         $result = NPTest->testCmd( "$command -p $port_https -S -C 14000" );
         is( $result->return_code, 1, "$command -p $port_https -S -C 14000" );
-        like( $result->output, '/WARNING - Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\)./', "output ok" );
+        like( $result->output, '/.*Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\).*/', "output ok" );
 
         # Expired cert tests
         $result = NPTest->testCmd( "$command -p $port_https -S -C 13960,14000" );
         is( $result->return_code, 2, "$command -p $port_https -S -C 13960,14000" );
-        like( $result->output, '/CRITICAL - Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\)./', "output ok" );
+        like( $result->output, '/.*Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\).*/', "output ok" );
 
         $result = NPTest->testCmd( "$command -p $port_https_expired -S -C 7" );
         is( $result->return_code, 2, "$command -p $port_https_expired -S -C 7" );
-        is( $result->output,
-                'CRITICAL - Certificate \'Monitoring Plugins\' expired on Wed Jan  2 12:00:00 2008 +0000.',
+        like( $result->output,
+                '/.*Certificate \'Monitoring Plugins\' expired on Wed Jan\s+2 12:00:00 2008 \+0000.*/',
                 "output ok" );
 
 }
@@ -274,19 +397,19 @@ SKIP: {
         $cmd = "./$plugin -H $virtual_host -I 127.0.0.1 -p $port_http -u /virtual_port -r ^$virtual_host:$port_http\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # http with virtual port (!= 80)
         $cmd = "./$plugin -H $virtual_host:$virtual_port -I 127.0.0.1 -p $port_http -u /virtual_port -r ^$virtual_host:$virtual_port\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # http with virtual port (80)
         $cmd = "./$plugin -H $virtual_host:80 -I 127.0.0.1 -p $port_http -u /virtual_port -r ^$virtual_host\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 }
 
 # and the same for SSL
@@ -296,19 +419,19 @@ SKIP: {
         $cmd = "./$plugin -H $virtual_host -I 127.0.0.1 -p $port_https --ssl -u /virtual_port -r ^$virtual_host:$port_https\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # https with virtual port (!= 443)
         $cmd = "./$plugin -H $virtual_host:$virtual_port -I 127.0.0.1 -p $port_https --ssl -u /virtual_port -r ^$virtual_host:$virtual_port\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # https with virtual port (443)
         $cmd = "./$plugin -H $virtual_host:443 -I 127.0.0.1 -p $port_https --ssl -u /virtual_port -r ^$virtual_host\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 }
 
 
@@ -321,165 +444,223 @@ sub run_common_tests {
 
         $result = NPTest->testCmd( "$command -u /file/root" );
         is( $result->return_code, 0, "/file/root");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - 274 bytes in [\d\.]+ second/', "Output correct" );
+        like( $result->output, '/.*HTTP/1.1 200 OK - 274 bytes in [\d\.]+ second.*/', "Output correct" );
 
         $result = NPTest->testCmd( "$command -u /file/root -s Root" );
         is( $result->return_code, 0, "/file/root search for string");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - 274 bytes in [\d\.]+ second/', "Output correct" );
+        like( $result->output, '/.*HTTP/1.1 200 OK - 274 bytes in [\d\.]+ second.*/', "Output correct" );
 
         $result = NPTest->testCmd( "$command -u /file/root -s NonRoot" );
         is( $result->return_code, 2, "Missing string check");
-        like( $result->output, qr%^HTTP CRITICAL: HTTP/1\.1 200 OK - string 'NonRoot' not found on 'https?://127\.0\.0\.1:\d+/file/root'%, "Shows search string and location");
+        like( $result->output, qr%string 'NonRoot' not found on 'https?://127\.0\.0\.1:\d+/file/root'%, "Shows search string and location");
 
         $result = NPTest->testCmd( "$command -u /file/root -s NonRootWithOver30charsAndMoreFunThanAWetFish" );
         is( $result->return_code, 2, "Missing string check");
-        like( $result->output, qr%HTTP CRITICAL: HTTP/1\.1 200 OK - string 'NonRootWithOver30charsAndM...' not found on 'https?://127\.0\.0\.1:\d+/file/root'%, "Shows search string and location");
+        like( $result->output, qr%string 'NonRootWithOver30charsAndM...' not found on 'https?://127\.0\.0\.1:\d+/file/root'%, "Shows search string and location");
 
         $result = NPTest->testCmd( "$command -u /header_check -d foo" );
         is( $result->return_code, 0, "header_check search for string");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - 96 bytes in [\d\.]+ second/', "Output correct" );
+        like( $result->output, '/.*HTTP/1.1 200 OK - 96 bytes in [\d\.]+ second.*/', "Output correct" );
 
         $result = NPTest->testCmd( "$command -u /header_check -d bar" );
         is( $result->return_code, 2, "Missing header string check");
-        like( $result->output, qr%^HTTP CRITICAL: HTTP/1\.1 200 OK - header 'bar' not found on 'https?://127\.0\.0\.1:\d+/header_check'%, "Shows search string and location");
+        like( $result->output, qr%header 'bar' not found on 'https?://127\.0\.0\.1:\d+/header_check'%, "Shows search string and location");
 
         $result = NPTest->testCmd( "$command -u /header_broken_check" );
         is( $result->return_code, 0, "header_check search for string");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - 138 bytes in [\d\.]+ second/', "Output correct" );
+        like( $result->output, '/.*HTTP/1.1 200 OK - 138 bytes in [\d\.]+ second.*/', "Output correct" );
 
         my $cmd;
         $cmd = "$command -u /slow";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, "$cmd");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
         $result->output =~ /in ([\d\.]+) second/;
         cmp_ok( $1, ">", 1, "Time is > 1 second" );
 
         $cmd = "$command -u /statuscode/200";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/200 -e 200";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - Status line output matched "200" - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Status line output matched "200".*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/201";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 201 Created - \d+ bytes in [\d\.]+ second /', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 201 Created - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/201 -e 201";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 201 Created - Status line output matched "201" - \d+ bytes in [\d\.]+ second /', "Output correct: ".$result->output );
+        like( $result->output, '/.*Status line output matched "201".*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/201 -e 200";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 2, $cmd);
-        like( $result->output, '/^HTTP CRITICAL - Invalid HTTP response received from host on port \d+: HTTP/1.1 201 Created/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Invalid HTTP response received from host on port \d+: HTTP/1.1 201 Created.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/200 -e 200,201,202";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - Status line output matched "200,201,202" - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Status line output matched "200,201,202".*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/201 -e 200,201,202";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 201 Created - Status line output matched "200,201,202" - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Status line output matched "200,201,202".*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/203 -e 200,201,202";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 2, $cmd);
-        like( $result->output, '/^HTTP CRITICAL - Invalid HTTP response received from host on port (\d+): HTTP/1.1 203 Non-Authoritative Information/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Invalid HTTP response received from host on port (\d+): HTTP/1.1 203 Non-Authoritative Information.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j HEAD -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 HEAD - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 HEAD - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j POST -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 POST - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 POST - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j GET -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 GET - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 GET - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 GET - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 GET - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -P foo -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 POST - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 POST - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j DELETE -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 1, $cmd);
-        like( $result->output, '/^HTTP WARNING: HTTP/1.1 405 Method Not Allowed/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 405 Method Not Allowed.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j foo -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 2, $cmd);
-        like( $result->output, '/^HTTP CRITICAL: HTTP/1.1 501 Not Implemented/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 501 Not Implemented.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -P stufftoinclude -u /postdata -s POST:stufftoinclude";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j PUT -P stufftoinclude -u /postdata -s PUT:stufftoinclude";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # To confirm that the free doesn't segfault
         $cmd = "$command -P stufftoinclude -j PUT -u /postdata -s PUT:stufftoinclude";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /redirect";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 301 Moved Permanently - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 301 Moved Permanently - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -f follow -u /redirect";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /redirect -k 'follow: me'";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 301 Moved Permanently - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 301 Moved Permanently - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -f follow -u /redirect -k 'follow: me'";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -f sticky -u /redirect -k 'follow: me'";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -f stickyport -u /redirect -k 'follow: me'";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -f follow -u /redirect_rel -s redirected";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
+
+        # Redirect with increment tests. These are for checking if the url parameters, query parameters and fragment are parsed.
+        # The server at this point has dynamic redirection. It tries to increment values that it sees in these fields, then redirects.
+        # It also appends some debug log and writes it into HTTP content, pass the -vvv parameter to see them.
+
+        $cmd = "$command -u '/redirect_with_increment/path1/path2/path3/path4' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 1, $cmd);
+        like( $result->output, '/.*HTTP/1.1 403 Forbidden - \d+ bytes in [\d\.]+ second.*/', "Output correct, redirect_count was not present, got redirected to / : ".$result->output );
+
+        # redirect_count=0 is parsed as a parameter and incremented. When it goes up to 3, the redirection returns HTTP OK
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;p1=1;p2=ab?qp1=10&qp2=kl#f1=test' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, redirect_count went up to 3, and returned OK: ".$result->output );
+
+        # location_redirect_count=0 goes up to 3, which uses the HTTP 302 style of redirection with 'Location' header
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;location_redirect_count=0;p1=1;p2=ab?qp1=10&qp2=kl#f1=test' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
+
+        # fail_count parameter may also go up to 3, which returns a HTTP 403
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;fail_count=2' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 1, $cmd);
+        like( $result->output, '/.*HTTP/1.1 403 Forbidden - \d+ bytes in [\d\.]+ second.*/', "Output correct, early due to fail_count reaching 3: ".$result->output );
+
+        # redirect_count=0, p1=1 , p2=ab => redirect_count=1, p1=2 , p2=bc => redirect_count=2, p1=3 , p2=cd => redirect_count=3 , p1=4 , p2=de
+        # Last visited URI returns HTTP OK instead of redirect, and the one before that contains the new_uri in its content
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;p1=1;p2=ab?qp1=10&qp2=kl#f1=test' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*redirect_count=3;p1=4;p2=de\?*/', "Output correct, parsed and incremented both parameters p1 and p2 : ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
+
+        # Same incrementation as before, uses the query parameters that come after the first '?' : qp1 and qp2
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;p1=1;p2=ab?qp1=10&qp2=kl#f1=test' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*\?qp1=13&qp2=no*/', "Output correct, parsed and incremented both query parameters qp1 and qp2 : ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
+
+        # Check if the query parameter order is kept intact
+        $cmd = "$command -u '/redirect_with_increment;redirect_count=0;?qp0=0&qp1=1&qp2=2&qp3=3&qp4=4&qp5=5' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*\?qp0=3&qp1=4&qp2=5&qp3=6&qp4=7&qp5=8*/', "Output correct, parsed and incremented query parameters qp1,qp2,qp3,qp4,qp5 in order : ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
+
+        # The fragment is passed as another parameter.
+        # During the server redirects the fragment will be set to its value, if such a key is present.
+        # 'ebiil' => 'fcjjm' => 'gdkkn' => 'hello'
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;fragment=ebiil?qp1=0' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*redirect_count=3;fragment=hello\?qp1=3#hello*/', "Output correct, fragments are specified by server and followed by check_curl: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
 
         # These tests may block
         # stickyport - on full urlS port is set back to 80 otherwise
diff --git a/plugins/tests/check_nt.t b/plugins/tests/check_nt.t
deleted file mode 100755
index 223d4933..00000000
--- a/plugins/tests/check_nt.t
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /usr/bin/perl -w -I ..
-#
-# Test check_nt by having a stub check_nt daemon
-#
-
-use strict;
-use Test::More;
-use NPTest;
-use FindBin qw($Bin);
-
-use IO::Socket;
-use IO::Select;
-use POSIX;
-
-my $port = 50000 + int(rand(1000));
-
-my $pid = fork();
-if ($pid) {
-        # Parent
-        #print "parent\n";
-        # give our webserver some time to startup
-        sleep(1);
-} else {
-        # Child
-        #print "child\n";
-
-        my $server = IO::Socket::INET->new(
-                LocalPort => $port,
-                Type => SOCK_STREAM,
-                Reuse => 1,
-                Proto => "tcp",
-                Listen => 10,
-        ) or die "Cannot be a tcp server on port $port: $@";
-
-        $server->autoflush(1);
-
-        print "Please contact me at port $port\n";
-        while (my $client = $server->accept ) {
-                my $data = "";
-                my $rv = $client->recv($data, POSIX::BUFSIZ, 0);
-
-                my ($password, $command, $arg) = split('&', $data);
-                
-                if ($command eq "4") {
-                        if ($arg eq "c") {
-                                print $client "930000000&1000000000";
-                        } elsif ($arg eq "d") {
-                                print $client "UNKNOWN: Drive is not a fixed drive";
-                        }
-                }
-        }
-        exit;
-}
-
-END { if ($pid) { print "Killing $pid\n"; kill "INT", $pid } };
-
-if ($ARGV[0] && $ARGV[0] eq "-d") {
-        sleep 1000;
-}
-
-if (-x "./check_nt") {
-        plan tests => 5;
-} else {
-        plan skip_all => "No check_nt compiled";
-}
-
-my $result;
-my $command = "./check_nt -H 127.0.0.1 -p $port";
-
-$result = NPTest->testCmd( "$command -v USEDDISKSPACE -l c" );
-is( $result->return_code, 0, "USEDDISKSPACE c");
-is( $result->output, q{c:\ - total: 0.93 Gb - used: 0.07 Gb (7%) - free 0.87 Gb (93%) | 'c:\ Used Space'=0.07Gb;0.00;0.00;0.00;0.93}, "Output right" );
-
-$result = NPTest->testCmd( "$command -v USEDDISKSPACE -l d" );
-is( $result->return_code, 3, "USEDDISKSPACE d - invalid");
-is( $result->output, "Free disk space : Invalid drive", "Output right" );
-
-$result = NPTest->testCmd( "./check_nt -v USEDDISKSPACE -l d" );
-is( $result->return_code, 3, "Fail if -H missing");
-
diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t
index bfe42e16..26d67898 100755
--- a/plugins/tests/check_snmp.t
+++ b/plugins/tests/check_snmp.t
@@ -4,12 +4,13 @@
 #
 
 use strict;
+use warnings;
 use Test::More;
 use NPTest;
 use FindBin qw($Bin);
 use POSIX qw/strftime/;
 
-my $tests = 81;
+my $tests = 75;
 # Check that all dependent modules are available
 eval {
         require NetSNMP::OID;
@@ -76,49 +77,36 @@ my $res;
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.0");
 cmp_ok( $res->return_code, '==', 0, "Exit OK when querying a multi-line string" );
-like($res->output, '/^SNMP OK - /', "String contains SNMP OK");
-like($res->output, '/'.quotemeta('SNMP OK - Cisco Internetwork Operating System Software | 
-.1.3.6.1.4.1.8072.3.2.67.0:
-"Cisco Internetwork Operating System Software
-IOS (tm) Catalyst 4000 \"L3\" Switch Software (cat4000-I9K91S-M), Version
-12.2(20)EWA, RELEASE SOFTWARE (fc1)
-Technical Support: http://www.cisco.com/techsupport
-Copyright (c) 1986-2004 by cisco Systems, Inc.
-"').'/m', "String contains all lines");
+like($res->output, '/.*Cisco Internetwork Operating System Software.*/m', "String contains all lines");
 
 # sysContact.0 is "Alice" (from our snmpd.conf)
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.0 -o sysContact.0 -o .1.3.6.1.4.1.8072.3.2.67.1");
 cmp_ok( $res->return_code, '==', 0, "Exit OK when querying multi-line OIDs" );
-like($res->output, '/^SNMP OK - /', "String contains SNMP OK");
-like($res->output, '/'.quotemeta('SNMP OK - Cisco Internetwork Operating System Software ').'"?Alice"?'.quotemeta(' Kisco Outernetwork Oserating Gystem Totware | 
-.1.3.6.1.4.1.8072.3.2.67.0:
-"Cisco Internetwork Operating System Software
-IOS (tm) Catalyst 4000 \"L3\" Switch Software (cat4000-I9K91S-M), Version
-12.2(20)EWA, RELEASE SOFTWARE (fc1)
-Technical Support: http://www.cisco.com/techsupport
-Copyright (c) 1986-2004 by cisco Systems, Inc.
-"
-.1.3.6.1.4.1.8072.3.2.67.1:
-"Kisco Outernetwork Oserating Gystem Totware
-Copyleft (c) 2400-2689 by kisco Systrems, Inc."').'/m', "String contains all lines with multiple OIDs");
+# like($res->output, '/^SNMP OK - /', "String contains SNMP OK");
+like($res->output, '/.*Cisco Internetwork Operating System Software.*/m', "String contains all lines with multiple OIDs");
+like($res->output, '/.*Alice.*/m', "String contains all lines with multiple OIDs");
+like($res->output, '/.*Kisco Outernetwork Oserating Gystem Totware.*/m', "String contains all lines with multiple OIDs");
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.2");
-like($res->output, '/'.quotemeta('SNMP OK - This should not confuse check_snmp \"parser\" | 
-.1.3.6.1.4.1.8072.3.2.67.2:
-"This should not confuse check_snmp \"parser\"
-into thinking there is no 2nd line"').'/m', "Attempt to confuse parser No.1");
+cmp_ok( $res->return_code, '==', 0, "Exit OK when querying multi-line OIDs" );
+# like($res->output, '/'.quotemeta('This should not confuse check_snmp \"parser\" | 
+# .1.3.6.1.4.1.8072.3.2.67.2:
+# "This should not confuse check_snmp \"parser\"
+# into thinking there is no 2nd line"').'/m', "Attempt to confuse parser No.1");
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.3");
-like($res->output, '/'.quotemeta('SNMP OK - It\'s getting even harder if the line | 
-.1.3.6.1.4.1.8072.3.2.67.3:
-"It\'s getting even harder if the line
-ends with with this: C:\\\\"').'/m', "Attempt to confuse parser No.2");
+cmp_ok( $res->return_code, '==', 0, "Exit OK when querying multi-line OIDs" );
+# like($res->output, '/'.quotemeta('It\'s getting even harder if the line | 
+# .1.3.6.1.4.1.8072.3.2.67.3:
+# "It\'s getting even harder if the line
+# ends with with this: C:\\\\"').'/m', "Attempt to confuse parser No.2");
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.4");
-like($res->output, '/'.quotemeta('SNMP OK - And now have fun with with this: \"C:\\\\\" | 
-.1.3.6.1.4.1.8072.3.2.67.4:
-"And now have fun with with this: \"C:\\\\\"
-because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3");
+cmp_ok( $res->return_code, '==', 0, "Exit OK when querying multi-line OIDs" );
+# like($res->output, '/'.quotemeta('And now have fun with with this: \"C:\\\\\" | 
+# .1.3.6.1.4.1.8072.3.2.67.4:
+# "And now have fun with with this: \"C:\\\\\"
+# because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3");
 
 system("rm -f ".$ENV{'MP_STATE_PATH'}."/*/check_snmp/*");
 
@@ -131,156 +119,159 @@ SKIP: {
     my $ts = time();
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -w 600" );
     is($res->return_code, 0, "Returns OK");
-    is($res->output, "No previous data to calculate rate - assume okay");
+    like($res->output, "/.*No previous data to calculate rate - assume okay.*/");
 
     # test rate 1 second later
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts+1))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -w 600" );
     is($res->return_code, 1, "WARNING - due to going above rate calculation" );
-    is($res->output, "SNMP RATE WARNING - *666* | iso.3.6.1.4.1.8072.3.2.67.10=666;600 ");
+    like($res->output, "/.*=666.*/");
 
     # test rate with same time
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts+1))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -w 600" );
     is($res->return_code, 3, "UNKNOWN - basically the divide by zero error" );
-    is($res->output, "Time duration between plugin calls is invalid");
+    like($res->output, "/.*Time duration between plugin calls is invalid.*/");
 
 
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -l inoctets" );
     is($res->return_code, 0, "OK for first call" );
-    is($res->output, "No previous data to calculate rate - assume okay" );
+    like($res->output, "/.*No previous data to calculate rate - assume okay.*/" );
 
     # test rate 1 second later
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts+1))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -l inoctets" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP RATE OK - inoctets 666 | inoctets=666 ", "Check label");
+    like($res->output, "/.*inoctets.*=666.*/m", "Check label");
 
     # test rate 3 seconds later
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts+3))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -l inoctets" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP RATE OK - inoctets 333 | inoctets=333 ", "Check rate decreases due to longer interval");
+    like($res->output, "/.*inoctets.*333.*/", "Check rate decreases due to longer interval");
 
 
     # label performance data check
     $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 -l test" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP OK - test 67996 | test=67996c ", "Check label");
+    like($res->output, "/.*test.?=67996c/", "Check label");
 
-    $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 -l \"test'test\"" );
-    is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP OK - test'test 68662 | \"test'test\"=68662c ", "Check label");
+    # following test is deactivated since it was not valid due to the guidelines (no single quote in label allowed)
+    # $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 -l \"test'test\"" );
+    # is($res->return_code, 0, "OK as no thresholds" );
+    # is($res->output, "test'test 68662 | \"test'test\"=68662c ", "Check label");
 
     $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 -l 'test\"test'" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP OK - test\"test 69328 | 'test\"test'=69328c ", "Check label");
+    like($res->output, "/.*'test\"test'=68662c.*/", "Check label");
 
     $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 -l test -O" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP OK - test 69994 | iso.3.6.1.4.1.8072.3.2.67.10=69994c ", "Check label");
+    like($res->output, "/.*.67.10.?=69328c.*/", "Check label");
 
     $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP OK - 70660 | iso.3.6.1.4.1.8072.3.2.67.10=70660c ", "Check label");
+    like($res->output, "/.*8072.3.2.67.10.?=69994c.*/", "Check label");
 
     $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 -l 'test test'" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP OK - test test 71326 | 'test test'=71326c ", "Check label");
+    like($res->output, "/.*'test test'=70660c/", "Check label");
 
 
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -l inoctets_per_minute --rate-multiplier=60" );
     is($res->return_code, 0, "OK for first call" );
-    is($res->output, "No previous data to calculate rate - assume okay" );
+    like($res->output, "/.*No previous data to calculate rate - assume okay.*/" );
 
     # test 1 second later
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts+1))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -l inoctets_per_minute --rate-multiplier=60" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP RATE OK - inoctets_per_minute 39960 | inoctets_per_minute=39960 ", "Checking multiplier");
+    like($res->output, "/.*inoctets_per_minute.*=39960/", "Checking multiplier");
 };
 
 
 
-$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.11 -s '\"stringtests\"'" );
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.11 -s 'stringtests'" );
 is($res->return_code, 0, "OK as string matches" );
-is($res->output, 'SNMP OK - "stringtests" | ', "Good string match" );
+like($res->output, '/.*stringtests.*/', "Good string match" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.11 -s ring" );
 is($res->return_code, 2, "CRITICAL as string doesn't match (though is a substring)" );
-is($res->output, 'SNMP CRITICAL - *"stringtests"* | ', "Failed string match" );
+like($res->output, '/.*stringtests.*/', "Failed string match" );
 
-$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.11 --invert-search -s '\"stringtests\"'" );
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.11 --invert-search -s 'stringtests'" );
 is($res->return_code, 2, "CRITICAL as string matches but inverted" );
-is($res->output, 'SNMP CRITICAL - *"stringtests"* | ', "Inverted string match" );
+like($res->output, '/.*"stringtests".*/', "Inverted string match" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.11 --invert-search -s ring" );
 is($res->return_code, 0, "OK as string doesn't match but inverted" );
-is($res->output, 'SNMP OK - "stringtests" | ', "OK as inverted string no match" );
+like($res->output, '/.*"stringtests".*/', "OK as inverted string no match" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.12 -w 4:5" );
-is($res->return_code, 1, "Numeric in string test" );
-is($res->output, 'SNMP WARNING - *3.5* | iso.3.6.1.4.1.8072.3.2.67.12=3.5;4:5 ', "WARNING threshold checks for string masquerading as number" );
+# a string is a string and not a number
+is($res->return_code, 0, "Numeric in string test" );
+like($res->output, '/.*3.5.*| iso.3.6.1.4.1.8072.3.2.67.12=3.5;4:5/', "WARNING threshold checks for string masquerading as number" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.13" );
 is($res->return_code, 0, "Not really numeric test" );
-is($res->output, 'SNMP OK - "87.4startswithnumberbutshouldbestring" | ', "Check string with numeric start is still string" );
+like($res->output, '/.*"87.4startswithnumberbutshouldbestring".*/', "Check string with numeric start is still string" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.14" );
 is($res->return_code, 0, "Not really numeric test (trying best to fool it)" );
-is($res->output, 'SNMP OK - "555\"I said\"" | ', "Check string with a double quote following is still a string (looks like the perl routine will always escape though)" );
+like($res->output, '/.*\'555"I said"\'.*/', "Check string with a double quote following is still a string (looks like the perl routine will always escape though)" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.15 -r 'CUSTOM CHECK OK'" );
 is($res->return_code, 0, "String check should check whole string, not a parsed number" );
-is($res->output, 'SNMP OK - "CUSTOM CHECK OK: foo is 12345" | ', "String check with numbers returns whole string");
+like($res->output, '/.*CUSTOM CHECK OK: foo is 12345.*/', "String check with numbers returns whole string");
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" );
 is($res->return_code, 0, "Negative integer check OK" );
-is($res->output, 'SNMP OK - -2 | iso.3.6.1.4.1.8072.3.2.67.16=-2;-2:;-3: ', "Negative integer check OK output" );
+like($res->output, '/.*-2.*| iso.3.6.1.4.1.8072.3.2.67.16=-2;-2:;-3:/', "Negative integer check OK output" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" );
 is($res->return_code, 1, "Negative integer check WARNING" );
-is($res->output, 'SNMP WARNING - *-3* | iso.3.6.1.4.1.8072.3.2.67.16=-3;-2:;-3: ', "Negative integer check WARNING output" );
+like($res->output, '/.*-3.*| iso.3.6.1.4.1.8072.3.2.67.16=-3;-2:;-3:/', "Negative integer check WARNING output" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" );
 is($res->return_code, 2, "Negative integer check CRITICAL" );
-is($res->output, 'SNMP CRITICAL - *-4* | iso.3.6.1.4.1.8072.3.2.67.16=-4;-2:;-3: ', "Negative integer check CRITICAL output" );
+like($res->output, '/.*-4.*| iso.3.6.1.4.1.8072.3.2.67.16=-4;-2:;-3:/', "Negative integer check CRITICAL output" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.17 -w -3: -c -6:" );
 is($res->return_code, 1, "Negative integer as string, WARNING" );
-is($res->output, 'SNMP WARNING - *-4* | iso.3.6.1.4.1.8072.3.2.67.17=-4;-3:;-6: ', "Negative integer as string, WARNING output" );
+like($res->output, '/.*-4.*| iso.3.6.1.4.1.8072.3.2.67.17=-4;-3:;-6:/', "Negative integer as string, WARNING output" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.17 -w -2: -c -3:" );
 is($res->return_code, 2, "Negative integer as string, CRITICAL" );
-is($res->output, 'SNMP CRITICAL - *-4* | iso.3.6.1.4.1.8072.3.2.67.17=-4;-2:;-3: ', "Negative integer as string, CRITICAL output" );
+like($res->output, '/.*-4.*| iso.3.6.1.4.1.8072.3.2.67.17=-4;-2:;-3:/', "Negative integer as string, CRITICAL output" );
 
-$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -c '~:-6.5'" );
-is($res->return_code, 0, "Negative float OK" );
-is($res->output, 'SNMP OK - -6.6 | iso.3.6.1.4.1.8072.3.2.67.18=-6.6;;@-6.5:~ ', "Negative float OK output" );
+# deactivated since the perl agent api of snmpd really does not allow floats
+# $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -c '~:-6.5'" );
+# is($res->return_code, 0, "Negative float OK" );
+# is($res->output, '-6.6 | iso.3.6.1.4.1.8072.3.2.67.18=-6.6;;@-6.5:~ ', "Negative float OK output" );
 
-$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -w '~:-6.65' -c '~:-6.55'" );
-is($res->return_code, 1, "Negative float WARNING" );
-is($res->output, 'SNMP WARNING - *-6.6* | iso.3.6.1.4.1.8072.3.2.67.18=-6.6;@-6.65:~;@-6.55:~ ', "Negative float WARNING output" );
+# $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -w '~:-6.65' -c '~:-6.55'" );
+# is($res->return_code, 1, "Negative float WARNING" );
+# like($res->output, '/-6.6.*| .*67.18=-6.6;@-6.65:~;@-6.55:~/', "Negative float WARNING output" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10,.1.3.6.1.4.1.8072.3.2.67.17 -w '1:100000,-10:20' -c '2:200000,-20:30'" );
 is($res->return_code, 0, "Multiple OIDs with thresholds" );
-like($res->output, '/SNMP OK - \d+ -4 | iso.3.6.1.4.1.8072.3.2.67.10=\d+c;1:100000;2:200000 iso.3.6.1.4.1.8072.3.2.67.17=-4;-10:20;-20:30/', "Multiple OIDs with thresholds output" );
+like($res->output, '/-4.*| .*67.10=\d+c;1:100000;2:200000 .*67.17=-4;-10:20;-20:30/', "Multiple OIDs with thresholds output" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10,.1.3.6.1.4.1.8072.3.2.67.17 -w '1:100000,-1:2' -c '2:200000,-20:30'" );
 is($res->return_code, 1, "Multiple OIDs with thresholds" );
-like($res->output, '/SNMP WARNING - \d+ \*-4\* | iso.3.6.1.4.1.8072.3.2.67.10=\d+c;1:100000;2:200000 iso.3.6.1.4.1.8072.3.2.67.17=-4;-10:20;-20:30/', "Multiple OIDs with thresholds output" );
+like($res->output, '/-4.*| iso.3.6.1.4.1.8072.3.2.67.10=\d+c;1:100000;2:200000 iso.3.6.1.4.1.8072.3.2.67.17=-4;-10:20;-20:30/', "Multiple OIDs with thresholds output" );
 
-$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10,.1.3.6.1.4.1.8072.3.2.67.17 -w 1,2 -c 1" );
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10,.1.3.6.1.4.1.8072.3.2.67.17 -w 1,2 -c 1 -O" );
 is($res->return_code, 2, "Multiple OIDs with some thresholds" );
-like($res->output, '/SNMP CRITICAL - \*\d+\* \*-4\* | iso.3.6.1.4.1.8072.3.2.67.10=\d+c;1;2 iso.3.6.1.4.1.8072.3.2.67.17=-4;;/', "Multiple OIDs with thresholds output" );
+like($res->output, '/.*-4.*| iso.3.6.1.4.1.8072.3.2.67.10=\d+c;1;2 iso.3.6.1.4.1.8072.3.2.67.17=-4;;/', "Multiple OIDs with thresholds output" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.19");
 is($res->return_code, 0, "Test plain .1.3.6.1.4.1.8072.3.2.67.6 RC" );
-is($res->output,'SNMP OK - 42 | iso.3.6.1.4.1.8072.3.2.67.19=42 ', "Test plain value of .1.3.6.1.4.1.8072.3.2.67.1" );
+like($res->output,'/.*42.*| iso.3.6.1.4.1.8072.3.2.67.19=42/', "Test plain value of .1.3.6.1.4.1.8072.3.2.67.1" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.19 -M .1");
 is($res->return_code, 0, "Test multiply RC" );
-is($res->output,'SNMP OK - 4.200000 | iso.3.6.1.4.1.8072.3.2.67.19=4.200000 ' , "Test multiply .1 output" );
+like($res->output,'/.*4.200000.*| iso.3.6.1.4.1.8072.3.2.67.19=4.200000/' , "Test multiply .1 output" );
 
-$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.19 --multiplier=.1 -f '%.2f' ");
-is($res->return_code, 0, "Test multiply RC + format" );
-is($res->output, 'SNMP OK - 4.20 | iso.3.6.1.4.1.8072.3.2.67.19=4.20 ', "Test multiply .1 output + format" );
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.19 --multiplier=.1");
+is($res->return_code, 0, "Test multiply RC" );
+like($res->output, '/.*4.20.*| iso.3.6.1.4.1.8072.3.2.67.19=4.20/', "Test multiply .1 output" );
 
-$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.19 --multiplier=.1 -f '%.2f' -w 1");
-is($res->return_code, 1, "Test multiply RC + format + thresholds" );
-is($res->output, 'SNMP WARNING - *4.20* | iso.3.6.1.4.1.8072.3.2.67.19=4.20;1 ', "Test multiply .1 output + format + thresholds" );
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.19 --multiplier=.1 -w 1");
+is($res->return_code, 1, "Test multiply RC + thresholds" );
+like($res->output, '/.*4.20.* | iso.3.6.1.4.1.8072.3.2.67.19=4.20+;1/', "Test multiply .1 output + thresholds" );
diff --git a/plugins/tests/check_snmp_agent.pl b/plugins/tests/check_snmp_agent.pl
index 38912e98..608b6f92 100644
--- a/plugins/tests/check_snmp_agent.pl
+++ b/plugins/tests/check_snmp_agent.pl
@@ -4,9 +4,10 @@
 #
 
 #use strict; # Doesn't work
+use warnings;
 use NetSNMP::OID qw(:all);
 use NetSNMP::agent;
-use NetSNMP::ASN qw(ASN_OCTET_STR ASN_COUNTER ASN_COUNTER64 ASN_INTEGER ASN_INTEGER64 ASN_UNSIGNED ASN_UNSIGNED64);
+use NetSNMP::ASN qw(ASN_OCTET_STR ASN_COUNTER ASN_COUNTER64 ASN_INTEGER ASN_INTEGER64 ASN_UNSIGNED ASN_UNSIGNED64 ASN_FLOAT);
 #use Math::Int64 qw(uint64); # Skip that module while we don't need it
 sub uint64 { return $_ }
 
@@ -22,21 +23,82 @@ IOS (tm) Catalyst 4000 "L3" Switch Software (cat4000-I9K91S-M), Version
 Technical Support: http://www.cisco.com/techsupport
 Copyright (c) 1986-2004 by cisco Systems, Inc.
 ';
-my $multilin2 = "Kisco Outernetwork Oserating Gystem Totware
+my $multiline2 = "Kisco Outernetwork Oserating Gystem Totware
 Copyleft (c) 2400-2689 by kisco Systrems, Inc.";
-my $multilin3 = 'This should not confuse check_snmp "parser"
+my $multiline3 = 'This should not confuse check_snmp "parser"
 into thinking there is no 2nd line';
-my $multilin4 = 'It\'s getting even harder if the line
+my $multiline4 = 'It\'s getting even harder if the line
 ends with with this: C:\\';
-my $multilin5 = 'And now have fun with with this: "C:\\"
+my $multiline5 = 'And now have fun with with this: "C:\\"
 because we\'re not done yet!';
 
 # Next are arrays of indexes (Type, initial value and increments)
 # 0..19 <---- please update comment when adding/removing fields
-my @fields = (ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_UNSIGNED, ASN_UNSIGNED, ASN_COUNTER, ASN_COUNTER64, ASN_UNSIGNED, ASN_COUNTER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_INTEGER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_INTEGER );
-my @values = ($multiline, $multilin2, $multilin3, $multilin4, $multilin5, 4294965296, 1000, 4294965296, uint64("18446744073709351616"), int(rand(2**32)), 64000, "stringtests", "3.5", "87.4startswithnumberbutshouldbestring", '555"I said"', 'CUSTOM CHECK OK: foo is 12345', -2, '-4', '-6.6', 42 );
+my @fields = (ASN_OCTET_STR, # 0
+                                                        ASN_OCTET_STR, # 1
+                                                        ASN_OCTET_STR, # 2
+                                                        ASN_OCTET_STR, # 3
+                                                        ASN_OCTET_STR, # 4
+                                                        ASN_UNSIGNED, #  5
+                                                        ASN_UNSIGNED, #  6
+                                                        ASN_COUNTER, #   7
+                                                        ASN_COUNTER64, # 8
+                                                        ASN_UNSIGNED, #  9
+                                                        ASN_COUNTER, #  10
+                                                        ASN_OCTET_STR, # 11
+                                                        ASN_OCTET_STR, # 12
+                                                        ASN_OCTET_STR, # 13
+                                                        ASN_OCTET_STR, # 14
+                                                        ASN_OCTET_STR, # 15
+                                                        ASN_INTEGER, #   16
+                                                        ASN_INTEGER, # 17
+                                                        ASN_FLOAT, # 18
+                                                        ASN_INTEGER #    19
+                                                        );
+my @values = ($multiline,  # 0
+                                                        $multiline2,  # 1
+                                                        $multiline3,  # 2
+                                                        $multiline4,  # 3
+                                                        $multiline5,  # 4
+                                                        4294965296,  # 5
+                                                        1000,  #       6
+                                                        4294965296,  # 7
+                                                        uint64("18446744073709351616"),  # 8
+                                                        int(rand(2**32)),  # 9
+                                                        64000,  # 10
+                                                        "stringtests",  # 11
+                                                        "3.5",  # 12
+                                                        "87.4startswithnumberbutshouldbestring",  # 13
+                                                        '555"I said"',  # 14
+                                                        'CUSTOM CHECK OK: foo is 12345',  # 15
+                                                        '-2',  # 16
+                                                        '-4',  # 17
+                                                        '-6.6',  # 18
+                                                        42  # 19
+                                                );
 # undef increments are randomized
-my @incrts = (undef, undef, undef, undef, undef, 1000, -500, 1000, 100000, undef, 666, undef, undef, undef, undef, undef, -1, undef, undef, 0 );
+my @incrts = (
+                                                        undef, # 0
+                                                        undef, # 1
+                                                        undef, # 2
+                                                        undef, # 3
+                                                        undef, # 4
+                                                        1000, # 5
+                                                        -500, # 6
+                                                        1000, # 7
+                                                        100000, # 8
+                                                        undef, # 9
+                                                        666, # 10
+                                                        undef, # 11
+                                                        undef, # 12
+                                                        undef, # 13
+                                                        undef, # 14
+                                                        undef, # 15
+                                                        -1, #    16
+                                                        0, # 17
+                                                        undef, # 18
+                                                        0 #      19
+                                         );
 
 # Number of elements in our OID
 my $oidelts;
diff --git a/plugins/tests/conf/snmpd.conf b/plugins/tests/conf/snmpd.conf
index eff5b0b3..1724c027 100644
--- a/plugins/tests/conf/snmpd.conf
+++ b/plugins/tests/conf/snmpd.conf
@@ -19,5 +19,5 @@ syscontact Alice
 # Embedded Subagents
 ###############################################################################
 
-perl do "tests/check_snmp_agent.pl";
+perl do "./tests/check_snmp_agent.pl";
 
diff --git a/plugins/tests/test_check_disk.c b/plugins/tests/test_check_disk.c
new file mode 100644
index 00000000..32b46c2d
--- /dev/null
+++ b/plugins/tests/test_check_disk.c
@@ -0,0 +1,213 @@
+/*****************************************************************************
+ *
+ * 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 "../check_disk.d/utils_disk.h"
+#include "../../tap/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) {
+        plan_tests(35);
+
+        struct name_list *exclude_filesystem = NULL;
+        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");
+
+        struct name_list *exclude_fstype = NULL;
+        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);
+        }
+        */
+
+        struct mount_entry *dummy_mount_list;
+        struct mount_entry **mtail = &dummy_mount_list;
+        struct mount_entry *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;
+
+        int cflags = REG_NOSUB | REG_EXTENDED;
+        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:"));
+
+        filesystem_list test_paths = filesystem_list_init();
+        mp_int_fs_list_append(&test_paths, "/home/groups");
+        mp_int_fs_list_append(&test_paths, "/var");
+        mp_int_fs_list_append(&test_paths, "/tmp");
+        mp_int_fs_list_append(&test_paths, "/home/tonvoon");
+        mp_int_fs_list_append(&test_paths, "/dev/c2t0d0s0");
+        ok(test_paths.length == 5, "List counter works correctly with appends");
+
+        mp_int_fs_list_set_best_match(test_paths, dummy_mount_list, false);
+        for (parameter_list_elem *p = test_paths.first; p; p = mp_int_fs_list_get_next(p)) {
+                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");
+                }
+        }
+
+        for (parameter_list_elem *p = test_paths.first; p; p = mp_int_fs_list_get_next(p)) {
+                mp_int_fs_list_del(&test_paths, p);
+        }
+        ok(test_paths.length == 0, "List delete sets counter properly");
+
+        mp_int_fs_list_append(&test_paths, "/home/groups");
+        mp_int_fs_list_append(&test_paths, "/var");
+        mp_int_fs_list_append(&test_paths, "/tmp");
+        mp_int_fs_list_append(&test_paths, "/home/tonvoon");
+        mp_int_fs_list_append(&test_paths, "/home");
+
+        mp_int_fs_list_set_best_match(test_paths, dummy_mount_list, true);
+        for (parameter_list_elem *p = test_paths.first; p; p = mp_int_fs_list_get_next(p)) {
+                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");
+                }
+        }
+
+        bool found = false;
+        /* test deleting first element in paths */
+        mp_int_fs_list_del(&test_paths, NULL);
+        for (parameter_list_elem *p = test_paths.first; p; p = mp_int_fs_list_get_next(p)) {
+                if (!strcmp(p->name, "/home/groups")) {
+                        found = true;
+                }
+        }
+        ok(!found, "first element successfully deleted");
+        found = false;
+
+        parameter_list_elem *prev = NULL;
+        parameter_list_elem *p = NULL;
+        for (parameter_list_elem *path = test_paths.first; path; path = mp_int_fs_list_get_next(path)) {
+                if (!strcmp(path->name, "/tmp")) {
+                        mp_int_fs_list_del(&test_paths, path);
+                }
+                p = path;
+        }
+
+        parameter_list_elem *last = NULL;
+        for (parameter_list_elem *path = test_paths.first; path; path = mp_int_fs_list_get_next(path)) {
+                if (!strcmp(path->name, "/tmp")) {
+                        found = true;
+                }
+                if (path->next) {
+                        prev = path;
+                } else {
+                        last = path;
+                }
+        }
+        ok(!found, "/tmp element successfully deleted");
+
+        int count = 0;
+        mp_int_fs_list_del(&test_paths, p);
+        for (p = test_paths.first; p; p = p->next) {
+                if (!strcmp(p->name, "/home")) {
+                        found = true;
+                }
+                last = p;
+                count++;
+        }
+        ok(!found, "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) {
+        regex_t regex;
+        if (regcomp(&regex, regstr, cflags) == 0) {
+                int matches = 0;
+                for (struct mount_entry *me = dummy_mount_list; me; me = me->me_next) {
+                        if (np_regex_match_mount_entry(me, &regex)) {
+                                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/plugins/tests/test_check_disk.t b/plugins/tests/test_check_disk.t
new file mode 100755
index 00000000..56354650
--- /dev/null
+++ b/plugins/tests/test_check_disk.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_check_disk") {
+        plan skip_all => "./test_check_disk not compiled - please enable libtap library to test";
+}
+exec "./test_check_disk";
diff --git a/plugins/tests/test_check_snmp.c b/plugins/tests/test_check_snmp.c
new file mode 100644
index 00000000..d71706d0
--- /dev/null
+++ b/plugins/tests/test_check_snmp.c
@@ -0,0 +1,175 @@
+/*****************************************************************************
+ *
+ * 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 "tap.h"
+#include "../../config.h"
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "utils_base.c"
+#include "../check_snmp.d/check_snmp_helpers.h"
+
+char *_np_state_generate_key(int argc, char **argv);
+char *_np_state_calculate_location_prefix(void);
+
+int main(int argc, char **argv) {
+        char *temp_string = (char *)_np_state_generate_key(argc, argv);
+        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");
+
+        int fake_argc = 4;
+        char *fake_argv[] = {
+                "./test_utils",
+                "here",
+                "--and",
+                "now",
+        };
+        temp_string = (char *)_np_state_generate_key(fake_argc, fake_argv);
+        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");
+
+        fake_argc = 1;
+        fake_argv[0] = "./test_utils";
+        state_key temp_state_key1 = np_enable_state(NULL, 51, "check_test", fake_argc, fake_argv);
+        ok(!strcmp(temp_state_key1.plugin_name, "check_test"), "Got plugin name");
+        ok(!strcmp(temp_state_key1.name, "e2d17f995fd4c020411b85e3e3d0ff7306d4147e"),
+           "Got generated filename");
+
+        state_key temp_state_key2 =
+                np_enable_state("allowedchars_in_keyname", 77, "check_snmp", fake_argc, fake_argv);
+
+        char state_path[1024];
+        sprintf(state_path, "/usr/local/nagios/var/%lu/check_test/allowedchars_in_keyname",
+                        (unsigned long)geteuid());
+        ok(!strcmp(temp_state_key2.plugin_name, "check_test"), "Got plugin name");
+        ok(!strcmp(temp_state_key2.name, "allowedchars_in_keyname"), "Got key name with valid chars");
+        ok(!strcmp(temp_state_key2._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"
+        );
+        */
+
+        state_key temp_state_key3 =
+                np_enable_state("funnykeyname", 54, "check_snmp", fake_argc, fake_argv);
+        sprintf(state_path, "/usr/local/nagios/var/%lu/check_test/funnykeyname",
+                        (unsigned long)geteuid());
+        ok(!strcmp(temp_state_key3.plugin_name, "check_test"), "Got plugin name");
+        ok(!strcmp(temp_state_key3.name, "funnykeyname"), "Got key name");
+
+        ok(!strcmp(temp_state_key3._filename, state_path), "Got internal filename");
+        ok(temp_state_key3.data_version == 54, "Version set");
+
+        state_data *temp_state_data = np_state_read(temp_state_key3);
+        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_key3._filename = "var/statefile";
+        temp_state_data = np_state_read(temp_state_key3);
+        ok(temp_state_data != NULL, "Got state data now") ||
+                diag("Are you running in right directory? Will get coredump next if not");
+        ok(temp_state_data->time == 1234567890, "Got time");
+        ok(!strcmp((char *)temp_state_data->data, "String to read"), "Data as expected");
+
+        temp_state_key3.data_version = 53;
+        temp_state_data = np_state_read(temp_state_key3);
+        ok(temp_state_data == NULL, "Older data version gives NULL");
+        temp_state_key3.data_version = 54;
+
+        temp_state_key3._filename = "var/nonexistent";
+        temp_state_data = np_state_read(temp_state_key3);
+        ok(temp_state_data == NULL, "Missing file gives NULL");
+
+        temp_state_key3._filename = "var/oldformat";
+        temp_state_data = np_state_read(temp_state_key3);
+        ok(temp_state_data == NULL, "Old file format gives NULL");
+
+        temp_state_key3._filename = "var/baddate";
+        temp_state_data = np_state_read(temp_state_key3);
+        ok(temp_state_data == NULL, "Bad date gives NULL");
+
+        temp_state_key3._filename = "var/missingdataline";
+        temp_state_data = np_state_read(temp_state_key3);
+        ok(temp_state_data == NULL, "Missing data line gives NULL");
+
+        unlink("var/generated");
+        temp_state_key3._filename = "var/generated";
+
+        time_t current_time = 1234567890;
+        np_state_write_string(temp_state_key3, 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_key3._filename = "var/generated_directory/statefile";
+        current_time = 1234567890;
+        np_state_write_string(temp_state_key3, 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_key3._filename = "var/generated";
+        time(&current_time);
+        np_state_write_string(temp_state_key3, 0, "String to read");
+        temp_state_data = np_state_read(temp_state_key3);
+        /* 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(temp_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();
+}
diff --git a/plugins/tests/test_check_snmp.t b/plugins/tests/test_check_snmp.t
new file mode 100755
index 00000000..967633e9
--- /dev/null
+++ b/plugins/tests/test_check_snmp.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_check_snmp") {
+        plan skip_all => "./test_check_snmp not compiled - please enable libtap library to test";
+}
+exec "./test_check_snmp";
diff --git a/plugins/tests/test_check_swap.c b/plugins/tests/test_check_swap.c
index b85fb4ad..94d56ce7 100644
--- a/plugins/tests/test_check_swap.c
+++ b/plugins/tests/test_check_swap.c
@@ -5,9 +5,7 @@
 int verbose = 0;
 
 void print_usage(void) {}
-void print_help(swap_config config) {
-        (void) config;
-}
+void print_help(swap_config config) { (void)config; }
 
 const char *progname = "test_check_swap";