diff --git a/lemonldap-ng-portal/t/67-CheckUser.t b/lemonldap-ng-portal/t/67-CheckUser.t
index 2c73b0898..6a8005b28 100644
--- a/lemonldap-ng-portal/t/67-CheckUser.t
+++ b/lemonldap-ng-portal/t/67-CheckUser.t
@@ -124,6 +124,7 @@ count(1);
 # Request with good VH & user
 $query =~
   s/url=http%3A%2F%2Ftry.example.com/url=http%3A%2F%2Ftest1.example.com/;
+
 ok(
     $res = $client->_post(
         '/checkuser',
@@ -140,8 +141,65 @@ count(1);
   expectForm( $res, undef, '/checkuser', 'user', 'url' );
 ok( $res->[2]->[0] =~ m%<span trspan="checkUser">%, 'Found trspan="checkUser"' )
   or explain( $res->[2]->[0], 'trspan="checkUser"' );
+ok( $res->[2]->[0] =~ m%value="http://test1.example.com/"%, 'Found well formatted url' )
+  or explain( $res->[2]->[0], 'Well formatted url' );
+count(2);
+
+ok( $res->[2]->[0] =~ m%<span trspan="checkUser">%, 'Found trspan="checkUser"' )
+  or explain( $res->[2]->[0], 'trspan="checkUser"' );
+ok(
+    $res->[2]->[0] =~
+m%<div class="alert alert-success"><b><span trspan="allowed"></span></b></div>%,
+    'Found trspan="allowed"'
+) or explain( $res->[2]->[0], 'trspan="allowed"' );
+ok( $res->[2]->[0] =~ m%<span trspan="headers">%, 'Found trspan="headers"' )
+  or explain( $res->[2]->[0], 'trspan="headers"' );
+ok( $res->[2]->[0] =~ m%<span trspan="groups_sso">%,
+    'Found trspan="groups_sso"' )
+  or explain( $res->[2]->[0], 'trspan="groups_sso"' );
+ok( $res->[2]->[0] =~ m%<span trspan="macros">%, 'Found trspan="macros"' )
+  or explain( $res->[2]->[0], 'trspan="macros"' );
+ok( $res->[2]->[0] =~ m%<span trspan="attributes">%,
+    'Found trspan="attributes"' )
+  or explain( $res->[2]->[0], 'trspan="attributes"' );
+ok( $res->[2]->[0] =~ m%<td class="align-middle">Auth-User</td>%,
+    'Found Auth-User' )
+  or explain( $res->[2]->[0], 'Header Key: Auth-User' );
+ok( $res->[2]->[0] =~ m%<td class="align-middle">rtyler</td>%, 'Found rtyler' )
+  or explain( $res->[2]->[0], 'Header Value: rtyler' );
+ok( $res->[2]->[0] =~ m%<td class="align-middle">su</td>%, 'Found su' )
+  or explain( $res->[2]->[0], 'SSO Groups: su' );
+ok( $res->[2]->[0] =~ m%<td class="align-middle">_whatToTrace</td>%,
+    'Found _whatToTrace' )
+  or explain( $res->[2]->[0], 'Macro Key _whatToTrace' );
+ok( $res->[2]->[0] =~ m%<td class="text-left">uid</td>%, 'Found uid' )
+  or explain( $res->[2]->[0], 'Attribute Value uid' );
+count(11);
+
+# Request with short VH url & user
+$query =~
+  s/url=http%3A%2F%2Ftest1.example.com/url=http%3A%2F%2Ftest1:1234/;
+
+ok(
+    $res = $client->_post(
+        '/checkuser',
+        IO::String->new($query),
+        cookie => "lemonldap=$id",
+        length => length($query),
+        accept => 'text/html',
+    ),
+    'POST checkuser'
+);
 count(1);
 
+( $host, $url, $query ) =
+  expectForm( $res, undef, '/checkuser', 'user', 'url' );
+ok( $res->[2]->[0] =~ m%<span trspan="checkUser">%, 'Found trspan="checkUser"' )
+  or explain( $res->[2]->[0], 'trspan="checkUser"' );
+ok( $res->[2]->[0] =~ m%value="http://test1.example.com:1234/"%, 'Found well formatted url' )
+  or explain( $res->[2]->[0], 'Well formatted url' );
+count(2);
+
 ok( $res->[2]->[0] =~ m%<span trspan="checkUser">%, 'Found trspan="checkUser"' )
   or explain( $res->[2]->[0], 'trspan="checkUser"' );
 ok(