diff --git a/Makefile.am b/Makefile.am
index 22bbd561..47eb9c44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-EXTRA_DIST = NEWS README
-
 SUBDIRS = lib
 
 if ENABLE_SUBIDS
@@ -15,4 +13,15 @@ SUBDIRS += man
 endif
 
 CLEANFILES = man/8.out man/po/remove-potcdate.* man/*/login.defs.d man/*/*.mo
-EXTRA_DIST = tests/
+
+EXTRA_DIST = NEWS README tests/
+
+dist-hook:
+	chmod -R u+w $(distdir)/tests
+	chmod u+w $(distdir)
+	mv $(distdir)/tests/unit $(distdir)/realunittest
+	mv $(distdir)/tests/tests $(distdir)/realtests
+	rm -rf $(distdir)/tests
+	mv $(distdir)/realtests $(distdir)/tests
+	rm -rf $(distdir)/tests/unit $(distdir)/tests/Makefile*
+	mv $(distdir)/realunittest $(distdir)/tests/unit
diff --git a/Makefile.in b/Makefile.in
index 99ee3dd5..2e317066 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -167,7 +167,7 @@ DIST_SUBDIRS = lib libsubid src po contrib doc etc tests/unit man
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/man/po/Makefile.in ABOUT-NLS AUTHORS.md COPYING \
 	ChangeLog NEWS README compile config.guess config.rpath \
-	config.sub install-sh ltmain.sh missing
+	config.sub install-sh ltmain.sh missing ylwrap
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -389,10 +389,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-EXTRA_DIST = tests/
 SUBDIRS = lib $(am__append_1) src po contrib doc etc tests/unit \
 	$(am__append_2)
 CLEANFILES = man/8.out man/po/remove-potcdate.* man/*/login.defs.d man/*/*.mo
+EXTRA_DIST = NEWS README tests/
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -622,6 +622,9 @@ distdir-am: $(DISTFILES)
 	      || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-test -n "$(am__skip_mode_fix)" \
 	|| find "$(distdir)" -type d ! -perm -755 \
 		-exec chmod u+rwx,go+rx {} \; -o \
@@ -869,8 +872,8 @@ uninstall-am:
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 	am--refresh check check-am clean clean-cscope clean-generic \
 	clean-libtool cscope cscopelist-am ctags ctags-am dist \
-	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
-	dist-xz dist-zip dist-zstd distcheck distclean \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
+	dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
@@ -886,6 +889,16 @@ uninstall-am:
 .PRECIOUS: Makefile
 
 
+dist-hook:
+	chmod -R u+w $(distdir)/tests
+	chmod u+w $(distdir)
+	mv $(distdir)/tests/unit $(distdir)/realunittest
+	mv $(distdir)/tests/tests $(distdir)/realtests
+	rm -rf $(distdir)/tests
+	mv $(distdir)/realtests $(distdir)/tests
+	rm -rf $(distdir)/tests/unit $(distdir)/tests/Makefile*
+	mv $(distdir)/realunittest $(distdir)/tests/unit
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/aclocal.m4 b/aclocal.m4
index aee8bf2f..da88563d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -931,7 +931,7 @@ dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_LTDL_DLSYM_USCORE], [])
 
 # pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 12 (pkg-config-0.29.2)
+# serial 11 (pkg-config-0.29.1)
 
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
@@ -973,7 +973,7 @@ dnl
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.2])
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
 m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
     [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ
@@ -1074,7 +1074,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 
 pkg_failed=no
-AC_MSG_CHECKING([for $2])
+AC_MSG_CHECKING([for $1])
 
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -1084,11 +1084,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
-        AC_MSG_RESULT([no])
+   	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else
+        else 
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -1105,7 +1105,7 @@ installed software in a non-standard prefix.
 _PKG_TEXT])[]dnl
         ])
 elif test $pkg_failed = untried; then
-        AC_MSG_RESULT([no])
+     	AC_MSG_RESULT([no])
 	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -1206,6 +1206,74 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR
 
+dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
+dnl   [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------
+dnl
+dnl Prepare a "--with-" configure option using the lowercase
+dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
+dnl PKG_CHECK_MODULES in a single macro.
+AC_DEFUN([PKG_WITH_MODULES],
+[
+m4_pushdef([with_arg], m4_tolower([$1]))
+
+m4_pushdef([description],
+           [m4_default([$5], [build with ]with_arg[ support])])
+
+m4_pushdef([def_arg], [m4_default([$6], [auto])])
+m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
+m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
+
+m4_case(def_arg,
+            [yes],[m4_pushdef([with_without], [--without-]with_arg)],
+            [m4_pushdef([with_without],[--with-]with_arg)])
+
+AC_ARG_WITH(with_arg,
+     AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
+    [AS_TR_SH([with_]with_arg)=def_arg])
+
+AS_CASE([$AS_TR_SH([with_]with_arg)],
+            [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
+            [auto],[PKG_CHECK_MODULES([$1],[$2],
+                                        [m4_n([def_action_if_found]) $3],
+                                        [m4_n([def_action_if_not_found]) $4])])
+
+m4_popdef([with_arg])
+m4_popdef([description])
+m4_popdef([def_arg])
+
+])dnl PKG_WITH_MODULES
+
+dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   [DESCRIPTION], [DEFAULT])
+dnl -----------------------------------------------
+dnl
+dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
+dnl check._[VARIABLE-PREFIX] is exported as make variable.
+AC_DEFUN([PKG_HAVE_WITH_MODULES],
+[
+PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
+
+AM_CONDITIONAL([HAVE_][$1],
+               [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
+])dnl PKG_HAVE_WITH_MODULES
+
+dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+dnl   [DESCRIPTION], [DEFAULT])
+dnl ------------------------------------------------------
+dnl
+dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
+dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
+dnl and preprocessor variable.
+AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
+[
+PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
+
+AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
+        [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
+])dnl PKG_HAVE_DEFINE_WITH_MODULES
+
 # Copyright (C) 2002-2021 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
diff --git a/configure b/configure
index 09eaf67a..7b69231d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for shadow 4.16.0.
+# Generated by GNU Autoconf 2.71 for shadow 4.17.0-rc1.
 #
 # Report bugs to <pkg-shadow-devel@lists.alioth.debian.org>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='shadow'
 PACKAGE_TARNAME='shadow'
-PACKAGE_VERSION='4.16.0'
-PACKAGE_STRING='shadow 4.16.0'
+PACKAGE_VERSION='4.17.0-rc1'
+PACKAGE_STRING='shadow 4.17.0-rc1'
 PACKAGE_BUGREPORT='pkg-shadow-devel@lists.alioth.debian.org'
 PACKAGE_URL='https://github.com/shadow-maint/shadow'
 
@@ -1488,7 +1488,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures shadow 4.16.0 to adapt to many kinds of systems.
+\`configure' configures shadow 4.17.0-rc1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1559,7 +1559,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of shadow 4.16.0:";;
+     short | recursive ) echo "Configuration of shadow 4.17.0-rc1:";;
    esac
   cat <<\_ACEOF
 
@@ -1738,7 +1738,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-shadow configure 4.16.0
+shadow configure 4.17.0-rc1
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2338,7 +2338,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by shadow $as_me 4.16.0, which was
+It was created by shadow $as_me 4.17.0-rc1, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3611,7 +3611,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='shadow'
- VERSION='4.16.0'
+ VERSION='4.17.0-rc1'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -16215,8 +16215,8 @@ printf "%s\n" "no" >&6; }
 fi
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cmocka" >&5
-printf %s "checking for cmocka... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CMOCKA" >&5
+printf %s "checking for CMOCKA... " >&6; }
 
 if test -n "$CMOCKA_CFLAGS"; then
     pkg_cv_CMOCKA_CFLAGS="$CMOCKA_CFLAGS"
@@ -16256,7 +16256,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -16275,7 +16275,7 @@ fi
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libcmocka not found, cmocka tests will not be built" >&5
 printf "%s\n" "$as_me: WARNING: libcmocka not found, cmocka tests will not be built" >&2;}
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libcmocka not found, cmocka tests will not be built" >&5
 printf "%s\n" "$as_me: WARNING: libcmocka not found, cmocka tests will not be built" >&2;}
@@ -16918,8 +16918,8 @@ then :
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libbsd-overlay" >&5
-printf %s "checking for libbsd-overlay... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LIBBSD" >&5
+printf %s "checking for LIBBSD... " >&6; }
 
 if test -n "$LIBBSD_CFLAGS"; then
     pkg_cv_LIBBSD_CFLAGS="$LIBBSD_CFLAGS"
@@ -16959,7 +16959,7 @@ fi
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+   	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -16986,7 +16986,7 @@ Alternatively, you may set the environment variables LIBBSD_CFLAGS
 and LIBBSD_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+     	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }
 	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -18086,7 +18086,7 @@ if test "x$ac_cv_lib_skey_skeychallenge" = xyes
 then :
   LIBSKEY=-lskey
 else $as_nop
-  as_fn_error $? "liskey missing. You can download S/Key source code from http://rsync1.it.gentoo.org/gentoo/distfiles/skey-1.1.5.tar.bz2" "$LINENO" 5
+  as_fn_error $? "libskey missing. You can download S/Key source code from http://rsync1.it.gentoo.org/gentoo/distfiles/skey-1.1.5.tar.bz2" "$LINENO" 5
 fi
 
 
@@ -20846,7 +20846,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by shadow $as_me 4.16.0, which was
+This file was extended by shadow $as_me 4.17.0-rc1, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20915,7 +20915,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-shadow config.status 4.16.0
+shadow config.status 4.17.0-rc1
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index bc89a44f..dd9c222f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ m4_define([libsubid_abi_major], 5)
 m4_define([libsubid_abi_minor], 0)
 m4_define([libsubid_abi_micro], 0)
 m4_define([libsubid_abi], [libsubid_abi_major.libsubid_abi_minor.libsubid_abi_micro])
-AC_INIT([shadow], [4.16.0], [pkg-shadow-devel@lists.alioth.debian.org], [],
+AC_INIT([shadow], [4.17.0-rc1], [pkg-shadow-devel@lists.alioth.debian.org], [],
 	[https://github.com/shadow-maint/shadow])
 AM_INIT_AUTOMAKE([1.11 foreign dist-xz subdir-objects tar-pax])
 AC_CONFIG_MACRO_DIRS([m4])
@@ -689,7 +689,7 @@ AC_SUBST(LIBMD)
 if test "$with_skey" = "yes"; then
 	AC_CHECK_LIB(md, MD5Init, [LIBMD=-lmd])
 	AC_CHECK_LIB(skey, skeychallenge, [LIBSKEY=-lskey],
-		[AC_MSG_ERROR([liskey missing. You can download S/Key source code from http://rsync1.it.gentoo.org/gentoo/distfiles/skey-1.1.5.tar.bz2])])
+		[AC_MSG_ERROR([libskey missing. You can download S/Key source code from http://rsync1.it.gentoo.org/gentoo/distfiles/skey-1.1.5.tar.bz2])])
 	AC_DEFINE(SKEY, 1, [Define to support S/Key logins.])
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 		#include <stdio.h>
diff --git a/contrib/adduser.c b/contrib/adduser.c
index 584e098a..8061c76a 100644
--- a/contrib/adduser.c
+++ b/contrib/adduser.c
@@ -118,6 +118,9 @@
 #include <sys/stat.h>
 #include <syslog.h>
 
+#include "string/strcmp/streq.h"
+
+
 #define IMMEDIATE_CHANGE	/* Expire newly created password, must be changed
 				 * immediately upon next login */
 #define HAVE_QUOTAS		/* Obvious */
@@ -291,12 +294,10 @@ main (void)
 	  printf ("Home Directory [%s/%s]: ", DEFAULT_HOME, usrname);
 	  fflush (stdout);
 	  safeget (dir, sizeof (dir));
-	  if (!strlen (dir))
-	    {			/* hit return */
-	      sprintf (dir, "%s/%s", DEFAULT_HOME, usrname);
-	    }
+	  if (!strlen(dir))  /* hit return */
+	    sprintf(dir, "%s/%s", DEFAULT_HOME, usrname);
 	  else if (dir[strlen (dir) - 1] == '/')
-	    sprintf (dir+strlen(dir), "%s", usrname);
+	    strcat(dir, usrname);
 	}
       else
 	{
@@ -308,7 +309,7 @@ main (void)
       fflush (stdout);
       safeget (shell, sizeof (shell));
       if (!strlen (shell))
-	sprintf (shell, "%s", DEFAULT_SHELL);
+	strcpy(shell, DEFAULT_SHELL);
       else
 	{
 	  char *sh;
@@ -316,7 +317,7 @@ main (void)
 #ifdef HAVE_GETUSERSHELL
 	  setusershell ();
 	  while ((sh = getusershell ()) != NULL)
-	    if (!strcmp (shell, sh))
+	    if (streq(shell, sh))
 	      ok = 1;
 	  endusershell ();
 #endif
@@ -327,7 +328,7 @@ main (void)
 	      else
 		{
 		  printf ("Shell NOT in /etc/shells, DEFAULT used\n");
-		  sprintf (shell, "%s", DEFAULT_SHELL);
+		  strcpy(shell, DEFAULT_SHELL);
 		}
 	    }
 	}
@@ -491,12 +492,12 @@ safeget (char *buf, int maxlen)
       bad = (!isalnum (c) && (c != '_') && (c != ' '));
       *(buf++) = c;
     }
-  *buf = '\0';
+  stpcpy(buf, "");
 
   if (bad)
     {
       printf ("\nString contained banned character. Please stick to alphanumerics.\n");
-      *bstart = '\0';
+      stpcpy(bstart, "");
     }
 }
 
diff --git a/doc/HOWTO b/doc/HOWTO
index 03a5f1ae..bb4e052d 100644
--- a/doc/HOWTO
+++ b/doc/HOWTO
@@ -471,12 +471,12 @@
 
   The Shadow Suite contains replacement programs for:
 
-  su, login, passwd, newgrp, chfn, chsh, and id
+  su, login, passwd, newgrp, chfn, chsh
 
   The package also contains the new programs:
 
   chage, newusers, dpasswd, gpasswd, useradd, userdel, usermod,
-  groupadd, groupdel, groupmod, groups, pwck, grpck, lastlog, pwconv,
+  groupadd, groupdel, groupmod, pwck, grpck, lastlog, pwconv,
   and pwunconv
 
   Additionally, the library: libshadow.a is included for writing and/or
@@ -586,8 +586,6 @@
 
   �  /usr/bin/chsh
 
-  �  /usr/bin/id
-
   The BETA package has a save target in the Makefile, but it's commented
   out because different distributions place the programs in different
   places.
@@ -637,8 +635,6 @@
 
   �  /usr/man/man1/chsh.1.gz
 
-  �  /usr/man/man1/id.1.gz
-
   �  /usr/man/man1/login.1.gz
 
   �  /usr/man/man1/passwd.1.gz
@@ -1377,7 +1373,7 @@
   users or changing the group password, the /etc/gshadow file will be
   changed.
 
-  The programs groups, groupadd, groupmod, and groupdel are provided as
+  The programs groupadd, groupmod, and groupdel are provided as
   part of the Shadow Suite to modify groups.
 
   The format of the /etc/group file is as follows:
diff --git a/lib/Makefile.am b/lib/Makefile.am
index adcd9fbf..e76e7446 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -29,16 +29,48 @@ libshadow_la_SOURCES = \
 	age.c \
 	agetpass.c \
 	agetpass.h \
-	alloc.c \
-	alloc.h \
-	atoi/a2i.c \
-	atoi/a2i.h \
-	atoi/str2i.c \
-	atoi/str2i.h \
-	atoi/strtoi.c \
-	atoi/strtoi.h \
-	atoi/strtou_noneg.c \
-	atoi/strtou_noneg.h \
+	alloc/calloc.c \
+	alloc/calloc.h \
+	alloc/malloc.c \
+	alloc/malloc.h \
+	alloc/realloc.c \
+	alloc/realloc.h \
+	alloc/reallocf.c \
+	alloc/reallocf.h \
+	alloc/x/xcalloc.c \
+	alloc/x/xcalloc.h \
+	alloc/x/xmalloc.c \
+	alloc/x/xmalloc.h \
+	alloc/x/xrealloc.c \
+	alloc/x/xrealloc.h \
+	atoi/a2i/a2i.c \
+	atoi/a2i/a2i.h \
+	atoi/a2i/a2s.c \
+	atoi/a2i/a2s.h \
+	atoi/a2i/a2s_c.c \
+	atoi/a2i/a2s_c.h \
+	atoi/a2i/a2s_nc.c \
+	atoi/a2i/a2s_nc.h \
+	atoi/a2i/a2u.c \
+	atoi/a2i/a2u.h \
+	atoi/a2i/a2u_c.c \
+	atoi/a2i/a2u_c.h \
+	atoi/a2i/a2u_nc.c \
+	atoi/a2i/a2u_nc.h \
+	atoi/getnum.c \
+	atoi/getnum.h \
+	atoi/str2i/str2i.c \
+	atoi/str2i/str2i.h \
+	atoi/str2i/str2s.c \
+	atoi/str2i/str2s.h \
+	atoi/str2i/str2u.c \
+	atoi/str2i/str2u.h \
+	atoi/strtoi/strtoi.c \
+	atoi/strtoi/strtoi.h \
+	atoi/strtoi/strtou.c \
+	atoi/strtoi/strtou.h \
+	atoi/strtoi/strtou_noneg.c \
+	atoi/strtoi/strtou_noneg.h \
 	attr.h \
 	audit_help.c \
 	basename.c \
@@ -71,9 +103,11 @@ libshadow_la_SOURCES = \
 	find_new_sub_gids.c \
 	find_new_sub_uids.c \
 	fputsx.c \
-	get_gid.c \
+	fs/readlink/areadlink.c \
+	fs/readlink/areadlink.h \
+	fs/readlink/readlinknul.c \
+	fs/readlink/readlinknul.h \
 	get_pid.c \
-	get_uid.c \
 	getdate.h \
 	getdate.y \
 	getdef.c \
@@ -94,8 +128,6 @@ libshadow_la_SOURCES = \
 	lockpw.c \
 	loginprompt.c \
 	mail.c \
-	memzero.c \
-	memzero.h \
 	motd.c \
 	must_be.h \
 	myname.c \
@@ -144,18 +176,42 @@ libshadow_la_SOURCES = \
 	spawn.c \
 	sssd.c \
 	sssd.h \
-	string/sprintf.c \
-	string/sprintf.h \
-	string/stpecpy.c \
-	string/stpecpy.h \
-	string/stpeprintf.c \
-	string/stpeprintf.h \
+	string/memset/memzero.c \
+	string/memset/memzero.h \
+	string/sprintf/snprintf.c \
+	string/sprintf/snprintf.h \
+	string/sprintf/stpeprintf.c \
+	string/sprintf/stpeprintf.h \
+	string/sprintf/xasprintf.c \
+	string/sprintf/xasprintf.h \
+	string/strchr/strchrcnt.c \
+	string/strchr/strchrcnt.h \
+	string/strchr/stpspn.c \
+	string/strchr/stpspn.h \
+	string/strchr/strnul.c \
+	string/strchr/strnul.h \
+	string/strchr/strrspn.c \
+	string/strchr/strrspn.h \
+	string/strcmp/streq.c \
+	string/strcmp/streq.h \
+	string/strcpy/stpecpy.c \
+	string/strcpy/stpecpy.h \
+	string/strcpy/strncat.c \
+	string/strcpy/strncat.h \
+	string/strcpy/strncpy.c \
+	string/strcpy/strncpy.h \
+	string/strcpy/strtcpy.c \
+	string/strcpy/strtcpy.h \
+	string/strdup/strndupa.c \
+	string/strdup/strndupa.h \
+	string/strdup/xstrdup.c \
+	string/strdup/xstrdup.h \
+	string/strdup/xstrndup.c \
+	string/strdup/xstrndup.h \
 	string/strftime.c \
 	string/strftime.h \
-	string/strncpy.h \
-	string/strtcpy.c \
-	string/strtcpy.h \
-	string/zustr2stp.h \
+	string/strtok/stpsep.c \
+	string/strtok/stpsep.h \
 	strtoday.c \
 	sub.c \
 	subordinateio.h \
@@ -164,6 +220,7 @@ libshadow_la_SOURCES = \
 	time/day_to_str.c \
 	time/day_to_str.h \
 	ttytype.c \
+	typetraits.h \
 	tz.c \
 	ulimit.c \
 	user_busy.c \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 6577a366..b67632b6 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -122,38 +122,64 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libshadow_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__libshadow_la_SOURCES_DIST = addgrps.c adds.c adds.h age.c \
-	agetpass.c agetpass.h alloc.c alloc.h atoi/a2i.c atoi/a2i.h \
-	atoi/str2i.c atoi/str2i.h atoi/strtoi.c atoi/strtoi.h \
-	atoi/strtou_noneg.c atoi/strtou_noneg.h attr.h audit_help.c \
-	basename.c bit.c bit.h cast.h chkname.c chkname.h chowndir.c \
-	chowntty.c cleanup.c cleanup_group.c cleanup_user.c commonio.c \
-	commonio.h console.c copydir.c csrand.c defines.h encrypt.c \
-	env.c exitcodes.h faillog.h failure.c failure.h fd.c fields.c \
-	find_new_gid.c find_new_uid.c find_new_sub_gids.c \
-	find_new_sub_uids.c fputsx.c get_gid.c get_pid.c get_uid.c \
-	getdate.h getdate.y getdef.c getdef.h getgr_nam_gid.c \
-	getrange.c gettime.c groupio.c groupmem.c groupio.h gshadow.c \
-	hushed.c idmapping.h idmapping.c isexpired.c limits.c list.c \
-	lockpw.c loginprompt.c mail.c memzero.c memzero.h motd.c \
-	must_be.h myname.c nss.c nscd.c nscd.h obscure.c pam_defs.h \
-	pam_pass.c pam_pass_non_interactive.c port.c port.h \
+	agetpass.c agetpass.h alloc/calloc.c alloc/calloc.h \
+	alloc/malloc.c alloc/malloc.h alloc/realloc.c alloc/realloc.h \
+	alloc/reallocf.c alloc/reallocf.h alloc/x/xcalloc.c \
+	alloc/x/xcalloc.h alloc/x/xmalloc.c alloc/x/xmalloc.h \
+	alloc/x/xrealloc.c alloc/x/xrealloc.h atoi/a2i/a2i.c \
+	atoi/a2i/a2i.h atoi/a2i/a2s.c atoi/a2i/a2s.h atoi/a2i/a2s_c.c \
+	atoi/a2i/a2s_c.h atoi/a2i/a2s_nc.c atoi/a2i/a2s_nc.h \
+	atoi/a2i/a2u.c atoi/a2i/a2u.h atoi/a2i/a2u_c.c \
+	atoi/a2i/a2u_c.h atoi/a2i/a2u_nc.c atoi/a2i/a2u_nc.h \
+	atoi/getnum.c atoi/getnum.h atoi/str2i/str2i.c \
+	atoi/str2i/str2i.h atoi/str2i/str2s.c atoi/str2i/str2s.h \
+	atoi/str2i/str2u.c atoi/str2i/str2u.h atoi/strtoi/strtoi.c \
+	atoi/strtoi/strtoi.h atoi/strtoi/strtou.c atoi/strtoi/strtou.h \
+	atoi/strtoi/strtou_noneg.c atoi/strtoi/strtou_noneg.h attr.h \
+	audit_help.c basename.c bit.c bit.h cast.h chkname.c chkname.h \
+	chowndir.c chowntty.c cleanup.c cleanup_group.c cleanup_user.c \
+	commonio.c commonio.h console.c copydir.c csrand.c defines.h \
+	encrypt.c env.c exitcodes.h faillog.h failure.c failure.h fd.c \
+	fields.c find_new_gid.c find_new_uid.c find_new_sub_gids.c \
+	find_new_sub_uids.c fputsx.c fs/readlink/areadlink.c \
+	fs/readlink/areadlink.h fs/readlink/readlinknul.c \
+	fs/readlink/readlinknul.h get_pid.c getdate.h getdate.y \
+	getdef.c getdef.h getgr_nam_gid.c getrange.c gettime.c \
+	groupio.c groupmem.c groupio.h gshadow.c hushed.c idmapping.h \
+	idmapping.c isexpired.c limits.c list.c lockpw.c loginprompt.c \
+	mail.c motd.c must_be.h myname.c nss.c nscd.c nscd.h obscure.c \
+	pam_defs.h pam_pass.c pam_pass_non_interactive.c port.c port.h \
 	prefix_flag.c prototypes.h pwauth.c pwauth.h pwio.c pwio.h \
 	pwd_init.c pwd2spwd.c pwdcheck.c pwmem.c remove_tree.c \
 	root_flag.c run_part.h run_part.c salt.c selinux.c semanage.c \
 	setugid.c setupenv.c sgetgrent.c sgetpwent.c sgetspent.c \
 	sgroupio.c sgroupio.h shadow.c shadowio.c shadowio.h \
 	shadowlog.c shadowlog.h shadowlog_internal.h shadowmem.c \
-	shell.c sizeof.h spawn.c sssd.c sssd.h string/sprintf.c \
-	string/sprintf.h string/stpecpy.c string/stpecpy.h \
-	string/stpeprintf.c string/stpeprintf.h string/strftime.c \
-	string/strftime.h string/strncpy.h string/strtcpy.c \
-	string/strtcpy.h string/zustr2stp.h strtoday.c sub.c \
+	shell.c sizeof.h spawn.c sssd.c sssd.h string/memset/memzero.c \
+	string/memset/memzero.h string/sprintf/snprintf.c \
+	string/sprintf/snprintf.h string/sprintf/stpeprintf.c \
+	string/sprintf/stpeprintf.h string/sprintf/xasprintf.c \
+	string/sprintf/xasprintf.h string/strchr/strchrcnt.c \
+	string/strchr/strchrcnt.h string/strchr/stpspn.c \
+	string/strchr/stpspn.h string/strchr/strnul.c \
+	string/strchr/strnul.h string/strchr/strrspn.c \
+	string/strchr/strrspn.h string/strcmp/streq.c \
+	string/strcmp/streq.h string/strcpy/stpecpy.c \
+	string/strcpy/stpecpy.h string/strcpy/strncat.c \
+	string/strcpy/strncat.h string/strcpy/strncpy.c \
+	string/strcpy/strncpy.h string/strcpy/strtcpy.c \
+	string/strcpy/strtcpy.h string/strdup/strndupa.c \
+	string/strdup/strndupa.h string/strdup/xstrdup.c \
+	string/strdup/xstrdup.h string/strdup/xstrndup.c \
+	string/strdup/xstrndup.h string/strftime.c string/strftime.h \
+	string/strtok/stpsep.c string/strtok/stpsep.h strtoday.c sub.c \
 	subordinateio.h subordinateio.c sulog.c time/day_to_str.c \
-	time/day_to_str.h ttytype.c tz.c ulimit.c user_busy.c valid.c \
-	write_full.c xgetpwnam.c xprefix_getpwnam.c xgetpwuid.c \
-	xgetgrnam.c xgetgrgid.c xgetspnam.c yesno.c tcbfuncs.c \
-	tcbfuncs.h btrfs.c log.c logind.c utmp.c freezero.h freezero.c \
-	readpassphrase.h readpassphrase.c
+	time/day_to_str.h ttytype.c typetraits.h tz.c ulimit.c \
+	user_busy.c valid.c write_full.c xgetpwnam.c \
+	xprefix_getpwnam.c xgetpwuid.c xgetgrnam.c xgetgrgid.c \
+	xgetspnam.c yesno.c tcbfuncs.c tcbfuncs.h btrfs.c log.c \
+	logind.c utmp.c freezero.h freezero.c readpassphrase.h \
+	readpassphrase.c
 am__dirstamp = $(am__leading_dot)dirstamp
 @WITH_TCB_TRUE@am__objects_1 = libshadow_la-tcbfuncs.lo
 @WITH_BTRFS_TRUE@am__objects_2 = libshadow_la-btrfs.lo
@@ -164,22 +190,34 @@ am__dirstamp = $(am__leading_dot)dirstamp
 @WITH_LIBBSD_FALSE@	libshadow_la-readpassphrase.lo
 am_libshadow_la_OBJECTS = libshadow_la-addgrps.lo libshadow_la-adds.lo \
 	libshadow_la-age.lo libshadow_la-agetpass.lo \
-	libshadow_la-alloc.lo atoi/libshadow_la-a2i.lo \
-	atoi/libshadow_la-str2i.lo atoi/libshadow_la-strtoi.lo \
-	atoi/libshadow_la-strtou_noneg.lo libshadow_la-audit_help.lo \
-	libshadow_la-basename.lo libshadow_la-bit.lo \
-	libshadow_la-chkname.lo libshadow_la-chowndir.lo \
-	libshadow_la-chowntty.lo libshadow_la-cleanup.lo \
-	libshadow_la-cleanup_group.lo libshadow_la-cleanup_user.lo \
-	libshadow_la-commonio.lo libshadow_la-console.lo \
-	libshadow_la-copydir.lo libshadow_la-csrand.lo \
-	libshadow_la-encrypt.lo libshadow_la-env.lo \
-	libshadow_la-failure.lo libshadow_la-fd.lo \
+	alloc/libshadow_la-calloc.lo alloc/libshadow_la-malloc.lo \
+	alloc/libshadow_la-realloc.lo alloc/libshadow_la-reallocf.lo \
+	alloc/x/libshadow_la-xcalloc.lo \
+	alloc/x/libshadow_la-xmalloc.lo \
+	alloc/x/libshadow_la-xrealloc.lo atoi/a2i/libshadow_la-a2i.lo \
+	atoi/a2i/libshadow_la-a2s.lo atoi/a2i/libshadow_la-a2s_c.lo \
+	atoi/a2i/libshadow_la-a2s_nc.lo atoi/a2i/libshadow_la-a2u.lo \
+	atoi/a2i/libshadow_la-a2u_c.lo atoi/a2i/libshadow_la-a2u_nc.lo \
+	atoi/libshadow_la-getnum.lo atoi/str2i/libshadow_la-str2i.lo \
+	atoi/str2i/libshadow_la-str2s.lo \
+	atoi/str2i/libshadow_la-str2u.lo \
+	atoi/strtoi/libshadow_la-strtoi.lo \
+	atoi/strtoi/libshadow_la-strtou.lo \
+	atoi/strtoi/libshadow_la-strtou_noneg.lo \
+	libshadow_la-audit_help.lo libshadow_la-basename.lo \
+	libshadow_la-bit.lo libshadow_la-chkname.lo \
+	libshadow_la-chowndir.lo libshadow_la-chowntty.lo \
+	libshadow_la-cleanup.lo libshadow_la-cleanup_group.lo \
+	libshadow_la-cleanup_user.lo libshadow_la-commonio.lo \
+	libshadow_la-console.lo libshadow_la-copydir.lo \
+	libshadow_la-csrand.lo libshadow_la-encrypt.lo \
+	libshadow_la-env.lo libshadow_la-failure.lo libshadow_la-fd.lo \
 	libshadow_la-fields.lo libshadow_la-find_new_gid.lo \
 	libshadow_la-find_new_uid.lo libshadow_la-find_new_sub_gids.lo \
 	libshadow_la-find_new_sub_uids.lo libshadow_la-fputsx.lo \
-	libshadow_la-get_gid.lo libshadow_la-get_pid.lo \
-	libshadow_la-get_uid.lo libshadow_la-getdate.lo \
+	fs/readlink/libshadow_la-areadlink.lo \
+	fs/readlink/libshadow_la-readlinknul.lo \
+	libshadow_la-get_pid.lo libshadow_la-getdate.lo \
 	libshadow_la-getdef.lo libshadow_la-getgr_nam_gid.lo \
 	libshadow_la-getrange.lo libshadow_la-gettime.lo \
 	libshadow_la-groupio.lo libshadow_la-groupmem.lo \
@@ -187,10 +225,10 @@ am_libshadow_la_OBJECTS = libshadow_la-addgrps.lo libshadow_la-adds.lo \
 	libshadow_la-idmapping.lo libshadow_la-isexpired.lo \
 	libshadow_la-limits.lo libshadow_la-list.lo \
 	libshadow_la-lockpw.lo libshadow_la-loginprompt.lo \
-	libshadow_la-mail.lo libshadow_la-memzero.lo \
-	libshadow_la-motd.lo libshadow_la-myname.lo \
-	libshadow_la-nss.lo libshadow_la-nscd.lo \
-	libshadow_la-obscure.lo libshadow_la-pam_pass.lo \
+	libshadow_la-mail.lo libshadow_la-motd.lo \
+	libshadow_la-myname.lo libshadow_la-nss.lo \
+	libshadow_la-nscd.lo libshadow_la-obscure.lo \
+	libshadow_la-pam_pass.lo \
 	libshadow_la-pam_pass_non_interactive.lo libshadow_la-port.lo \
 	libshadow_la-prefix_flag.lo libshadow_la-pwauth.lo \
 	libshadow_la-pwio.lo libshadow_la-pwd_init.lo \
@@ -205,20 +243,35 @@ am_libshadow_la_OBJECTS = libshadow_la-addgrps.lo libshadow_la-adds.lo \
 	libshadow_la-shadowio.lo libshadow_la-shadowlog.lo \
 	libshadow_la-shadowmem.lo libshadow_la-shell.lo \
 	libshadow_la-spawn.lo libshadow_la-sssd.lo \
-	string/libshadow_la-sprintf.lo string/libshadow_la-stpecpy.lo \
-	string/libshadow_la-stpeprintf.lo \
-	string/libshadow_la-strftime.lo string/libshadow_la-strtcpy.lo \
-	libshadow_la-strtoday.lo libshadow_la-sub.lo \
-	libshadow_la-subordinateio.lo libshadow_la-sulog.lo \
-	time/libshadow_la-day_to_str.lo libshadow_la-ttytype.lo \
-	libshadow_la-tz.lo libshadow_la-ulimit.lo \
-	libshadow_la-user_busy.lo libshadow_la-valid.lo \
-	libshadow_la-write_full.lo libshadow_la-xgetpwnam.lo \
-	libshadow_la-xprefix_getpwnam.lo libshadow_la-xgetpwuid.lo \
-	libshadow_la-xgetgrnam.lo libshadow_la-xgetgrgid.lo \
-	libshadow_la-xgetspnam.lo libshadow_la-yesno.lo \
-	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
-	$(am__objects_4) $(am__objects_5) $(am__objects_6)
+	string/memset/libshadow_la-memzero.lo \
+	string/sprintf/libshadow_la-snprintf.lo \
+	string/sprintf/libshadow_la-stpeprintf.lo \
+	string/sprintf/libshadow_la-xasprintf.lo \
+	string/strchr/libshadow_la-strchrcnt.lo \
+	string/strchr/libshadow_la-stpspn.lo \
+	string/strchr/libshadow_la-strnul.lo \
+	string/strchr/libshadow_la-strrspn.lo \
+	string/strcmp/libshadow_la-streq.lo \
+	string/strcpy/libshadow_la-stpecpy.lo \
+	string/strcpy/libshadow_la-strncat.lo \
+	string/strcpy/libshadow_la-strncpy.lo \
+	string/strcpy/libshadow_la-strtcpy.lo \
+	string/strdup/libshadow_la-strndupa.lo \
+	string/strdup/libshadow_la-xstrdup.lo \
+	string/strdup/libshadow_la-xstrndup.lo \
+	string/libshadow_la-strftime.lo \
+	string/strtok/libshadow_la-stpsep.lo libshadow_la-strtoday.lo \
+	libshadow_la-sub.lo libshadow_la-subordinateio.lo \
+	libshadow_la-sulog.lo time/libshadow_la-day_to_str.lo \
+	libshadow_la-ttytype.lo libshadow_la-tz.lo \
+	libshadow_la-ulimit.lo libshadow_la-user_busy.lo \
+	libshadow_la-valid.lo libshadow_la-write_full.lo \
+	libshadow_la-xgetpwnam.lo libshadow_la-xprefix_getpwnam.lo \
+	libshadow_la-xgetpwuid.lo libshadow_la-xgetgrnam.lo \
+	libshadow_la-xgetgrgid.lo libshadow_la-xgetspnam.lo \
+	libshadow_la-yesno.lo $(am__objects_1) $(am__objects_2) \
+	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
+	$(am__objects_6)
 libshadow_la_OBJECTS = $(am_libshadow_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -246,7 +299,6 @@ am__depfiles_remade = ./$(DEPDIR)/libshadow_la-addgrps.Plo \
 	./$(DEPDIR)/libshadow_la-adds.Plo \
 	./$(DEPDIR)/libshadow_la-age.Plo \
 	./$(DEPDIR)/libshadow_la-agetpass.Plo \
-	./$(DEPDIR)/libshadow_la-alloc.Plo \
 	./$(DEPDIR)/libshadow_la-audit_help.Plo \
 	./$(DEPDIR)/libshadow_la-basename.Plo \
 	./$(DEPDIR)/libshadow_la-bit.Plo \
@@ -272,9 +324,7 @@ am__depfiles_remade = ./$(DEPDIR)/libshadow_la-addgrps.Plo \
 	./$(DEPDIR)/libshadow_la-find_new_uid.Plo \
 	./$(DEPDIR)/libshadow_la-fputsx.Plo \
 	./$(DEPDIR)/libshadow_la-freezero.Plo \
-	./$(DEPDIR)/libshadow_la-get_gid.Plo \
 	./$(DEPDIR)/libshadow_la-get_pid.Plo \
-	./$(DEPDIR)/libshadow_la-get_uid.Plo \
 	./$(DEPDIR)/libshadow_la-getdate.Plo \
 	./$(DEPDIR)/libshadow_la-getdef.Plo \
 	./$(DEPDIR)/libshadow_la-getgr_nam_gid.Plo \
@@ -293,7 +343,6 @@ am__depfiles_remade = ./$(DEPDIR)/libshadow_la-addgrps.Plo \
 	./$(DEPDIR)/libshadow_la-logind.Plo \
 	./$(DEPDIR)/libshadow_la-loginprompt.Plo \
 	./$(DEPDIR)/libshadow_la-mail.Plo \
-	./$(DEPDIR)/libshadow_la-memzero.Plo \
 	./$(DEPDIR)/libshadow_la-motd.Plo \
 	./$(DEPDIR)/libshadow_la-myname.Plo \
 	./$(DEPDIR)/libshadow_la-nscd.Plo \
@@ -348,15 +397,47 @@ am__depfiles_remade = ./$(DEPDIR)/libshadow_la-addgrps.Plo \
 	./$(DEPDIR)/libshadow_la-xgetspnam.Plo \
 	./$(DEPDIR)/libshadow_la-xprefix_getpwnam.Plo \
 	./$(DEPDIR)/libshadow_la-yesno.Plo \
-	atoi/$(DEPDIR)/libshadow_la-a2i.Plo \
-	atoi/$(DEPDIR)/libshadow_la-str2i.Plo \
-	atoi/$(DEPDIR)/libshadow_la-strtoi.Plo \
-	atoi/$(DEPDIR)/libshadow_la-strtou_noneg.Plo \
-	string/$(DEPDIR)/libshadow_la-sprintf.Plo \
-	string/$(DEPDIR)/libshadow_la-stpecpy.Plo \
-	string/$(DEPDIR)/libshadow_la-stpeprintf.Plo \
+	alloc/$(DEPDIR)/libshadow_la-calloc.Plo \
+	alloc/$(DEPDIR)/libshadow_la-malloc.Plo \
+	alloc/$(DEPDIR)/libshadow_la-realloc.Plo \
+	alloc/$(DEPDIR)/libshadow_la-reallocf.Plo \
+	alloc/x/$(DEPDIR)/libshadow_la-xcalloc.Plo \
+	alloc/x/$(DEPDIR)/libshadow_la-xmalloc.Plo \
+	alloc/x/$(DEPDIR)/libshadow_la-xrealloc.Plo \
+	atoi/$(DEPDIR)/libshadow_la-getnum.Plo \
+	atoi/a2i/$(DEPDIR)/libshadow_la-a2i.Plo \
+	atoi/a2i/$(DEPDIR)/libshadow_la-a2s.Plo \
+	atoi/a2i/$(DEPDIR)/libshadow_la-a2s_c.Plo \
+	atoi/a2i/$(DEPDIR)/libshadow_la-a2s_nc.Plo \
+	atoi/a2i/$(DEPDIR)/libshadow_la-a2u.Plo \
+	atoi/a2i/$(DEPDIR)/libshadow_la-a2u_c.Plo \
+	atoi/a2i/$(DEPDIR)/libshadow_la-a2u_nc.Plo \
+	atoi/str2i/$(DEPDIR)/libshadow_la-str2i.Plo \
+	atoi/str2i/$(DEPDIR)/libshadow_la-str2s.Plo \
+	atoi/str2i/$(DEPDIR)/libshadow_la-str2u.Plo \
+	atoi/strtoi/$(DEPDIR)/libshadow_la-strtoi.Plo \
+	atoi/strtoi/$(DEPDIR)/libshadow_la-strtou.Plo \
+	atoi/strtoi/$(DEPDIR)/libshadow_la-strtou_noneg.Plo \
+	fs/readlink/$(DEPDIR)/libshadow_la-areadlink.Plo \
+	fs/readlink/$(DEPDIR)/libshadow_la-readlinknul.Plo \
 	string/$(DEPDIR)/libshadow_la-strftime.Plo \
-	string/$(DEPDIR)/libshadow_la-strtcpy.Plo \
+	string/memset/$(DEPDIR)/libshadow_la-memzero.Plo \
+	string/sprintf/$(DEPDIR)/libshadow_la-snprintf.Plo \
+	string/sprintf/$(DEPDIR)/libshadow_la-stpeprintf.Plo \
+	string/sprintf/$(DEPDIR)/libshadow_la-xasprintf.Plo \
+	string/strchr/$(DEPDIR)/libshadow_la-stpspn.Plo \
+	string/strchr/$(DEPDIR)/libshadow_la-strchrcnt.Plo \
+	string/strchr/$(DEPDIR)/libshadow_la-strnul.Plo \
+	string/strchr/$(DEPDIR)/libshadow_la-strrspn.Plo \
+	string/strcmp/$(DEPDIR)/libshadow_la-streq.Plo \
+	string/strcpy/$(DEPDIR)/libshadow_la-stpecpy.Plo \
+	string/strcpy/$(DEPDIR)/libshadow_la-strncat.Plo \
+	string/strcpy/$(DEPDIR)/libshadow_la-strncpy.Plo \
+	string/strcpy/$(DEPDIR)/libshadow_la-strtcpy.Plo \
+	string/strdup/$(DEPDIR)/libshadow_la-strndupa.Plo \
+	string/strdup/$(DEPDIR)/libshadow_la-xstrdup.Plo \
+	string/strdup/$(DEPDIR)/libshadow_la-xstrndup.Plo \
+	string/strtok/$(DEPDIR)/libshadow_la-stpsep.Plo \
 	time/$(DEPDIR)/libshadow_la-day_to_str.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -602,38 +683,64 @@ libshadow_la_CPPFLAGS = $(ECONF_CPPFLAGS) $(am__append_1) \
 libshadow_la_CFLAGS = $(LIBBSD_CFLAGS) $(LIBCRYPT_PAM) $(LIBSYSTEMD)
 libshadow_la_LIBADD = $(LIBADD_DLOPEN)
 libshadow_la_SOURCES = addgrps.c adds.c adds.h age.c agetpass.c \
-	agetpass.h alloc.c alloc.h atoi/a2i.c atoi/a2i.h atoi/str2i.c \
-	atoi/str2i.h atoi/strtoi.c atoi/strtoi.h atoi/strtou_noneg.c \
-	atoi/strtou_noneg.h attr.h audit_help.c basename.c bit.c bit.h \
-	cast.h chkname.c chkname.h chowndir.c chowntty.c cleanup.c \
-	cleanup_group.c cleanup_user.c commonio.c commonio.h console.c \
-	copydir.c csrand.c defines.h encrypt.c env.c exitcodes.h \
-	faillog.h failure.c failure.h fd.c fields.c find_new_gid.c \
-	find_new_uid.c find_new_sub_gids.c find_new_sub_uids.c \
-	fputsx.c get_gid.c get_pid.c get_uid.c getdate.h getdate.y \
+	agetpass.h alloc/calloc.c alloc/calloc.h alloc/malloc.c \
+	alloc/malloc.h alloc/realloc.c alloc/realloc.h \
+	alloc/reallocf.c alloc/reallocf.h alloc/x/xcalloc.c \
+	alloc/x/xcalloc.h alloc/x/xmalloc.c alloc/x/xmalloc.h \
+	alloc/x/xrealloc.c alloc/x/xrealloc.h atoi/a2i/a2i.c \
+	atoi/a2i/a2i.h atoi/a2i/a2s.c atoi/a2i/a2s.h atoi/a2i/a2s_c.c \
+	atoi/a2i/a2s_c.h atoi/a2i/a2s_nc.c atoi/a2i/a2s_nc.h \
+	atoi/a2i/a2u.c atoi/a2i/a2u.h atoi/a2i/a2u_c.c \
+	atoi/a2i/a2u_c.h atoi/a2i/a2u_nc.c atoi/a2i/a2u_nc.h \
+	atoi/getnum.c atoi/getnum.h atoi/str2i/str2i.c \
+	atoi/str2i/str2i.h atoi/str2i/str2s.c atoi/str2i/str2s.h \
+	atoi/str2i/str2u.c atoi/str2i/str2u.h atoi/strtoi/strtoi.c \
+	atoi/strtoi/strtoi.h atoi/strtoi/strtou.c atoi/strtoi/strtou.h \
+	atoi/strtoi/strtou_noneg.c atoi/strtoi/strtou_noneg.h attr.h \
+	audit_help.c basename.c bit.c bit.h cast.h chkname.c chkname.h \
+	chowndir.c chowntty.c cleanup.c cleanup_group.c cleanup_user.c \
+	commonio.c commonio.h console.c copydir.c csrand.c defines.h \
+	encrypt.c env.c exitcodes.h faillog.h failure.c failure.h fd.c \
+	fields.c find_new_gid.c find_new_uid.c find_new_sub_gids.c \
+	find_new_sub_uids.c fputsx.c fs/readlink/areadlink.c \
+	fs/readlink/areadlink.h fs/readlink/readlinknul.c \
+	fs/readlink/readlinknul.h get_pid.c getdate.h getdate.y \
 	getdef.c getdef.h getgr_nam_gid.c getrange.c gettime.c \
 	groupio.c groupmem.c groupio.h gshadow.c hushed.c idmapping.h \
 	idmapping.c isexpired.c limits.c list.c lockpw.c loginprompt.c \
-	mail.c memzero.c memzero.h motd.c must_be.h myname.c nss.c \
-	nscd.c nscd.h obscure.c pam_defs.h pam_pass.c \
-	pam_pass_non_interactive.c port.c port.h prefix_flag.c \
-	prototypes.h pwauth.c pwauth.h pwio.c pwio.h pwd_init.c \
-	pwd2spwd.c pwdcheck.c pwmem.c remove_tree.c root_flag.c \
-	run_part.h run_part.c salt.c selinux.c semanage.c setugid.c \
-	setupenv.c sgetgrent.c sgetpwent.c sgetspent.c sgroupio.c \
-	sgroupio.h shadow.c shadowio.c shadowio.h shadowlog.c \
-	shadowlog.h shadowlog_internal.h shadowmem.c shell.c sizeof.h \
-	spawn.c sssd.c sssd.h string/sprintf.c string/sprintf.h \
-	string/stpecpy.c string/stpecpy.h string/stpeprintf.c \
-	string/stpeprintf.h string/strftime.c string/strftime.h \
-	string/strncpy.h string/strtcpy.c string/strtcpy.h \
-	string/zustr2stp.h strtoday.c sub.c subordinateio.h \
-	subordinateio.c sulog.c time/day_to_str.c time/day_to_str.h \
-	ttytype.c tz.c ulimit.c user_busy.c valid.c write_full.c \
-	xgetpwnam.c xprefix_getpwnam.c xgetpwuid.c xgetgrnam.c \
-	xgetgrgid.c xgetspnam.c yesno.c $(am__append_2) \
-	$(am__append_3) $(am__append_4) $(am__append_5) \
-	$(am__append_6) $(am__append_7)
+	mail.c motd.c must_be.h myname.c nss.c nscd.c nscd.h obscure.c \
+	pam_defs.h pam_pass.c pam_pass_non_interactive.c port.c port.h \
+	prefix_flag.c prototypes.h pwauth.c pwauth.h pwio.c pwio.h \
+	pwd_init.c pwd2spwd.c pwdcheck.c pwmem.c remove_tree.c \
+	root_flag.c run_part.h run_part.c salt.c selinux.c semanage.c \
+	setugid.c setupenv.c sgetgrent.c sgetpwent.c sgetspent.c \
+	sgroupio.c sgroupio.h shadow.c shadowio.c shadowio.h \
+	shadowlog.c shadowlog.h shadowlog_internal.h shadowmem.c \
+	shell.c sizeof.h spawn.c sssd.c sssd.h string/memset/memzero.c \
+	string/memset/memzero.h string/sprintf/snprintf.c \
+	string/sprintf/snprintf.h string/sprintf/stpeprintf.c \
+	string/sprintf/stpeprintf.h string/sprintf/xasprintf.c \
+	string/sprintf/xasprintf.h string/strchr/strchrcnt.c \
+	string/strchr/strchrcnt.h string/strchr/stpspn.c \
+	string/strchr/stpspn.h string/strchr/strnul.c \
+	string/strchr/strnul.h string/strchr/strrspn.c \
+	string/strchr/strrspn.h string/strcmp/streq.c \
+	string/strcmp/streq.h string/strcpy/stpecpy.c \
+	string/strcpy/stpecpy.h string/strcpy/strncat.c \
+	string/strcpy/strncat.h string/strcpy/strncpy.c \
+	string/strcpy/strncpy.h string/strcpy/strtcpy.c \
+	string/strcpy/strtcpy.h string/strdup/strndupa.c \
+	string/strdup/strndupa.h string/strdup/xstrdup.c \
+	string/strdup/xstrdup.h string/strdup/xstrndup.c \
+	string/strdup/xstrndup.h string/strftime.c string/strftime.h \
+	string/strtok/stpsep.c string/strtok/stpsep.h strtoday.c sub.c \
+	subordinateio.h subordinateio.c sulog.c time/day_to_str.c \
+	time/day_to_str.h ttytype.c typetraits.h tz.c ulimit.c \
+	user_busy.c valid.c write_full.c xgetpwnam.c \
+	xprefix_getpwnam.c xgetpwuid.c xgetgrnam.c xgetgrgid.c \
+	xgetspnam.c yesno.c $(am__append_2) $(am__append_3) \
+	$(am__append_4) $(am__append_5) $(am__append_6) \
+	$(am__append_7)
 
 # These files are unneeded for some reason, listed in
 # order of appearance:
@@ -688,36 +795,182 @@ clean-noinstLTLIBRARIES:
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
+alloc/$(am__dirstamp):
+	@$(MKDIR_P) alloc
+	@: > alloc/$(am__dirstamp)
+alloc/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) alloc/$(DEPDIR)
+	@: > alloc/$(DEPDIR)/$(am__dirstamp)
+alloc/libshadow_la-calloc.lo: alloc/$(am__dirstamp) \
+	alloc/$(DEPDIR)/$(am__dirstamp)
+alloc/libshadow_la-malloc.lo: alloc/$(am__dirstamp) \
+	alloc/$(DEPDIR)/$(am__dirstamp)
+alloc/libshadow_la-realloc.lo: alloc/$(am__dirstamp) \
+	alloc/$(DEPDIR)/$(am__dirstamp)
+alloc/libshadow_la-reallocf.lo: alloc/$(am__dirstamp) \
+	alloc/$(DEPDIR)/$(am__dirstamp)
+alloc/x/$(am__dirstamp):
+	@$(MKDIR_P) alloc/x
+	@: > alloc/x/$(am__dirstamp)
+alloc/x/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) alloc/x/$(DEPDIR)
+	@: > alloc/x/$(DEPDIR)/$(am__dirstamp)
+alloc/x/libshadow_la-xcalloc.lo: alloc/x/$(am__dirstamp) \
+	alloc/x/$(DEPDIR)/$(am__dirstamp)
+alloc/x/libshadow_la-xmalloc.lo: alloc/x/$(am__dirstamp) \
+	alloc/x/$(DEPDIR)/$(am__dirstamp)
+alloc/x/libshadow_la-xrealloc.lo: alloc/x/$(am__dirstamp) \
+	alloc/x/$(DEPDIR)/$(am__dirstamp)
+atoi/a2i/$(am__dirstamp):
+	@$(MKDIR_P) atoi/a2i
+	@: > atoi/a2i/$(am__dirstamp)
+atoi/a2i/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) atoi/a2i/$(DEPDIR)
+	@: > atoi/a2i/$(DEPDIR)/$(am__dirstamp)
+atoi/a2i/libshadow_la-a2i.lo: atoi/a2i/$(am__dirstamp) \
+	atoi/a2i/$(DEPDIR)/$(am__dirstamp)
+atoi/a2i/libshadow_la-a2s.lo: atoi/a2i/$(am__dirstamp) \
+	atoi/a2i/$(DEPDIR)/$(am__dirstamp)
+atoi/a2i/libshadow_la-a2s_c.lo: atoi/a2i/$(am__dirstamp) \
+	atoi/a2i/$(DEPDIR)/$(am__dirstamp)
+atoi/a2i/libshadow_la-a2s_nc.lo: atoi/a2i/$(am__dirstamp) \
+	atoi/a2i/$(DEPDIR)/$(am__dirstamp)
+atoi/a2i/libshadow_la-a2u.lo: atoi/a2i/$(am__dirstamp) \
+	atoi/a2i/$(DEPDIR)/$(am__dirstamp)
+atoi/a2i/libshadow_la-a2u_c.lo: atoi/a2i/$(am__dirstamp) \
+	atoi/a2i/$(DEPDIR)/$(am__dirstamp)
+atoi/a2i/libshadow_la-a2u_nc.lo: atoi/a2i/$(am__dirstamp) \
+	atoi/a2i/$(DEPDIR)/$(am__dirstamp)
 atoi/$(am__dirstamp):
 	@$(MKDIR_P) atoi
 	@: > atoi/$(am__dirstamp)
 atoi/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) atoi/$(DEPDIR)
 	@: > atoi/$(DEPDIR)/$(am__dirstamp)
-atoi/libshadow_la-a2i.lo: atoi/$(am__dirstamp) \
-	atoi/$(DEPDIR)/$(am__dirstamp)
-atoi/libshadow_la-str2i.lo: atoi/$(am__dirstamp) \
-	atoi/$(DEPDIR)/$(am__dirstamp)
-atoi/libshadow_la-strtoi.lo: atoi/$(am__dirstamp) \
-	atoi/$(DEPDIR)/$(am__dirstamp)
-atoi/libshadow_la-strtou_noneg.lo: atoi/$(am__dirstamp) \
+atoi/libshadow_la-getnum.lo: atoi/$(am__dirstamp) \
 	atoi/$(DEPDIR)/$(am__dirstamp)
+atoi/str2i/$(am__dirstamp):
+	@$(MKDIR_P) atoi/str2i
+	@: > atoi/str2i/$(am__dirstamp)
+atoi/str2i/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) atoi/str2i/$(DEPDIR)
+	@: > atoi/str2i/$(DEPDIR)/$(am__dirstamp)
+atoi/str2i/libshadow_la-str2i.lo: atoi/str2i/$(am__dirstamp) \
+	atoi/str2i/$(DEPDIR)/$(am__dirstamp)
+atoi/str2i/libshadow_la-str2s.lo: atoi/str2i/$(am__dirstamp) \
+	atoi/str2i/$(DEPDIR)/$(am__dirstamp)
+atoi/str2i/libshadow_la-str2u.lo: atoi/str2i/$(am__dirstamp) \
+	atoi/str2i/$(DEPDIR)/$(am__dirstamp)
+atoi/strtoi/$(am__dirstamp):
+	@$(MKDIR_P) atoi/strtoi
+	@: > atoi/strtoi/$(am__dirstamp)
+atoi/strtoi/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) atoi/strtoi/$(DEPDIR)
+	@: > atoi/strtoi/$(DEPDIR)/$(am__dirstamp)
+atoi/strtoi/libshadow_la-strtoi.lo: atoi/strtoi/$(am__dirstamp) \
+	atoi/strtoi/$(DEPDIR)/$(am__dirstamp)
+atoi/strtoi/libshadow_la-strtou.lo: atoi/strtoi/$(am__dirstamp) \
+	atoi/strtoi/$(DEPDIR)/$(am__dirstamp)
+atoi/strtoi/libshadow_la-strtou_noneg.lo: atoi/strtoi/$(am__dirstamp) \
+	atoi/strtoi/$(DEPDIR)/$(am__dirstamp)
+fs/readlink/$(am__dirstamp):
+	@$(MKDIR_P) fs/readlink
+	@: > fs/readlink/$(am__dirstamp)
+fs/readlink/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) fs/readlink/$(DEPDIR)
+	@: > fs/readlink/$(DEPDIR)/$(am__dirstamp)
+fs/readlink/libshadow_la-areadlink.lo: fs/readlink/$(am__dirstamp) \
+	fs/readlink/$(DEPDIR)/$(am__dirstamp)
+fs/readlink/libshadow_la-readlinknul.lo: fs/readlink/$(am__dirstamp) \
+	fs/readlink/$(DEPDIR)/$(am__dirstamp)
+string/memset/$(am__dirstamp):
+	@$(MKDIR_P) string/memset
+	@: > string/memset/$(am__dirstamp)
+string/memset/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) string/memset/$(DEPDIR)
+	@: > string/memset/$(DEPDIR)/$(am__dirstamp)
+string/memset/libshadow_la-memzero.lo: string/memset/$(am__dirstamp) \
+	string/memset/$(DEPDIR)/$(am__dirstamp)
+string/sprintf/$(am__dirstamp):
+	@$(MKDIR_P) string/sprintf
+	@: > string/sprintf/$(am__dirstamp)
+string/sprintf/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) string/sprintf/$(DEPDIR)
+	@: > string/sprintf/$(DEPDIR)/$(am__dirstamp)
+string/sprintf/libshadow_la-snprintf.lo:  \
+	string/sprintf/$(am__dirstamp) \
+	string/sprintf/$(DEPDIR)/$(am__dirstamp)
+string/sprintf/libshadow_la-stpeprintf.lo:  \
+	string/sprintf/$(am__dirstamp) \
+	string/sprintf/$(DEPDIR)/$(am__dirstamp)
+string/sprintf/libshadow_la-xasprintf.lo:  \
+	string/sprintf/$(am__dirstamp) \
+	string/sprintf/$(DEPDIR)/$(am__dirstamp)
+string/strchr/$(am__dirstamp):
+	@$(MKDIR_P) string/strchr
+	@: > string/strchr/$(am__dirstamp)
+string/strchr/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) string/strchr/$(DEPDIR)
+	@: > string/strchr/$(DEPDIR)/$(am__dirstamp)
+string/strchr/libshadow_la-strchrcnt.lo:  \
+	string/strchr/$(am__dirstamp) \
+	string/strchr/$(DEPDIR)/$(am__dirstamp)
+string/strchr/libshadow_la-stpspn.lo: string/strchr/$(am__dirstamp) \
+	string/strchr/$(DEPDIR)/$(am__dirstamp)
+string/strchr/libshadow_la-strnul.lo: string/strchr/$(am__dirstamp) \
+	string/strchr/$(DEPDIR)/$(am__dirstamp)
+string/strchr/libshadow_la-strrspn.lo: string/strchr/$(am__dirstamp) \
+	string/strchr/$(DEPDIR)/$(am__dirstamp)
+string/strcmp/$(am__dirstamp):
+	@$(MKDIR_P) string/strcmp
+	@: > string/strcmp/$(am__dirstamp)
+string/strcmp/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) string/strcmp/$(DEPDIR)
+	@: > string/strcmp/$(DEPDIR)/$(am__dirstamp)
+string/strcmp/libshadow_la-streq.lo: string/strcmp/$(am__dirstamp) \
+	string/strcmp/$(DEPDIR)/$(am__dirstamp)
+string/strcpy/$(am__dirstamp):
+	@$(MKDIR_P) string/strcpy
+	@: > string/strcpy/$(am__dirstamp)
+string/strcpy/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) string/strcpy/$(DEPDIR)
+	@: > string/strcpy/$(DEPDIR)/$(am__dirstamp)
+string/strcpy/libshadow_la-stpecpy.lo: string/strcpy/$(am__dirstamp) \
+	string/strcpy/$(DEPDIR)/$(am__dirstamp)
+string/strcpy/libshadow_la-strncat.lo: string/strcpy/$(am__dirstamp) \
+	string/strcpy/$(DEPDIR)/$(am__dirstamp)
+string/strcpy/libshadow_la-strncpy.lo: string/strcpy/$(am__dirstamp) \
+	string/strcpy/$(DEPDIR)/$(am__dirstamp)
+string/strcpy/libshadow_la-strtcpy.lo: string/strcpy/$(am__dirstamp) \
+	string/strcpy/$(DEPDIR)/$(am__dirstamp)
+string/strdup/$(am__dirstamp):
+	@$(MKDIR_P) string/strdup
+	@: > string/strdup/$(am__dirstamp)
+string/strdup/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) string/strdup/$(DEPDIR)
+	@: > string/strdup/$(DEPDIR)/$(am__dirstamp)
+string/strdup/libshadow_la-strndupa.lo: string/strdup/$(am__dirstamp) \
+	string/strdup/$(DEPDIR)/$(am__dirstamp)
+string/strdup/libshadow_la-xstrdup.lo: string/strdup/$(am__dirstamp) \
+	string/strdup/$(DEPDIR)/$(am__dirstamp)
+string/strdup/libshadow_la-xstrndup.lo: string/strdup/$(am__dirstamp) \
+	string/strdup/$(DEPDIR)/$(am__dirstamp)
 string/$(am__dirstamp):
 	@$(MKDIR_P) string
 	@: > string/$(am__dirstamp)
 string/$(DEPDIR)/$(am__dirstamp):
 	@$(MKDIR_P) string/$(DEPDIR)
 	@: > string/$(DEPDIR)/$(am__dirstamp)
-string/libshadow_la-sprintf.lo: string/$(am__dirstamp) \
-	string/$(DEPDIR)/$(am__dirstamp)
-string/libshadow_la-stpecpy.lo: string/$(am__dirstamp) \
-	string/$(DEPDIR)/$(am__dirstamp)
-string/libshadow_la-stpeprintf.lo: string/$(am__dirstamp) \
-	string/$(DEPDIR)/$(am__dirstamp)
 string/libshadow_la-strftime.lo: string/$(am__dirstamp) \
 	string/$(DEPDIR)/$(am__dirstamp)
-string/libshadow_la-strtcpy.lo: string/$(am__dirstamp) \
-	string/$(DEPDIR)/$(am__dirstamp)
+string/strtok/$(am__dirstamp):
+	@$(MKDIR_P) string/strtok
+	@: > string/strtok/$(am__dirstamp)
+string/strtok/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) string/strtok/$(DEPDIR)
+	@: > string/strtok/$(DEPDIR)/$(am__dirstamp)
+string/strtok/libshadow_la-stpsep.lo: string/strtok/$(am__dirstamp) \
+	string/strtok/$(DEPDIR)/$(am__dirstamp)
 time/$(am__dirstamp):
 	@$(MKDIR_P) time
 	@: > time/$(am__dirstamp)
@@ -732,10 +985,36 @@ libshadow.la: $(libshadow_la_OBJECTS) $(libshadow_la_DEPENDENCIES) $(EXTRA_libsh
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f alloc/*.$(OBJEXT)
+	-rm -f alloc/*.lo
+	-rm -f alloc/x/*.$(OBJEXT)
+	-rm -f alloc/x/*.lo
 	-rm -f atoi/*.$(OBJEXT)
 	-rm -f atoi/*.lo
+	-rm -f atoi/a2i/*.$(OBJEXT)
+	-rm -f atoi/a2i/*.lo
+	-rm -f atoi/str2i/*.$(OBJEXT)
+	-rm -f atoi/str2i/*.lo
+	-rm -f atoi/strtoi/*.$(OBJEXT)
+	-rm -f atoi/strtoi/*.lo
+	-rm -f fs/readlink/*.$(OBJEXT)
+	-rm -f fs/readlink/*.lo
 	-rm -f string/*.$(OBJEXT)
 	-rm -f string/*.lo
+	-rm -f string/memset/*.$(OBJEXT)
+	-rm -f string/memset/*.lo
+	-rm -f string/sprintf/*.$(OBJEXT)
+	-rm -f string/sprintf/*.lo
+	-rm -f string/strchr/*.$(OBJEXT)
+	-rm -f string/strchr/*.lo
+	-rm -f string/strcmp/*.$(OBJEXT)
+	-rm -f string/strcmp/*.lo
+	-rm -f string/strcpy/*.$(OBJEXT)
+	-rm -f string/strcpy/*.lo
+	-rm -f string/strdup/*.$(OBJEXT)
+	-rm -f string/strdup/*.lo
+	-rm -f string/strtok/*.$(OBJEXT)
+	-rm -f string/strtok/*.lo
 	-rm -f time/*.$(OBJEXT)
 	-rm -f time/*.lo
 
@@ -746,7 +1025,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-adds.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-age.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-agetpass.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-alloc.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-audit_help.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-basename.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-bit.Plo@am__quote@ # am--include-marker
@@ -772,9 +1050,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-find_new_uid.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-fputsx.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-freezero.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-get_gid.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-get_pid.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-get_uid.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-getdate.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-getdef.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-getgr_nam_gid.Plo@am__quote@ # am--include-marker
@@ -793,7 +1069,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-logind.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-loginprompt.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-mail.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-memzero.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-motd.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-myname.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-nscd.Plo@am__quote@ # am--include-marker
@@ -848,15 +1123,47 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-xgetspnam.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-xprefix_getpwnam.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshadow_la-yesno.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@atoi/$(DEPDIR)/libshadow_la-a2i.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@atoi/$(DEPDIR)/libshadow_la-str2i.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@atoi/$(DEPDIR)/libshadow_la-strtoi.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@atoi/$(DEPDIR)/libshadow_la-strtou_noneg.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@string/$(DEPDIR)/libshadow_la-sprintf.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@string/$(DEPDIR)/libshadow_la-stpecpy.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@string/$(DEPDIR)/libshadow_la-stpeprintf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@alloc/$(DEPDIR)/libshadow_la-calloc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@alloc/$(DEPDIR)/libshadow_la-malloc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@alloc/$(DEPDIR)/libshadow_la-realloc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@alloc/$(DEPDIR)/libshadow_la-reallocf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@alloc/x/$(DEPDIR)/libshadow_la-xcalloc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@alloc/x/$(DEPDIR)/libshadow_la-xmalloc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@alloc/x/$(DEPDIR)/libshadow_la-xrealloc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@atoi/$(DEPDIR)/libshadow_la-getnum.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@atoi/a2i/$(DEPDIR)/libshadow_la-a2i.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@atoi/a2i/$(DEPDIR)/libshadow_la-a2s.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@atoi/a2i/$(DEPDIR)/libshadow_la-a2s_c.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@atoi/a2i/$(DEPDIR)/libshadow_la-a2s_nc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@atoi/a2i/$(DEPDIR)/libshadow_la-a2u.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@atoi/a2i/$(DEPDIR)/libshadow_la-a2u_c.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@atoi/a2i/$(DEPDIR)/libshadow_la-a2u_nc.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@atoi/str2i/$(DEPDIR)/libshadow_la-str2i.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@atoi/str2i/$(DEPDIR)/libshadow_la-str2s.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@atoi/str2i/$(DEPDIR)/libshadow_la-str2u.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@atoi/strtoi/$(DEPDIR)/libshadow_la-strtoi.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@atoi/strtoi/$(DEPDIR)/libshadow_la-strtou.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@atoi/strtoi/$(DEPDIR)/libshadow_la-strtou_noneg.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@fs/readlink/$(DEPDIR)/libshadow_la-areadlink.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@fs/readlink/$(DEPDIR)/libshadow_la-readlinknul.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@string/$(DEPDIR)/libshadow_la-strftime.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@string/$(DEPDIR)/libshadow_la-strtcpy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/memset/$(DEPDIR)/libshadow_la-memzero.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/sprintf/$(DEPDIR)/libshadow_la-snprintf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/sprintf/$(DEPDIR)/libshadow_la-stpeprintf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/sprintf/$(DEPDIR)/libshadow_la-xasprintf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/strchr/$(DEPDIR)/libshadow_la-stpspn.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/strchr/$(DEPDIR)/libshadow_la-strchrcnt.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/strchr/$(DEPDIR)/libshadow_la-strnul.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/strchr/$(DEPDIR)/libshadow_la-strrspn.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/strcmp/$(DEPDIR)/libshadow_la-streq.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/strcpy/$(DEPDIR)/libshadow_la-stpecpy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/strcpy/$(DEPDIR)/libshadow_la-strncat.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/strcpy/$(DEPDIR)/libshadow_la-strncpy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/strcpy/$(DEPDIR)/libshadow_la-strtcpy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/strdup/$(DEPDIR)/libshadow_la-strndupa.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/strdup/$(DEPDIR)/libshadow_la-xstrdup.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/strdup/$(DEPDIR)/libshadow_la-xstrndup.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@string/strtok/$(DEPDIR)/libshadow_la-stpsep.Plo@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@time/$(DEPDIR)/libshadow_la-day_to_str.Plo@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
@@ -917,40 +1224,152 @@ libshadow_la-agetpass.lo: agetpass.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o libshadow_la-agetpass.lo `test -f 'agetpass.c' || echo '$(srcdir)/'`agetpass.c
 
-libshadow_la-alloc.lo: alloc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT libshadow_la-alloc.lo -MD -MP -MF $(DEPDIR)/libshadow_la-alloc.Tpo -c -o libshadow_la-alloc.lo `test -f 'alloc.c' || echo '$(srcdir)/'`alloc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libshadow_la-alloc.Tpo $(DEPDIR)/libshadow_la-alloc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='alloc.c' object='libshadow_la-alloc.lo' libtool=yes @AMDEPBACKSLASH@
+alloc/libshadow_la-calloc.lo: alloc/calloc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT alloc/libshadow_la-calloc.lo -MD -MP -MF alloc/$(DEPDIR)/libshadow_la-calloc.Tpo -c -o alloc/libshadow_la-calloc.lo `test -f 'alloc/calloc.c' || echo '$(srcdir)/'`alloc/calloc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) alloc/$(DEPDIR)/libshadow_la-calloc.Tpo alloc/$(DEPDIR)/libshadow_la-calloc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='alloc/calloc.c' object='alloc/libshadow_la-calloc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o libshadow_la-alloc.lo `test -f 'alloc.c' || echo '$(srcdir)/'`alloc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o alloc/libshadow_la-calloc.lo `test -f 'alloc/calloc.c' || echo '$(srcdir)/'`alloc/calloc.c
 
-atoi/libshadow_la-a2i.lo: atoi/a2i.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/libshadow_la-a2i.lo -MD -MP -MF atoi/$(DEPDIR)/libshadow_la-a2i.Tpo -c -o atoi/libshadow_la-a2i.lo `test -f 'atoi/a2i.c' || echo '$(srcdir)/'`atoi/a2i.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/$(DEPDIR)/libshadow_la-a2i.Tpo atoi/$(DEPDIR)/libshadow_la-a2i.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/a2i.c' object='atoi/libshadow_la-a2i.lo' libtool=yes @AMDEPBACKSLASH@
+alloc/libshadow_la-malloc.lo: alloc/malloc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT alloc/libshadow_la-malloc.lo -MD -MP -MF alloc/$(DEPDIR)/libshadow_la-malloc.Tpo -c -o alloc/libshadow_la-malloc.lo `test -f 'alloc/malloc.c' || echo '$(srcdir)/'`alloc/malloc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) alloc/$(DEPDIR)/libshadow_la-malloc.Tpo alloc/$(DEPDIR)/libshadow_la-malloc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='alloc/malloc.c' object='alloc/libshadow_la-malloc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/libshadow_la-a2i.lo `test -f 'atoi/a2i.c' || echo '$(srcdir)/'`atoi/a2i.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o alloc/libshadow_la-malloc.lo `test -f 'alloc/malloc.c' || echo '$(srcdir)/'`alloc/malloc.c
 
-atoi/libshadow_la-str2i.lo: atoi/str2i.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/libshadow_la-str2i.lo -MD -MP -MF atoi/$(DEPDIR)/libshadow_la-str2i.Tpo -c -o atoi/libshadow_la-str2i.lo `test -f 'atoi/str2i.c' || echo '$(srcdir)/'`atoi/str2i.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/$(DEPDIR)/libshadow_la-str2i.Tpo atoi/$(DEPDIR)/libshadow_la-str2i.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/str2i.c' object='atoi/libshadow_la-str2i.lo' libtool=yes @AMDEPBACKSLASH@
+alloc/libshadow_la-realloc.lo: alloc/realloc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT alloc/libshadow_la-realloc.lo -MD -MP -MF alloc/$(DEPDIR)/libshadow_la-realloc.Tpo -c -o alloc/libshadow_la-realloc.lo `test -f 'alloc/realloc.c' || echo '$(srcdir)/'`alloc/realloc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) alloc/$(DEPDIR)/libshadow_la-realloc.Tpo alloc/$(DEPDIR)/libshadow_la-realloc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='alloc/realloc.c' object='alloc/libshadow_la-realloc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/libshadow_la-str2i.lo `test -f 'atoi/str2i.c' || echo '$(srcdir)/'`atoi/str2i.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o alloc/libshadow_la-realloc.lo `test -f 'alloc/realloc.c' || echo '$(srcdir)/'`alloc/realloc.c
 
-atoi/libshadow_la-strtoi.lo: atoi/strtoi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/libshadow_la-strtoi.lo -MD -MP -MF atoi/$(DEPDIR)/libshadow_la-strtoi.Tpo -c -o atoi/libshadow_la-strtoi.lo `test -f 'atoi/strtoi.c' || echo '$(srcdir)/'`atoi/strtoi.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/$(DEPDIR)/libshadow_la-strtoi.Tpo atoi/$(DEPDIR)/libshadow_la-strtoi.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/strtoi.c' object='atoi/libshadow_la-strtoi.lo' libtool=yes @AMDEPBACKSLASH@
+alloc/libshadow_la-reallocf.lo: alloc/reallocf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT alloc/libshadow_la-reallocf.lo -MD -MP -MF alloc/$(DEPDIR)/libshadow_la-reallocf.Tpo -c -o alloc/libshadow_la-reallocf.lo `test -f 'alloc/reallocf.c' || echo '$(srcdir)/'`alloc/reallocf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) alloc/$(DEPDIR)/libshadow_la-reallocf.Tpo alloc/$(DEPDIR)/libshadow_la-reallocf.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='alloc/reallocf.c' object='alloc/libshadow_la-reallocf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/libshadow_la-strtoi.lo `test -f 'atoi/strtoi.c' || echo '$(srcdir)/'`atoi/strtoi.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o alloc/libshadow_la-reallocf.lo `test -f 'alloc/reallocf.c' || echo '$(srcdir)/'`alloc/reallocf.c
 
-atoi/libshadow_la-strtou_noneg.lo: atoi/strtou_noneg.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/libshadow_la-strtou_noneg.lo -MD -MP -MF atoi/$(DEPDIR)/libshadow_la-strtou_noneg.Tpo -c -o atoi/libshadow_la-strtou_noneg.lo `test -f 'atoi/strtou_noneg.c' || echo '$(srcdir)/'`atoi/strtou_noneg.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/$(DEPDIR)/libshadow_la-strtou_noneg.Tpo atoi/$(DEPDIR)/libshadow_la-strtou_noneg.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/strtou_noneg.c' object='atoi/libshadow_la-strtou_noneg.lo' libtool=yes @AMDEPBACKSLASH@
+alloc/x/libshadow_la-xcalloc.lo: alloc/x/xcalloc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT alloc/x/libshadow_la-xcalloc.lo -MD -MP -MF alloc/x/$(DEPDIR)/libshadow_la-xcalloc.Tpo -c -o alloc/x/libshadow_la-xcalloc.lo `test -f 'alloc/x/xcalloc.c' || echo '$(srcdir)/'`alloc/x/xcalloc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) alloc/x/$(DEPDIR)/libshadow_la-xcalloc.Tpo alloc/x/$(DEPDIR)/libshadow_la-xcalloc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='alloc/x/xcalloc.c' object='alloc/x/libshadow_la-xcalloc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/libshadow_la-strtou_noneg.lo `test -f 'atoi/strtou_noneg.c' || echo '$(srcdir)/'`atoi/strtou_noneg.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o alloc/x/libshadow_la-xcalloc.lo `test -f 'alloc/x/xcalloc.c' || echo '$(srcdir)/'`alloc/x/xcalloc.c
+
+alloc/x/libshadow_la-xmalloc.lo: alloc/x/xmalloc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT alloc/x/libshadow_la-xmalloc.lo -MD -MP -MF alloc/x/$(DEPDIR)/libshadow_la-xmalloc.Tpo -c -o alloc/x/libshadow_la-xmalloc.lo `test -f 'alloc/x/xmalloc.c' || echo '$(srcdir)/'`alloc/x/xmalloc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) alloc/x/$(DEPDIR)/libshadow_la-xmalloc.Tpo alloc/x/$(DEPDIR)/libshadow_la-xmalloc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='alloc/x/xmalloc.c' object='alloc/x/libshadow_la-xmalloc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o alloc/x/libshadow_la-xmalloc.lo `test -f 'alloc/x/xmalloc.c' || echo '$(srcdir)/'`alloc/x/xmalloc.c
+
+alloc/x/libshadow_la-xrealloc.lo: alloc/x/xrealloc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT alloc/x/libshadow_la-xrealloc.lo -MD -MP -MF alloc/x/$(DEPDIR)/libshadow_la-xrealloc.Tpo -c -o alloc/x/libshadow_la-xrealloc.lo `test -f 'alloc/x/xrealloc.c' || echo '$(srcdir)/'`alloc/x/xrealloc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) alloc/x/$(DEPDIR)/libshadow_la-xrealloc.Tpo alloc/x/$(DEPDIR)/libshadow_la-xrealloc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='alloc/x/xrealloc.c' object='alloc/x/libshadow_la-xrealloc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o alloc/x/libshadow_la-xrealloc.lo `test -f 'alloc/x/xrealloc.c' || echo '$(srcdir)/'`alloc/x/xrealloc.c
+
+atoi/a2i/libshadow_la-a2i.lo: atoi/a2i/a2i.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/a2i/libshadow_la-a2i.lo -MD -MP -MF atoi/a2i/$(DEPDIR)/libshadow_la-a2i.Tpo -c -o atoi/a2i/libshadow_la-a2i.lo `test -f 'atoi/a2i/a2i.c' || echo '$(srcdir)/'`atoi/a2i/a2i.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/a2i/$(DEPDIR)/libshadow_la-a2i.Tpo atoi/a2i/$(DEPDIR)/libshadow_la-a2i.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/a2i/a2i.c' object='atoi/a2i/libshadow_la-a2i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/a2i/libshadow_la-a2i.lo `test -f 'atoi/a2i/a2i.c' || echo '$(srcdir)/'`atoi/a2i/a2i.c
+
+atoi/a2i/libshadow_la-a2s.lo: atoi/a2i/a2s.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/a2i/libshadow_la-a2s.lo -MD -MP -MF atoi/a2i/$(DEPDIR)/libshadow_la-a2s.Tpo -c -o atoi/a2i/libshadow_la-a2s.lo `test -f 'atoi/a2i/a2s.c' || echo '$(srcdir)/'`atoi/a2i/a2s.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/a2i/$(DEPDIR)/libshadow_la-a2s.Tpo atoi/a2i/$(DEPDIR)/libshadow_la-a2s.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/a2i/a2s.c' object='atoi/a2i/libshadow_la-a2s.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/a2i/libshadow_la-a2s.lo `test -f 'atoi/a2i/a2s.c' || echo '$(srcdir)/'`atoi/a2i/a2s.c
+
+atoi/a2i/libshadow_la-a2s_c.lo: atoi/a2i/a2s_c.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/a2i/libshadow_la-a2s_c.lo -MD -MP -MF atoi/a2i/$(DEPDIR)/libshadow_la-a2s_c.Tpo -c -o atoi/a2i/libshadow_la-a2s_c.lo `test -f 'atoi/a2i/a2s_c.c' || echo '$(srcdir)/'`atoi/a2i/a2s_c.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/a2i/$(DEPDIR)/libshadow_la-a2s_c.Tpo atoi/a2i/$(DEPDIR)/libshadow_la-a2s_c.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/a2i/a2s_c.c' object='atoi/a2i/libshadow_la-a2s_c.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/a2i/libshadow_la-a2s_c.lo `test -f 'atoi/a2i/a2s_c.c' || echo '$(srcdir)/'`atoi/a2i/a2s_c.c
+
+atoi/a2i/libshadow_la-a2s_nc.lo: atoi/a2i/a2s_nc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/a2i/libshadow_la-a2s_nc.lo -MD -MP -MF atoi/a2i/$(DEPDIR)/libshadow_la-a2s_nc.Tpo -c -o atoi/a2i/libshadow_la-a2s_nc.lo `test -f 'atoi/a2i/a2s_nc.c' || echo '$(srcdir)/'`atoi/a2i/a2s_nc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/a2i/$(DEPDIR)/libshadow_la-a2s_nc.Tpo atoi/a2i/$(DEPDIR)/libshadow_la-a2s_nc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/a2i/a2s_nc.c' object='atoi/a2i/libshadow_la-a2s_nc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/a2i/libshadow_la-a2s_nc.lo `test -f 'atoi/a2i/a2s_nc.c' || echo '$(srcdir)/'`atoi/a2i/a2s_nc.c
+
+atoi/a2i/libshadow_la-a2u.lo: atoi/a2i/a2u.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/a2i/libshadow_la-a2u.lo -MD -MP -MF atoi/a2i/$(DEPDIR)/libshadow_la-a2u.Tpo -c -o atoi/a2i/libshadow_la-a2u.lo `test -f 'atoi/a2i/a2u.c' || echo '$(srcdir)/'`atoi/a2i/a2u.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/a2i/$(DEPDIR)/libshadow_la-a2u.Tpo atoi/a2i/$(DEPDIR)/libshadow_la-a2u.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/a2i/a2u.c' object='atoi/a2i/libshadow_la-a2u.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/a2i/libshadow_la-a2u.lo `test -f 'atoi/a2i/a2u.c' || echo '$(srcdir)/'`atoi/a2i/a2u.c
+
+atoi/a2i/libshadow_la-a2u_c.lo: atoi/a2i/a2u_c.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/a2i/libshadow_la-a2u_c.lo -MD -MP -MF atoi/a2i/$(DEPDIR)/libshadow_la-a2u_c.Tpo -c -o atoi/a2i/libshadow_la-a2u_c.lo `test -f 'atoi/a2i/a2u_c.c' || echo '$(srcdir)/'`atoi/a2i/a2u_c.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/a2i/$(DEPDIR)/libshadow_la-a2u_c.Tpo atoi/a2i/$(DEPDIR)/libshadow_la-a2u_c.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/a2i/a2u_c.c' object='atoi/a2i/libshadow_la-a2u_c.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/a2i/libshadow_la-a2u_c.lo `test -f 'atoi/a2i/a2u_c.c' || echo '$(srcdir)/'`atoi/a2i/a2u_c.c
+
+atoi/a2i/libshadow_la-a2u_nc.lo: atoi/a2i/a2u_nc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/a2i/libshadow_la-a2u_nc.lo -MD -MP -MF atoi/a2i/$(DEPDIR)/libshadow_la-a2u_nc.Tpo -c -o atoi/a2i/libshadow_la-a2u_nc.lo `test -f 'atoi/a2i/a2u_nc.c' || echo '$(srcdir)/'`atoi/a2i/a2u_nc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/a2i/$(DEPDIR)/libshadow_la-a2u_nc.Tpo atoi/a2i/$(DEPDIR)/libshadow_la-a2u_nc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/a2i/a2u_nc.c' object='atoi/a2i/libshadow_la-a2u_nc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/a2i/libshadow_la-a2u_nc.lo `test -f 'atoi/a2i/a2u_nc.c' || echo '$(srcdir)/'`atoi/a2i/a2u_nc.c
+
+atoi/libshadow_la-getnum.lo: atoi/getnum.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/libshadow_la-getnum.lo -MD -MP -MF atoi/$(DEPDIR)/libshadow_la-getnum.Tpo -c -o atoi/libshadow_la-getnum.lo `test -f 'atoi/getnum.c' || echo '$(srcdir)/'`atoi/getnum.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/$(DEPDIR)/libshadow_la-getnum.Tpo atoi/$(DEPDIR)/libshadow_la-getnum.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/getnum.c' object='atoi/libshadow_la-getnum.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/libshadow_la-getnum.lo `test -f 'atoi/getnum.c' || echo '$(srcdir)/'`atoi/getnum.c
+
+atoi/str2i/libshadow_la-str2i.lo: atoi/str2i/str2i.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/str2i/libshadow_la-str2i.lo -MD -MP -MF atoi/str2i/$(DEPDIR)/libshadow_la-str2i.Tpo -c -o atoi/str2i/libshadow_la-str2i.lo `test -f 'atoi/str2i/str2i.c' || echo '$(srcdir)/'`atoi/str2i/str2i.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/str2i/$(DEPDIR)/libshadow_la-str2i.Tpo atoi/str2i/$(DEPDIR)/libshadow_la-str2i.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/str2i/str2i.c' object='atoi/str2i/libshadow_la-str2i.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/str2i/libshadow_la-str2i.lo `test -f 'atoi/str2i/str2i.c' || echo '$(srcdir)/'`atoi/str2i/str2i.c
+
+atoi/str2i/libshadow_la-str2s.lo: atoi/str2i/str2s.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/str2i/libshadow_la-str2s.lo -MD -MP -MF atoi/str2i/$(DEPDIR)/libshadow_la-str2s.Tpo -c -o atoi/str2i/libshadow_la-str2s.lo `test -f 'atoi/str2i/str2s.c' || echo '$(srcdir)/'`atoi/str2i/str2s.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/str2i/$(DEPDIR)/libshadow_la-str2s.Tpo atoi/str2i/$(DEPDIR)/libshadow_la-str2s.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/str2i/str2s.c' object='atoi/str2i/libshadow_la-str2s.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/str2i/libshadow_la-str2s.lo `test -f 'atoi/str2i/str2s.c' || echo '$(srcdir)/'`atoi/str2i/str2s.c
+
+atoi/str2i/libshadow_la-str2u.lo: atoi/str2i/str2u.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/str2i/libshadow_la-str2u.lo -MD -MP -MF atoi/str2i/$(DEPDIR)/libshadow_la-str2u.Tpo -c -o atoi/str2i/libshadow_la-str2u.lo `test -f 'atoi/str2i/str2u.c' || echo '$(srcdir)/'`atoi/str2i/str2u.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/str2i/$(DEPDIR)/libshadow_la-str2u.Tpo atoi/str2i/$(DEPDIR)/libshadow_la-str2u.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/str2i/str2u.c' object='atoi/str2i/libshadow_la-str2u.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/str2i/libshadow_la-str2u.lo `test -f 'atoi/str2i/str2u.c' || echo '$(srcdir)/'`atoi/str2i/str2u.c
+
+atoi/strtoi/libshadow_la-strtoi.lo: atoi/strtoi/strtoi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/strtoi/libshadow_la-strtoi.lo -MD -MP -MF atoi/strtoi/$(DEPDIR)/libshadow_la-strtoi.Tpo -c -o atoi/strtoi/libshadow_la-strtoi.lo `test -f 'atoi/strtoi/strtoi.c' || echo '$(srcdir)/'`atoi/strtoi/strtoi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/strtoi/$(DEPDIR)/libshadow_la-strtoi.Tpo atoi/strtoi/$(DEPDIR)/libshadow_la-strtoi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/strtoi/strtoi.c' object='atoi/strtoi/libshadow_la-strtoi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/strtoi/libshadow_la-strtoi.lo `test -f 'atoi/strtoi/strtoi.c' || echo '$(srcdir)/'`atoi/strtoi/strtoi.c
+
+atoi/strtoi/libshadow_la-strtou.lo: atoi/strtoi/strtou.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/strtoi/libshadow_la-strtou.lo -MD -MP -MF atoi/strtoi/$(DEPDIR)/libshadow_la-strtou.Tpo -c -o atoi/strtoi/libshadow_la-strtou.lo `test -f 'atoi/strtoi/strtou.c' || echo '$(srcdir)/'`atoi/strtoi/strtou.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/strtoi/$(DEPDIR)/libshadow_la-strtou.Tpo atoi/strtoi/$(DEPDIR)/libshadow_la-strtou.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/strtoi/strtou.c' object='atoi/strtoi/libshadow_la-strtou.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/strtoi/libshadow_la-strtou.lo `test -f 'atoi/strtoi/strtou.c' || echo '$(srcdir)/'`atoi/strtoi/strtou.c
+
+atoi/strtoi/libshadow_la-strtou_noneg.lo: atoi/strtoi/strtou_noneg.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT atoi/strtoi/libshadow_la-strtou_noneg.lo -MD -MP -MF atoi/strtoi/$(DEPDIR)/libshadow_la-strtou_noneg.Tpo -c -o atoi/strtoi/libshadow_la-strtou_noneg.lo `test -f 'atoi/strtoi/strtou_noneg.c' || echo '$(srcdir)/'`atoi/strtoi/strtou_noneg.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) atoi/strtoi/$(DEPDIR)/libshadow_la-strtou_noneg.Tpo atoi/strtoi/$(DEPDIR)/libshadow_la-strtou_noneg.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='atoi/strtoi/strtou_noneg.c' object='atoi/strtoi/libshadow_la-strtou_noneg.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o atoi/strtoi/libshadow_la-strtou_noneg.lo `test -f 'atoi/strtoi/strtou_noneg.c' || echo '$(srcdir)/'`atoi/strtoi/strtou_noneg.c
 
 libshadow_la-audit_help.lo: audit_help.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT libshadow_la-audit_help.lo -MD -MP -MF $(DEPDIR)/libshadow_la-audit_help.Tpo -c -o libshadow_la-audit_help.lo `test -f 'audit_help.c' || echo '$(srcdir)/'`audit_help.c
@@ -1113,12 +1532,19 @@ libshadow_la-fputsx.lo: fputsx.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o libshadow_la-fputsx.lo `test -f 'fputsx.c' || echo '$(srcdir)/'`fputsx.c
 
-libshadow_la-get_gid.lo: get_gid.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT libshadow_la-get_gid.lo -MD -MP -MF $(DEPDIR)/libshadow_la-get_gid.Tpo -c -o libshadow_la-get_gid.lo `test -f 'get_gid.c' || echo '$(srcdir)/'`get_gid.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libshadow_la-get_gid.Tpo $(DEPDIR)/libshadow_la-get_gid.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='get_gid.c' object='libshadow_la-get_gid.lo' libtool=yes @AMDEPBACKSLASH@
+fs/readlink/libshadow_la-areadlink.lo: fs/readlink/areadlink.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT fs/readlink/libshadow_la-areadlink.lo -MD -MP -MF fs/readlink/$(DEPDIR)/libshadow_la-areadlink.Tpo -c -o fs/readlink/libshadow_la-areadlink.lo `test -f 'fs/readlink/areadlink.c' || echo '$(srcdir)/'`fs/readlink/areadlink.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) fs/readlink/$(DEPDIR)/libshadow_la-areadlink.Tpo fs/readlink/$(DEPDIR)/libshadow_la-areadlink.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fs/readlink/areadlink.c' object='fs/readlink/libshadow_la-areadlink.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o libshadow_la-get_gid.lo `test -f 'get_gid.c' || echo '$(srcdir)/'`get_gid.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o fs/readlink/libshadow_la-areadlink.lo `test -f 'fs/readlink/areadlink.c' || echo '$(srcdir)/'`fs/readlink/areadlink.c
+
+fs/readlink/libshadow_la-readlinknul.lo: fs/readlink/readlinknul.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT fs/readlink/libshadow_la-readlinknul.lo -MD -MP -MF fs/readlink/$(DEPDIR)/libshadow_la-readlinknul.Tpo -c -o fs/readlink/libshadow_la-readlinknul.lo `test -f 'fs/readlink/readlinknul.c' || echo '$(srcdir)/'`fs/readlink/readlinknul.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) fs/readlink/$(DEPDIR)/libshadow_la-readlinknul.Tpo fs/readlink/$(DEPDIR)/libshadow_la-readlinknul.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='fs/readlink/readlinknul.c' object='fs/readlink/libshadow_la-readlinknul.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o fs/readlink/libshadow_la-readlinknul.lo `test -f 'fs/readlink/readlinknul.c' || echo '$(srcdir)/'`fs/readlink/readlinknul.c
 
 libshadow_la-get_pid.lo: get_pid.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT libshadow_la-get_pid.lo -MD -MP -MF $(DEPDIR)/libshadow_la-get_pid.Tpo -c -o libshadow_la-get_pid.lo `test -f 'get_pid.c' || echo '$(srcdir)/'`get_pid.c
@@ -1127,13 +1553,6 @@ libshadow_la-get_pid.lo: get_pid.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o libshadow_la-get_pid.lo `test -f 'get_pid.c' || echo '$(srcdir)/'`get_pid.c
 
-libshadow_la-get_uid.lo: get_uid.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT libshadow_la-get_uid.lo -MD -MP -MF $(DEPDIR)/libshadow_la-get_uid.Tpo -c -o libshadow_la-get_uid.lo `test -f 'get_uid.c' || echo '$(srcdir)/'`get_uid.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libshadow_la-get_uid.Tpo $(DEPDIR)/libshadow_la-get_uid.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='get_uid.c' object='libshadow_la-get_uid.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o libshadow_la-get_uid.lo `test -f 'get_uid.c' || echo '$(srcdir)/'`get_uid.c
-
 libshadow_la-getdate.lo: getdate.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT libshadow_la-getdate.lo -MD -MP -MF $(DEPDIR)/libshadow_la-getdate.Tpo -c -o libshadow_la-getdate.lo `test -f 'getdate.c' || echo '$(srcdir)/'`getdate.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libshadow_la-getdate.Tpo $(DEPDIR)/libshadow_la-getdate.Plo
@@ -1246,13 +1665,6 @@ libshadow_la-mail.lo: mail.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o libshadow_la-mail.lo `test -f 'mail.c' || echo '$(srcdir)/'`mail.c
 
-libshadow_la-memzero.lo: memzero.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT libshadow_la-memzero.lo -MD -MP -MF $(DEPDIR)/libshadow_la-memzero.Tpo -c -o libshadow_la-memzero.lo `test -f 'memzero.c' || echo '$(srcdir)/'`memzero.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libshadow_la-memzero.Tpo $(DEPDIR)/libshadow_la-memzero.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='memzero.c' object='libshadow_la-memzero.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o libshadow_la-memzero.lo `test -f 'memzero.c' || echo '$(srcdir)/'`memzero.c
-
 libshadow_la-motd.lo: motd.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT libshadow_la-motd.lo -MD -MP -MF $(DEPDIR)/libshadow_la-motd.Tpo -c -o libshadow_la-motd.lo `test -f 'motd.c' || echo '$(srcdir)/'`motd.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libshadow_la-motd.Tpo $(DEPDIR)/libshadow_la-motd.Plo
@@ -1491,26 +1903,117 @@ libshadow_la-sssd.lo: sssd.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o libshadow_la-sssd.lo `test -f 'sssd.c' || echo '$(srcdir)/'`sssd.c
 
-string/libshadow_la-sprintf.lo: string/sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/libshadow_la-sprintf.lo -MD -MP -MF string/$(DEPDIR)/libshadow_la-sprintf.Tpo -c -o string/libshadow_la-sprintf.lo `test -f 'string/sprintf.c' || echo '$(srcdir)/'`string/sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/$(DEPDIR)/libshadow_la-sprintf.Tpo string/$(DEPDIR)/libshadow_la-sprintf.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/sprintf.c' object='string/libshadow_la-sprintf.lo' libtool=yes @AMDEPBACKSLASH@
+string/memset/libshadow_la-memzero.lo: string/memset/memzero.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/memset/libshadow_la-memzero.lo -MD -MP -MF string/memset/$(DEPDIR)/libshadow_la-memzero.Tpo -c -o string/memset/libshadow_la-memzero.lo `test -f 'string/memset/memzero.c' || echo '$(srcdir)/'`string/memset/memzero.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/memset/$(DEPDIR)/libshadow_la-memzero.Tpo string/memset/$(DEPDIR)/libshadow_la-memzero.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/memset/memzero.c' object='string/memset/libshadow_la-memzero.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/libshadow_la-sprintf.lo `test -f 'string/sprintf.c' || echo '$(srcdir)/'`string/sprintf.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/memset/libshadow_la-memzero.lo `test -f 'string/memset/memzero.c' || echo '$(srcdir)/'`string/memset/memzero.c
 
-string/libshadow_la-stpecpy.lo: string/stpecpy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/libshadow_la-stpecpy.lo -MD -MP -MF string/$(DEPDIR)/libshadow_la-stpecpy.Tpo -c -o string/libshadow_la-stpecpy.lo `test -f 'string/stpecpy.c' || echo '$(srcdir)/'`string/stpecpy.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/$(DEPDIR)/libshadow_la-stpecpy.Tpo string/$(DEPDIR)/libshadow_la-stpecpy.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/stpecpy.c' object='string/libshadow_la-stpecpy.lo' libtool=yes @AMDEPBACKSLASH@
+string/sprintf/libshadow_la-snprintf.lo: string/sprintf/snprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/sprintf/libshadow_la-snprintf.lo -MD -MP -MF string/sprintf/$(DEPDIR)/libshadow_la-snprintf.Tpo -c -o string/sprintf/libshadow_la-snprintf.lo `test -f 'string/sprintf/snprintf.c' || echo '$(srcdir)/'`string/sprintf/snprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/sprintf/$(DEPDIR)/libshadow_la-snprintf.Tpo string/sprintf/$(DEPDIR)/libshadow_la-snprintf.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/sprintf/snprintf.c' object='string/sprintf/libshadow_la-snprintf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/libshadow_la-stpecpy.lo `test -f 'string/stpecpy.c' || echo '$(srcdir)/'`string/stpecpy.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/sprintf/libshadow_la-snprintf.lo `test -f 'string/sprintf/snprintf.c' || echo '$(srcdir)/'`string/sprintf/snprintf.c
 
-string/libshadow_la-stpeprintf.lo: string/stpeprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/libshadow_la-stpeprintf.lo -MD -MP -MF string/$(DEPDIR)/libshadow_la-stpeprintf.Tpo -c -o string/libshadow_la-stpeprintf.lo `test -f 'string/stpeprintf.c' || echo '$(srcdir)/'`string/stpeprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/$(DEPDIR)/libshadow_la-stpeprintf.Tpo string/$(DEPDIR)/libshadow_la-stpeprintf.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/stpeprintf.c' object='string/libshadow_la-stpeprintf.lo' libtool=yes @AMDEPBACKSLASH@
+string/sprintf/libshadow_la-stpeprintf.lo: string/sprintf/stpeprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/sprintf/libshadow_la-stpeprintf.lo -MD -MP -MF string/sprintf/$(DEPDIR)/libshadow_la-stpeprintf.Tpo -c -o string/sprintf/libshadow_la-stpeprintf.lo `test -f 'string/sprintf/stpeprintf.c' || echo '$(srcdir)/'`string/sprintf/stpeprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/sprintf/$(DEPDIR)/libshadow_la-stpeprintf.Tpo string/sprintf/$(DEPDIR)/libshadow_la-stpeprintf.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/sprintf/stpeprintf.c' object='string/sprintf/libshadow_la-stpeprintf.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/libshadow_la-stpeprintf.lo `test -f 'string/stpeprintf.c' || echo '$(srcdir)/'`string/stpeprintf.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/sprintf/libshadow_la-stpeprintf.lo `test -f 'string/sprintf/stpeprintf.c' || echo '$(srcdir)/'`string/sprintf/stpeprintf.c
+
+string/sprintf/libshadow_la-xasprintf.lo: string/sprintf/xasprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/sprintf/libshadow_la-xasprintf.lo -MD -MP -MF string/sprintf/$(DEPDIR)/libshadow_la-xasprintf.Tpo -c -o string/sprintf/libshadow_la-xasprintf.lo `test -f 'string/sprintf/xasprintf.c' || echo '$(srcdir)/'`string/sprintf/xasprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/sprintf/$(DEPDIR)/libshadow_la-xasprintf.Tpo string/sprintf/$(DEPDIR)/libshadow_la-xasprintf.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/sprintf/xasprintf.c' object='string/sprintf/libshadow_la-xasprintf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/sprintf/libshadow_la-xasprintf.lo `test -f 'string/sprintf/xasprintf.c' || echo '$(srcdir)/'`string/sprintf/xasprintf.c
+
+string/strchr/libshadow_la-strchrcnt.lo: string/strchr/strchrcnt.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/strchr/libshadow_la-strchrcnt.lo -MD -MP -MF string/strchr/$(DEPDIR)/libshadow_la-strchrcnt.Tpo -c -o string/strchr/libshadow_la-strchrcnt.lo `test -f 'string/strchr/strchrcnt.c' || echo '$(srcdir)/'`string/strchr/strchrcnt.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/strchr/$(DEPDIR)/libshadow_la-strchrcnt.Tpo string/strchr/$(DEPDIR)/libshadow_la-strchrcnt.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/strchr/strchrcnt.c' object='string/strchr/libshadow_la-strchrcnt.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/strchr/libshadow_la-strchrcnt.lo `test -f 'string/strchr/strchrcnt.c' || echo '$(srcdir)/'`string/strchr/strchrcnt.c
+
+string/strchr/libshadow_la-stpspn.lo: string/strchr/stpspn.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/strchr/libshadow_la-stpspn.lo -MD -MP -MF string/strchr/$(DEPDIR)/libshadow_la-stpspn.Tpo -c -o string/strchr/libshadow_la-stpspn.lo `test -f 'string/strchr/stpspn.c' || echo '$(srcdir)/'`string/strchr/stpspn.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/strchr/$(DEPDIR)/libshadow_la-stpspn.Tpo string/strchr/$(DEPDIR)/libshadow_la-stpspn.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/strchr/stpspn.c' object='string/strchr/libshadow_la-stpspn.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/strchr/libshadow_la-stpspn.lo `test -f 'string/strchr/stpspn.c' || echo '$(srcdir)/'`string/strchr/stpspn.c
+
+string/strchr/libshadow_la-strnul.lo: string/strchr/strnul.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/strchr/libshadow_la-strnul.lo -MD -MP -MF string/strchr/$(DEPDIR)/libshadow_la-strnul.Tpo -c -o string/strchr/libshadow_la-strnul.lo `test -f 'string/strchr/strnul.c' || echo '$(srcdir)/'`string/strchr/strnul.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/strchr/$(DEPDIR)/libshadow_la-strnul.Tpo string/strchr/$(DEPDIR)/libshadow_la-strnul.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/strchr/strnul.c' object='string/strchr/libshadow_la-strnul.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/strchr/libshadow_la-strnul.lo `test -f 'string/strchr/strnul.c' || echo '$(srcdir)/'`string/strchr/strnul.c
+
+string/strchr/libshadow_la-strrspn.lo: string/strchr/strrspn.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/strchr/libshadow_la-strrspn.lo -MD -MP -MF string/strchr/$(DEPDIR)/libshadow_la-strrspn.Tpo -c -o string/strchr/libshadow_la-strrspn.lo `test -f 'string/strchr/strrspn.c' || echo '$(srcdir)/'`string/strchr/strrspn.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/strchr/$(DEPDIR)/libshadow_la-strrspn.Tpo string/strchr/$(DEPDIR)/libshadow_la-strrspn.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/strchr/strrspn.c' object='string/strchr/libshadow_la-strrspn.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/strchr/libshadow_la-strrspn.lo `test -f 'string/strchr/strrspn.c' || echo '$(srcdir)/'`string/strchr/strrspn.c
+
+string/strcmp/libshadow_la-streq.lo: string/strcmp/streq.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/strcmp/libshadow_la-streq.lo -MD -MP -MF string/strcmp/$(DEPDIR)/libshadow_la-streq.Tpo -c -o string/strcmp/libshadow_la-streq.lo `test -f 'string/strcmp/streq.c' || echo '$(srcdir)/'`string/strcmp/streq.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/strcmp/$(DEPDIR)/libshadow_la-streq.Tpo string/strcmp/$(DEPDIR)/libshadow_la-streq.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/strcmp/streq.c' object='string/strcmp/libshadow_la-streq.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/strcmp/libshadow_la-streq.lo `test -f 'string/strcmp/streq.c' || echo '$(srcdir)/'`string/strcmp/streq.c
+
+string/strcpy/libshadow_la-stpecpy.lo: string/strcpy/stpecpy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/strcpy/libshadow_la-stpecpy.lo -MD -MP -MF string/strcpy/$(DEPDIR)/libshadow_la-stpecpy.Tpo -c -o string/strcpy/libshadow_la-stpecpy.lo `test -f 'string/strcpy/stpecpy.c' || echo '$(srcdir)/'`string/strcpy/stpecpy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/strcpy/$(DEPDIR)/libshadow_la-stpecpy.Tpo string/strcpy/$(DEPDIR)/libshadow_la-stpecpy.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/strcpy/stpecpy.c' object='string/strcpy/libshadow_la-stpecpy.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/strcpy/libshadow_la-stpecpy.lo `test -f 'string/strcpy/stpecpy.c' || echo '$(srcdir)/'`string/strcpy/stpecpy.c
+
+string/strcpy/libshadow_la-strncat.lo: string/strcpy/strncat.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/strcpy/libshadow_la-strncat.lo -MD -MP -MF string/strcpy/$(DEPDIR)/libshadow_la-strncat.Tpo -c -o string/strcpy/libshadow_la-strncat.lo `test -f 'string/strcpy/strncat.c' || echo '$(srcdir)/'`string/strcpy/strncat.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/strcpy/$(DEPDIR)/libshadow_la-strncat.Tpo string/strcpy/$(DEPDIR)/libshadow_la-strncat.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/strcpy/strncat.c' object='string/strcpy/libshadow_la-strncat.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/strcpy/libshadow_la-strncat.lo `test -f 'string/strcpy/strncat.c' || echo '$(srcdir)/'`string/strcpy/strncat.c
+
+string/strcpy/libshadow_la-strncpy.lo: string/strcpy/strncpy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/strcpy/libshadow_la-strncpy.lo -MD -MP -MF string/strcpy/$(DEPDIR)/libshadow_la-strncpy.Tpo -c -o string/strcpy/libshadow_la-strncpy.lo `test -f 'string/strcpy/strncpy.c' || echo '$(srcdir)/'`string/strcpy/strncpy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/strcpy/$(DEPDIR)/libshadow_la-strncpy.Tpo string/strcpy/$(DEPDIR)/libshadow_la-strncpy.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/strcpy/strncpy.c' object='string/strcpy/libshadow_la-strncpy.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/strcpy/libshadow_la-strncpy.lo `test -f 'string/strcpy/strncpy.c' || echo '$(srcdir)/'`string/strcpy/strncpy.c
+
+string/strcpy/libshadow_la-strtcpy.lo: string/strcpy/strtcpy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/strcpy/libshadow_la-strtcpy.lo -MD -MP -MF string/strcpy/$(DEPDIR)/libshadow_la-strtcpy.Tpo -c -o string/strcpy/libshadow_la-strtcpy.lo `test -f 'string/strcpy/strtcpy.c' || echo '$(srcdir)/'`string/strcpy/strtcpy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/strcpy/$(DEPDIR)/libshadow_la-strtcpy.Tpo string/strcpy/$(DEPDIR)/libshadow_la-strtcpy.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/strcpy/strtcpy.c' object='string/strcpy/libshadow_la-strtcpy.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/strcpy/libshadow_la-strtcpy.lo `test -f 'string/strcpy/strtcpy.c' || echo '$(srcdir)/'`string/strcpy/strtcpy.c
+
+string/strdup/libshadow_la-strndupa.lo: string/strdup/strndupa.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/strdup/libshadow_la-strndupa.lo -MD -MP -MF string/strdup/$(DEPDIR)/libshadow_la-strndupa.Tpo -c -o string/strdup/libshadow_la-strndupa.lo `test -f 'string/strdup/strndupa.c' || echo '$(srcdir)/'`string/strdup/strndupa.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/strdup/$(DEPDIR)/libshadow_la-strndupa.Tpo string/strdup/$(DEPDIR)/libshadow_la-strndupa.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/strdup/strndupa.c' object='string/strdup/libshadow_la-strndupa.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/strdup/libshadow_la-strndupa.lo `test -f 'string/strdup/strndupa.c' || echo '$(srcdir)/'`string/strdup/strndupa.c
+
+string/strdup/libshadow_la-xstrdup.lo: string/strdup/xstrdup.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/strdup/libshadow_la-xstrdup.lo -MD -MP -MF string/strdup/$(DEPDIR)/libshadow_la-xstrdup.Tpo -c -o string/strdup/libshadow_la-xstrdup.lo `test -f 'string/strdup/xstrdup.c' || echo '$(srcdir)/'`string/strdup/xstrdup.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/strdup/$(DEPDIR)/libshadow_la-xstrdup.Tpo string/strdup/$(DEPDIR)/libshadow_la-xstrdup.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/strdup/xstrdup.c' object='string/strdup/libshadow_la-xstrdup.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/strdup/libshadow_la-xstrdup.lo `test -f 'string/strdup/xstrdup.c' || echo '$(srcdir)/'`string/strdup/xstrdup.c
+
+string/strdup/libshadow_la-xstrndup.lo: string/strdup/xstrndup.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/strdup/libshadow_la-xstrndup.lo -MD -MP -MF string/strdup/$(DEPDIR)/libshadow_la-xstrndup.Tpo -c -o string/strdup/libshadow_la-xstrndup.lo `test -f 'string/strdup/xstrndup.c' || echo '$(srcdir)/'`string/strdup/xstrndup.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/strdup/$(DEPDIR)/libshadow_la-xstrndup.Tpo string/strdup/$(DEPDIR)/libshadow_la-xstrndup.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/strdup/xstrndup.c' object='string/strdup/libshadow_la-xstrndup.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/strdup/libshadow_la-xstrndup.lo `test -f 'string/strdup/xstrndup.c' || echo '$(srcdir)/'`string/strdup/xstrndup.c
 
 string/libshadow_la-strftime.lo: string/strftime.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/libshadow_la-strftime.lo -MD -MP -MF string/$(DEPDIR)/libshadow_la-strftime.Tpo -c -o string/libshadow_la-strftime.lo `test -f 'string/strftime.c' || echo '$(srcdir)/'`string/strftime.c
@@ -1519,12 +2022,12 @@ string/libshadow_la-strftime.lo: string/strftime.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/libshadow_la-strftime.lo `test -f 'string/strftime.c' || echo '$(srcdir)/'`string/strftime.c
 
-string/libshadow_la-strtcpy.lo: string/strtcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/libshadow_la-strtcpy.lo -MD -MP -MF string/$(DEPDIR)/libshadow_la-strtcpy.Tpo -c -o string/libshadow_la-strtcpy.lo `test -f 'string/strtcpy.c' || echo '$(srcdir)/'`string/strtcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/$(DEPDIR)/libshadow_la-strtcpy.Tpo string/$(DEPDIR)/libshadow_la-strtcpy.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/strtcpy.c' object='string/libshadow_la-strtcpy.lo' libtool=yes @AMDEPBACKSLASH@
+string/strtok/libshadow_la-stpsep.lo: string/strtok/stpsep.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT string/strtok/libshadow_la-stpsep.lo -MD -MP -MF string/strtok/$(DEPDIR)/libshadow_la-stpsep.Tpo -c -o string/strtok/libshadow_la-stpsep.lo `test -f 'string/strtok/stpsep.c' || echo '$(srcdir)/'`string/strtok/stpsep.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) string/strtok/$(DEPDIR)/libshadow_la-stpsep.Tpo string/strtok/$(DEPDIR)/libshadow_la-stpsep.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='string/strtok/stpsep.c' object='string/strtok/libshadow_la-stpsep.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/libshadow_la-strtcpy.lo `test -f 'string/strtcpy.c' || echo '$(srcdir)/'`string/strtcpy.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -c -o string/strtok/libshadow_la-stpsep.lo `test -f 'string/strtok/stpsep.c' || echo '$(srcdir)/'`string/strtok/stpsep.c
 
 libshadow_la-strtoday.lo: strtoday.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libshadow_la_CPPFLAGS) $(CPPFLAGS) $(libshadow_la_CFLAGS) $(CFLAGS) -MT libshadow_la-strtoday.lo -MD -MP -MF $(DEPDIR)/libshadow_la-strtoday.Tpo -c -o libshadow_la-strtoday.lo `test -f 'strtoday.c' || echo '$(srcdir)/'`strtoday.c
@@ -1709,8 +2212,21 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
+	-rm -rf alloc/.libs alloc/_libs
+	-rm -rf alloc/x/.libs alloc/x/_libs
 	-rm -rf atoi/.libs atoi/_libs
+	-rm -rf atoi/a2i/.libs atoi/a2i/_libs
+	-rm -rf atoi/str2i/.libs atoi/str2i/_libs
+	-rm -rf atoi/strtoi/.libs atoi/strtoi/_libs
+	-rm -rf fs/readlink/.libs fs/readlink/_libs
 	-rm -rf string/.libs string/_libs
+	-rm -rf string/memset/.libs string/memset/_libs
+	-rm -rf string/sprintf/.libs string/sprintf/_libs
+	-rm -rf string/strchr/.libs string/strchr/_libs
+	-rm -rf string/strcmp/.libs string/strcmp/_libs
+	-rm -rf string/strcpy/.libs string/strcpy/_libs
+	-rm -rf string/strdup/.libs string/strdup/_libs
+	-rm -rf string/strtok/.libs string/strtok/_libs
 	-rm -rf time/.libs time/_libs
 
 ID: $(am__tagged_files)
@@ -1827,10 +2343,36 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f alloc/$(DEPDIR)/$(am__dirstamp)
+	-rm -f alloc/$(am__dirstamp)
+	-rm -f alloc/x/$(DEPDIR)/$(am__dirstamp)
+	-rm -f alloc/x/$(am__dirstamp)
 	-rm -f atoi/$(DEPDIR)/$(am__dirstamp)
 	-rm -f atoi/$(am__dirstamp)
+	-rm -f atoi/a2i/$(DEPDIR)/$(am__dirstamp)
+	-rm -f atoi/a2i/$(am__dirstamp)
+	-rm -f atoi/str2i/$(DEPDIR)/$(am__dirstamp)
+	-rm -f atoi/str2i/$(am__dirstamp)
+	-rm -f atoi/strtoi/$(DEPDIR)/$(am__dirstamp)
+	-rm -f atoi/strtoi/$(am__dirstamp)
+	-rm -f fs/readlink/$(DEPDIR)/$(am__dirstamp)
+	-rm -f fs/readlink/$(am__dirstamp)
 	-rm -f string/$(DEPDIR)/$(am__dirstamp)
 	-rm -f string/$(am__dirstamp)
+	-rm -f string/memset/$(DEPDIR)/$(am__dirstamp)
+	-rm -f string/memset/$(am__dirstamp)
+	-rm -f string/sprintf/$(DEPDIR)/$(am__dirstamp)
+	-rm -f string/sprintf/$(am__dirstamp)
+	-rm -f string/strchr/$(DEPDIR)/$(am__dirstamp)
+	-rm -f string/strchr/$(am__dirstamp)
+	-rm -f string/strcmp/$(DEPDIR)/$(am__dirstamp)
+	-rm -f string/strcmp/$(am__dirstamp)
+	-rm -f string/strcpy/$(DEPDIR)/$(am__dirstamp)
+	-rm -f string/strcpy/$(am__dirstamp)
+	-rm -f string/strdup/$(DEPDIR)/$(am__dirstamp)
+	-rm -f string/strdup/$(am__dirstamp)
+	-rm -f string/strtok/$(DEPDIR)/$(am__dirstamp)
+	-rm -f string/strtok/$(am__dirstamp)
 	-rm -f time/$(DEPDIR)/$(am__dirstamp)
 	-rm -f time/$(am__dirstamp)
 
@@ -1848,7 +2390,6 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/libshadow_la-adds.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-age.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-agetpass.Plo
-	-rm -f ./$(DEPDIR)/libshadow_la-alloc.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-audit_help.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-basename.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-bit.Plo
@@ -1874,9 +2415,7 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/libshadow_la-find_new_uid.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-fputsx.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-freezero.Plo
-	-rm -f ./$(DEPDIR)/libshadow_la-get_gid.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-get_pid.Plo
-	-rm -f ./$(DEPDIR)/libshadow_la-get_uid.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-getdate.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-getdef.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-getgr_nam_gid.Plo
@@ -1895,7 +2434,6 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/libshadow_la-logind.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-loginprompt.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-mail.Plo
-	-rm -f ./$(DEPDIR)/libshadow_la-memzero.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-motd.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-myname.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-nscd.Plo
@@ -1950,15 +2488,47 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/libshadow_la-xgetspnam.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-xprefix_getpwnam.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-yesno.Plo
-	-rm -f atoi/$(DEPDIR)/libshadow_la-a2i.Plo
-	-rm -f atoi/$(DEPDIR)/libshadow_la-str2i.Plo
-	-rm -f atoi/$(DEPDIR)/libshadow_la-strtoi.Plo
-	-rm -f atoi/$(DEPDIR)/libshadow_la-strtou_noneg.Plo
-	-rm -f string/$(DEPDIR)/libshadow_la-sprintf.Plo
-	-rm -f string/$(DEPDIR)/libshadow_la-stpecpy.Plo
-	-rm -f string/$(DEPDIR)/libshadow_la-stpeprintf.Plo
+	-rm -f alloc/$(DEPDIR)/libshadow_la-calloc.Plo
+	-rm -f alloc/$(DEPDIR)/libshadow_la-malloc.Plo
+	-rm -f alloc/$(DEPDIR)/libshadow_la-realloc.Plo
+	-rm -f alloc/$(DEPDIR)/libshadow_la-reallocf.Plo
+	-rm -f alloc/x/$(DEPDIR)/libshadow_la-xcalloc.Plo
+	-rm -f alloc/x/$(DEPDIR)/libshadow_la-xmalloc.Plo
+	-rm -f alloc/x/$(DEPDIR)/libshadow_la-xrealloc.Plo
+	-rm -f atoi/$(DEPDIR)/libshadow_la-getnum.Plo
+	-rm -f atoi/a2i/$(DEPDIR)/libshadow_la-a2i.Plo
+	-rm -f atoi/a2i/$(DEPDIR)/libshadow_la-a2s.Plo
+	-rm -f atoi/a2i/$(DEPDIR)/libshadow_la-a2s_c.Plo
+	-rm -f atoi/a2i/$(DEPDIR)/libshadow_la-a2s_nc.Plo
+	-rm -f atoi/a2i/$(DEPDIR)/libshadow_la-a2u.Plo
+	-rm -f atoi/a2i/$(DEPDIR)/libshadow_la-a2u_c.Plo
+	-rm -f atoi/a2i/$(DEPDIR)/libshadow_la-a2u_nc.Plo
+	-rm -f atoi/str2i/$(DEPDIR)/libshadow_la-str2i.Plo
+	-rm -f atoi/str2i/$(DEPDIR)/libshadow_la-str2s.Plo
+	-rm -f atoi/str2i/$(DEPDIR)/libshadow_la-str2u.Plo
+	-rm -f atoi/strtoi/$(DEPDIR)/libshadow_la-strtoi.Plo
+	-rm -f atoi/strtoi/$(DEPDIR)/libshadow_la-strtou.Plo
+	-rm -f atoi/strtoi/$(DEPDIR)/libshadow_la-strtou_noneg.Plo
+	-rm -f fs/readlink/$(DEPDIR)/libshadow_la-areadlink.Plo
+	-rm -f fs/readlink/$(DEPDIR)/libshadow_la-readlinknul.Plo
 	-rm -f string/$(DEPDIR)/libshadow_la-strftime.Plo
-	-rm -f string/$(DEPDIR)/libshadow_la-strtcpy.Plo
+	-rm -f string/memset/$(DEPDIR)/libshadow_la-memzero.Plo
+	-rm -f string/sprintf/$(DEPDIR)/libshadow_la-snprintf.Plo
+	-rm -f string/sprintf/$(DEPDIR)/libshadow_la-stpeprintf.Plo
+	-rm -f string/sprintf/$(DEPDIR)/libshadow_la-xasprintf.Plo
+	-rm -f string/strchr/$(DEPDIR)/libshadow_la-stpspn.Plo
+	-rm -f string/strchr/$(DEPDIR)/libshadow_la-strchrcnt.Plo
+	-rm -f string/strchr/$(DEPDIR)/libshadow_la-strnul.Plo
+	-rm -f string/strchr/$(DEPDIR)/libshadow_la-strrspn.Plo
+	-rm -f string/strcmp/$(DEPDIR)/libshadow_la-streq.Plo
+	-rm -f string/strcpy/$(DEPDIR)/libshadow_la-stpecpy.Plo
+	-rm -f string/strcpy/$(DEPDIR)/libshadow_la-strncat.Plo
+	-rm -f string/strcpy/$(DEPDIR)/libshadow_la-strncpy.Plo
+	-rm -f string/strcpy/$(DEPDIR)/libshadow_la-strtcpy.Plo
+	-rm -f string/strdup/$(DEPDIR)/libshadow_la-strndupa.Plo
+	-rm -f string/strdup/$(DEPDIR)/libshadow_la-xstrdup.Plo
+	-rm -f string/strdup/$(DEPDIR)/libshadow_la-xstrndup.Plo
+	-rm -f string/strtok/$(DEPDIR)/libshadow_la-stpsep.Plo
 	-rm -f time/$(DEPDIR)/libshadow_la-day_to_str.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
@@ -2009,7 +2579,6 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/libshadow_la-adds.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-age.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-agetpass.Plo
-	-rm -f ./$(DEPDIR)/libshadow_la-alloc.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-audit_help.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-basename.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-bit.Plo
@@ -2035,9 +2604,7 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/libshadow_la-find_new_uid.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-fputsx.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-freezero.Plo
-	-rm -f ./$(DEPDIR)/libshadow_la-get_gid.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-get_pid.Plo
-	-rm -f ./$(DEPDIR)/libshadow_la-get_uid.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-getdate.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-getdef.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-getgr_nam_gid.Plo
@@ -2056,7 +2623,6 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/libshadow_la-logind.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-loginprompt.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-mail.Plo
-	-rm -f ./$(DEPDIR)/libshadow_la-memzero.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-motd.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-myname.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-nscd.Plo
@@ -2111,15 +2677,47 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/libshadow_la-xgetspnam.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-xprefix_getpwnam.Plo
 	-rm -f ./$(DEPDIR)/libshadow_la-yesno.Plo
-	-rm -f atoi/$(DEPDIR)/libshadow_la-a2i.Plo
-	-rm -f atoi/$(DEPDIR)/libshadow_la-str2i.Plo
-	-rm -f atoi/$(DEPDIR)/libshadow_la-strtoi.Plo
-	-rm -f atoi/$(DEPDIR)/libshadow_la-strtou_noneg.Plo
-	-rm -f string/$(DEPDIR)/libshadow_la-sprintf.Plo
-	-rm -f string/$(DEPDIR)/libshadow_la-stpecpy.Plo
-	-rm -f string/$(DEPDIR)/libshadow_la-stpeprintf.Plo
+	-rm -f alloc/$(DEPDIR)/libshadow_la-calloc.Plo
+	-rm -f alloc/$(DEPDIR)/libshadow_la-malloc.Plo
+	-rm -f alloc/$(DEPDIR)/libshadow_la-realloc.Plo
+	-rm -f alloc/$(DEPDIR)/libshadow_la-reallocf.Plo
+	-rm -f alloc/x/$(DEPDIR)/libshadow_la-xcalloc.Plo
+	-rm -f alloc/x/$(DEPDIR)/libshadow_la-xmalloc.Plo
+	-rm -f alloc/x/$(DEPDIR)/libshadow_la-xrealloc.Plo
+	-rm -f atoi/$(DEPDIR)/libshadow_la-getnum.Plo
+	-rm -f atoi/a2i/$(DEPDIR)/libshadow_la-a2i.Plo
+	-rm -f atoi/a2i/$(DEPDIR)/libshadow_la-a2s.Plo
+	-rm -f atoi/a2i/$(DEPDIR)/libshadow_la-a2s_c.Plo
+	-rm -f atoi/a2i/$(DEPDIR)/libshadow_la-a2s_nc.Plo
+	-rm -f atoi/a2i/$(DEPDIR)/libshadow_la-a2u.Plo
+	-rm -f atoi/a2i/$(DEPDIR)/libshadow_la-a2u_c.Plo
+	-rm -f atoi/a2i/$(DEPDIR)/libshadow_la-a2u_nc.Plo
+	-rm -f atoi/str2i/$(DEPDIR)/libshadow_la-str2i.Plo
+	-rm -f atoi/str2i/$(DEPDIR)/libshadow_la-str2s.Plo
+	-rm -f atoi/str2i/$(DEPDIR)/libshadow_la-str2u.Plo
+	-rm -f atoi/strtoi/$(DEPDIR)/libshadow_la-strtoi.Plo
+	-rm -f atoi/strtoi/$(DEPDIR)/libshadow_la-strtou.Plo
+	-rm -f atoi/strtoi/$(DEPDIR)/libshadow_la-strtou_noneg.Plo
+	-rm -f fs/readlink/$(DEPDIR)/libshadow_la-areadlink.Plo
+	-rm -f fs/readlink/$(DEPDIR)/libshadow_la-readlinknul.Plo
 	-rm -f string/$(DEPDIR)/libshadow_la-strftime.Plo
-	-rm -f string/$(DEPDIR)/libshadow_la-strtcpy.Plo
+	-rm -f string/memset/$(DEPDIR)/libshadow_la-memzero.Plo
+	-rm -f string/sprintf/$(DEPDIR)/libshadow_la-snprintf.Plo
+	-rm -f string/sprintf/$(DEPDIR)/libshadow_la-stpeprintf.Plo
+	-rm -f string/sprintf/$(DEPDIR)/libshadow_la-xasprintf.Plo
+	-rm -f string/strchr/$(DEPDIR)/libshadow_la-stpspn.Plo
+	-rm -f string/strchr/$(DEPDIR)/libshadow_la-strchrcnt.Plo
+	-rm -f string/strchr/$(DEPDIR)/libshadow_la-strnul.Plo
+	-rm -f string/strchr/$(DEPDIR)/libshadow_la-strrspn.Plo
+	-rm -f string/strcmp/$(DEPDIR)/libshadow_la-streq.Plo
+	-rm -f string/strcpy/$(DEPDIR)/libshadow_la-stpecpy.Plo
+	-rm -f string/strcpy/$(DEPDIR)/libshadow_la-strncat.Plo
+	-rm -f string/strcpy/$(DEPDIR)/libshadow_la-strncpy.Plo
+	-rm -f string/strcpy/$(DEPDIR)/libshadow_la-strtcpy.Plo
+	-rm -f string/strdup/$(DEPDIR)/libshadow_la-strndupa.Plo
+	-rm -f string/strdup/$(DEPDIR)/libshadow_la-xstrdup.Plo
+	-rm -f string/strdup/$(DEPDIR)/libshadow_la-xstrndup.Plo
+	-rm -f string/strtok/$(DEPDIR)/libshadow_la-stpsep.Plo
 	-rm -f time/$(DEPDIR)/libshadow_la-day_to_str.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/lib/addgrps.c b/lib/addgrps.c
index dae3dba2..97c47e07 100644
--- a/lib/addgrps.c
+++ b/lib/addgrps.c
@@ -14,28 +14,30 @@
 #include "prototypes.h"
 #include "defines.h"
 
-#include <stdio.h>
-#include <grp.h>
 #include <errno.h>
+#include <grp.h>
+#include <stdio.h>
+#include <string.h>
 
-#include "alloc.h"
+#include "alloc/malloc.h"
+#include "alloc/reallocf.h"
 #include "shadowlog.h"
 
 #ident "$Id$"
 
-#define SEP ",:"
 /*
  * Add groups with names from LIST (separated by commas or colons)
  * to the supplementary group set.  Silently ignore groups which are
- * already there.  Warning: uses strtok().
+ * already there.
  */
-int add_groups (const char *list)
+int
+add_groups(const char *list)
 {
 	GETGROUPS_T *grouplist;
 	size_t i;
 	int ngroups;
 	bool added;
-	char *token;
+	char *g, *p;
 	char buf[1024];
 	int ret;
 	FILE *shadow_logfd = log_get_logfd();
@@ -70,13 +72,13 @@ int add_groups (const char *list)
 	}
 
 	added = false;
-	for (token = strtok (buf, SEP); NULL != token; token = strtok (NULL, SEP)) {
+	p = buf;
+	while (NULL != (g = strsep(&p, ",:"))) {
 		struct group *grp;
 
-		grp = getgrnam (token); /* local, no need for xgetgrnam */
+		grp = getgrnam(g); /* local, no need for xgetgrnam */
 		if (NULL == grp) {
-			fprintf (shadow_logfd, _("Warning: unknown group %s\n"),
-				 token);
+			fprintf(shadow_logfd, _("Warning: unknown group %s\n"), g);
 			continue;
 		}
 
diff --git a/lib/agetpass.c b/lib/agetpass.c
index 5d9f9286..ecf40da9 100644
--- a/lib/agetpass.c
+++ b/lib/agetpass.c
@@ -16,7 +16,7 @@
 
 #ident "$Id$"
 
-#include "alloc.h"
+#include "alloc/malloc.h"
 
 #if WITH_LIBBSD == 0
 #include "freezero.h"
diff --git a/lib/alloc.c b/lib/alloc.c
deleted file mode 100644
index 962f45a1..00000000
--- a/lib/alloc.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 1990 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 1998, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2003 - 2006, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2008       , Nicolas François
- * SPDX-FileCopyrightText: 2023       , Alejandro Colomar <alx@kernel.org>
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/* Replacements for malloc and strdup with error checking.  Too trivial
-   to be worth copyrighting :-).  I did that because a lot of code used
-   malloc and strdup without checking for NULL pointer, and I like some
-   message better than a core dump...  --marekm
-
-   Yeh, but.  Remember that bailing out might leave the system in some
-   bizarre state.  You really want to put in error checking, then add
-   some back-out failure recovery code. -- jfh */
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include "alloc.h"
-
-#include <errno.h>
-#include <stddef.h>
-#include <stdio.h>
-
-#include "defines.h"
-#include "prototypes.h"
-#include "shadowlog.h"
-
-
-extern inline void *xmalloc(size_t size);
-extern inline void *xmallocarray(size_t nmemb, size_t size);
-extern inline void *mallocarray(size_t nmemb, size_t size);
-extern inline void *reallocarrayf(void *p, size_t nmemb, size_t size);
-extern inline char *xstrdup(const char *str);
-
-
-void *
-xcalloc(size_t nmemb, size_t size)
-{
-	void  *p;
-
-	p = calloc(nmemb, size);
-	if (p == NULL)
-		goto x;
-
-	return p;
-
-x:
-	fprintf(log_get_logfd(), _("%s: %s\n"),
-	        log_get_progname(), strerror(errno));
-	exit(13);
-}
-
-
-void *
-xreallocarray(void *p, size_t nmemb, size_t size)
-{
-	p = reallocarrayf(p, nmemb, size);
-	if (p == NULL)
-		goto x;
-
-	return p;
-
-x:
-	fprintf(log_get_logfd(), _("%s: %s\n"),
-	        log_get_progname(), strerror(errno));
-	exit(13);
-}
diff --git a/lib/alloc.h b/lib/alloc.h
deleted file mode 100644
index 39405a56..00000000
--- a/lib/alloc.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_MALLOC_H_
-#define SHADOW_INCLUDE_LIB_MALLOC_H_
-
-
-#include <config.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "attr.h"
-#include "defines.h"
-
-
-#define CALLOC(n, type)   ((type *) calloc(n, sizeof(type)))
-#define XCALLOC(n, type)  ((type *) xcalloc(n, sizeof(type)))
-#define MALLOC(n, type)   ((type *) mallocarray(n, sizeof(type)))
-#define XMALLOC(n, type)  ((type *) xmallocarray(n, sizeof(type)))
-
-#define REALLOC(ptr, n, type)                                                 \
-(                                                                             \
-	_Generic(ptr, type *:  (type *) reallocarray(ptr, n, sizeof(type)))   \
-)
-
-#define REALLOCF(ptr, n, type)                                                \
-(                                                                             \
-	_Generic(ptr, type *:  (type *) reallocarrayf(ptr, n, sizeof(type)))  \
-)
-
-#define XREALLOC(ptr, n, type)                                                \
-(                                                                             \
-	_Generic(ptr, type *:  (type *) xreallocarray(ptr, n, sizeof(type)))  \
-)
-
-
-ATTR_MALLOC(free)
-inline void *xmalloc(size_t size);
-ATTR_MALLOC(free)
-inline void *xmallocarray(size_t nmemb, size_t size);
-ATTR_MALLOC(free)
-inline void *mallocarray(size_t nmemb, size_t size);
-ATTR_MALLOC(free)
-inline void *reallocarrayf(void *p, size_t nmemb, size_t size);
-ATTR_MALLOC(free)
-inline char *xstrdup(const char *str);
-
-ATTR_MALLOC(free)
-void *xcalloc(size_t nmemb, size_t size);
-ATTR_MALLOC(free)
-void *xreallocarray(void *p, size_t nmemb, size_t size);
-
-
-inline void *
-xmalloc(size_t size)
-{
-	return xmallocarray(1, size);
-}
-
-
-inline void *
-xmallocarray(size_t nmemb, size_t size)
-{
-	return xreallocarray(NULL, nmemb, size);
-}
-
-
-inline void *
-mallocarray(size_t nmemb, size_t size)
-{
-	return reallocarray(NULL, nmemb, size);
-}
-
-
-inline void *
-reallocarrayf(void *p, size_t nmemb, size_t size)
-{
-	void  *q;
-
-	q = reallocarray(p, nmemb, size);
-
-	/* realloc(p, 0) is equivalent to free(p);  avoid double free.  */
-	if (q == NULL && nmemb != 0 && size != 0)
-		free(p);
-	return q;
-}
-
-
-inline char *
-xstrdup(const char *str)
-{
-	return strcpy(XMALLOC(strlen(str) + 1, char), str);
-}
-
-
-#endif  // include guard
diff --git a/lib/alloc/calloc.c b/lib/alloc/calloc.c
new file mode 100644
index 00000000..55baafdc
--- /dev/null
+++ b/lib/alloc/calloc.c
@@ -0,0 +1,11 @@
+// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008     , Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "alloc/calloc.h"
diff --git a/lib/alloc/calloc.h b/lib/alloc/calloc.h
new file mode 100644
index 00000000..fb170e6f
--- /dev/null
+++ b/lib/alloc/calloc.h
@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ALLOC_CALLOC_H_
+#define SHADOW_INCLUDE_LIB_ALLOC_CALLOC_H_
+
+
+#include <config.h>
+
+#include <stdlib.h>
+
+
+#define CALLOC(n, type)                                                       \
+(                                                                             \
+	(type *) calloc(n, sizeof(type))                                      \
+)
+
+
+#endif  // include guard
diff --git a/lib/alloc/malloc.c b/lib/alloc/malloc.c
new file mode 100644
index 00000000..453f32de
--- /dev/null
+++ b/lib/alloc/malloc.c
@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008     , Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "alloc/malloc.h"
+
+#include <stddef.h>
+
+
+extern inline void *mallocarray(size_t nmemb, size_t size);
diff --git a/lib/alloc/malloc.h b/lib/alloc/malloc.h
new file mode 100644
index 00000000..338d4c09
--- /dev/null
+++ b/lib/alloc/malloc.h
@@ -0,0 +1,34 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ALLOC_MALLOC_H_
+#define SHADOW_INCLUDE_LIB_ALLOC_MALLOC_H_
+
+
+#include <config.h>
+
+#include <stdlib.h>
+
+#include "attr.h"
+
+
+#define MALLOC(n, type)                                                       \
+(                                                                             \
+	(type *) mallocarray(n, sizeof(type))                                 \
+)
+
+
+ATTR_ALLOC_SIZE(1, 2)
+ATTR_MALLOC(free)
+inline void *mallocarray(size_t nmemb, size_t size);
+
+
+inline void *
+mallocarray(size_t nmemb, size_t size)
+{
+	return reallocarray(NULL, nmemb, size);
+}
+
+
+#endif  // include guard
diff --git a/lib/alloc/realloc.c b/lib/alloc/realloc.c
new file mode 100644
index 00000000..ecdc3980
--- /dev/null
+++ b/lib/alloc/realloc.c
@@ -0,0 +1,11 @@
+// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008     , Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "alloc/realloc.h"
diff --git a/lib/alloc/realloc.h b/lib/alloc/realloc.h
new file mode 100644
index 00000000..63f14dc2
--- /dev/null
+++ b/lib/alloc/realloc.h
@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ALLOC_REALLOC_H_
+#define SHADOW_INCLUDE_LIB_ALLOC_REALLOC_H_
+
+
+#include <config.h>
+
+#include <stdlib.h>
+
+
+#define REALLOC(p, n, type)                                                   \
+(                                                                             \
+	_Generic(p, type *: (type *) reallocarray(p, (n) ?: 1, sizeof(type))) \
+)
+
+
+#endif  // include guard
diff --git a/lib/alloc/reallocf.c b/lib/alloc/reallocf.c
new file mode 100644
index 00000000..953cf7e1
--- /dev/null
+++ b/lib/alloc/reallocf.c
@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008     , Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "alloc/reallocf.h"
+
+#include <stddef.h>
+
+
+extern inline void *reallocarrayf(void *p, size_t nmemb, size_t size);
diff --git a/lib/alloc/reallocf.h b/lib/alloc/reallocf.h
new file mode 100644
index 00000000..2d328b6a
--- /dev/null
+++ b/lib/alloc/reallocf.h
@@ -0,0 +1,41 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ALLOC_REALLOCF_H_
+#define SHADOW_INCLUDE_LIB_ALLOC_REALLOCF_H_
+
+
+#include <config.h>
+
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "attr.h"
+
+
+#define REALLOCF(p, n, type)                                                  \
+(                                                                             \
+	_Generic(p, type *: (type *) reallocarrayf(p, (n) ?: 1, sizeof(type)))\
+)
+
+
+ATTR_ALLOC_SIZE(2, 3)
+ATTR_MALLOC(free)
+inline void *reallocarrayf(void *p, size_t nmemb, size_t size);
+
+
+inline void *
+reallocarrayf(void *p, size_t nmemb, size_t size)
+{
+	void  *q;
+
+	q = reallocarray(p, nmemb ?: 1, size ?: 1);
+
+	if (q == NULL)
+		free(p);
+	return q;
+}
+
+
+#endif  // include guard
diff --git a/lib/alloc/x/xcalloc.c b/lib/alloc/x/xcalloc.c
new file mode 100644
index 00000000..672d5ee7
--- /dev/null
+++ b/lib/alloc/x/xcalloc.c
@@ -0,0 +1,36 @@
+// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008     , Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "alloc/x/xcalloc.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "defines.h"
+#include "shadowlog.h"
+
+
+void *
+xcalloc(size_t nmemb, size_t size)
+{
+	void  *p;
+
+	p = calloc(nmemb, size);
+	if (p == NULL)
+		goto x;
+
+	return p;
+
+x:
+	fprintf(log_get_logfd(), _("%s: %s\n"),
+	        log_get_progname(), strerror(errno));
+	exit(13);
+}
diff --git a/lib/alloc/x/xcalloc.h b/lib/alloc/x/xcalloc.h
new file mode 100644
index 00000000..b4785ec2
--- /dev/null
+++ b/lib/alloc/x/xcalloc.h
@@ -0,0 +1,28 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ALLOC_X_XCALLOC_H_
+#define SHADOW_INCLUDE_LIB_ALLOC_X_XCALLOC_H_
+
+
+#include <config.h>
+
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "attr.h"
+
+
+#define XCALLOC(n, type)                                                      \
+(                                                                             \
+	(type *) xcalloc(n, sizeof(type))                                     \
+)
+
+
+ATTR_ALLOC_SIZE(1, 2)
+ATTR_MALLOC(free)
+void *xcalloc(size_t nmemb, size_t size);
+
+
+#endif  // include guard
diff --git a/lib/alloc/x/xmalloc.c b/lib/alloc/x/xmalloc.c
new file mode 100644
index 00000000..223da9a3
--- /dev/null
+++ b/lib/alloc/x/xmalloc.c
@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008     , Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "alloc/x/xmalloc.h"
+
+#include <stddef.h>
+
+
+extern inline void *xmallocarray(size_t nmemb, size_t size);
diff --git a/lib/alloc/x/xmalloc.h b/lib/alloc/x/xmalloc.h
new file mode 100644
index 00000000..1520b7fd
--- /dev/null
+++ b/lib/alloc/x/xmalloc.h
@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ALLOC_X_XMALLOC_H_
+#define SHADOW_INCLUDE_LIB_ALLOC_X_XMALLOC_H_
+
+
+#include <config.h>
+
+#include <stddef.h>
+
+#include "alloc/x/xrealloc.h"
+#include "attr.h"
+
+
+#define XMALLOC(n, type)                                                      \
+(                                                                             \
+	(type *) xmallocarray(n, sizeof(type))                                \
+)
+
+
+ATTR_ALLOC_SIZE(1, 2)
+ATTR_MALLOC(free)
+inline void *xmallocarray(size_t nmemb, size_t size);
+
+
+inline void *
+xmallocarray(size_t nmemb, size_t size)
+{
+	return xreallocarray(NULL, nmemb, size);
+}
+
+
+#endif  // include guard
diff --git a/lib/alloc/x/xrealloc.c b/lib/alloc/x/xrealloc.c
new file mode 100644
index 00000000..76887f96
--- /dev/null
+++ b/lib/alloc/x/xrealloc.c
@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008     , Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "alloc/x/xrealloc.h"
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "alloc/reallocf.h"
+#include "defines.h"
+#include "shadowlog.h"
+
+
+void *
+xreallocarray(void *p, size_t nmemb, size_t size)
+{
+	p = reallocarrayf(p, nmemb, size);
+	if (p == NULL)
+		goto x;
+
+	return p;
+
+x:
+	fprintf(log_get_logfd(), _("%s: %s\n"),
+	        log_get_progname(), strerror(errno));
+	exit(13);
+}
diff --git a/lib/alloc/x/xrealloc.h b/lib/alloc/x/xrealloc.h
new file mode 100644
index 00000000..ef674967
--- /dev/null
+++ b/lib/alloc/x/xrealloc.h
@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_MALLOC_H_
+#define SHADOW_INCLUDE_LIB_MALLOC_H_
+
+
+#include <config.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "attr.h"
+
+
+#define XREALLOC(ptr, n, type)                                                \
+(                                                                             \
+	_Generic(ptr, type *:  (type *) xreallocarray(ptr, n, sizeof(type)))  \
+)
+
+
+ATTR_ALLOC_SIZE(2, 3)
+ATTR_MALLOC(free)
+void *xreallocarray(void *p, size_t nmemb, size_t size);
+
+
+#endif  // include guard
diff --git a/lib/atoi/a2i.c b/lib/atoi/a2i.c
deleted file mode 100644
index a2cf8723..00000000
--- a/lib/atoi/a2i.c
+++ /dev/null
@@ -1,46 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#include "atoi/a2i.h"
-
-
-extern inline int a2sh_c(short *restrict n, const char *s,
-    const char **restrict endp, int base, short min, short max);
-extern inline int a2si_c(int *restrict n, const char *s,
-    const char **restrict endp, int base, int min, int max);
-extern inline int a2sl_c(long *restrict n, const char *s,
-    const char **restrict endp, int base, long min, long max);
-extern inline int a2sll_c(long long *restrict n, const char *s,
-    const char **restrict endp, int base, long long min, long long max);
-extern inline int a2uh_c(unsigned short *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned short min,
-    unsigned short max);
-extern inline int a2ui_c(unsigned int *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned int min, unsigned int max);
-extern inline int a2ul_c(unsigned long *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned long min, unsigned long max);
-extern inline int a2ull_c(unsigned long long *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned long long min,
-    unsigned long long max);
-
-
-extern inline int a2sh_nc(short *restrict n, char *s,
-    char **restrict endp, int base, short min, short max);
-extern inline int a2si_nc(int *restrict n, char *s,
-    char **restrict endp, int base, int min, int max);
-extern inline int a2sl_nc(long *restrict n, char *s,
-    char **restrict endp, int base, long min, long max);
-extern inline int a2sll_nc(long long *restrict n, char *s,
-    char **restrict endp, int base, long long min, long long max);
-extern inline int a2uh_nc(unsigned short *restrict n, char *s,
-    char **restrict endp, int base, unsigned short min, unsigned short max);
-extern inline int a2ui_nc(unsigned int *restrict n, char *s,
-    char **restrict endp, int base, unsigned int min, unsigned int max);
-extern inline int a2ul_nc(unsigned long *restrict n, char *s,
-    char **restrict endp, int base, unsigned long min, unsigned long max);
-extern inline int a2ull_nc(unsigned long long *restrict n, char *s,
-    char **restrict endp, int base, unsigned long long min,
-    unsigned long long max);
diff --git a/lib/atoi/a2i.h b/lib/atoi/a2i.h
deleted file mode 100644
index 64f775a9..00000000
--- a/lib/atoi/a2i.h
+++ /dev/null
@@ -1,386 +0,0 @@
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_H_
-#define SHADOW_INCLUDE_LIB_ATOI_A2I_H_
-
-
-#include <config.h>
-
-#include <errno.h>
-
-#include "atoi/strtoi.h"
-#include "atoi/strtou_noneg.h"
-#include "attr.h"
-
-
-/*
- * See the manual of these macros in liba2i's documentation:
- * <http://www.alejandro-colomar.es/share/dist/liba2i/git/HEAD/liba2i-HEAD.pdf>
- */
-
-
-#define a2i(TYPE, n, s, ...)                                                  \
-(                                                                             \
-	_Generic((void (*)(TYPE, typeof(s))) 0,                               \
-		void (*)(short,              const char *):  a2sh_c,          \
-		void (*)(short,              const void *):  a2sh_c,          \
-		void (*)(short,              char *):        a2sh_nc,         \
-		void (*)(short,              void *):        a2sh_nc,         \
-		void (*)(int,                const char *):  a2si_c,          \
-		void (*)(int,                const void *):  a2si_c,          \
-		void (*)(int,                char *):        a2si_nc,         \
-		void (*)(int,                void *):        a2si_nc,         \
-		void (*)(long,               const char *):  a2sl_c,          \
-		void (*)(long,               const void *):  a2sl_c,          \
-		void (*)(long,               char *):        a2sl_nc,         \
-		void (*)(long,               void *):        a2sl_nc,         \
-		void (*)(long long,          const char *):  a2sll_c,         \
-		void (*)(long long,          const void *):  a2sll_c,         \
-		void (*)(long long,          char *):        a2sll_nc,        \
-		void (*)(long long,          void *):        a2sll_nc,        \
-		void (*)(unsigned short,     const char *):  a2uh_c,          \
-		void (*)(unsigned short,     const void *):  a2uh_c,          \
-		void (*)(unsigned short,     char *):        a2uh_nc,         \
-		void (*)(unsigned short,     void *):        a2uh_nc,         \
-		void (*)(unsigned int,       const char *):  a2ui_c,          \
-		void (*)(unsigned int,       const void *):  a2ui_c,          \
-		void (*)(unsigned int,       char *):        a2ui_nc,         \
-		void (*)(unsigned int,       void *):        a2ui_nc,         \
-		void (*)(unsigned long,      const char *):  a2ul_c,          \
-		void (*)(unsigned long,      const void *):  a2ul_c,          \
-		void (*)(unsigned long,      char *):        a2ul_nc,         \
-		void (*)(unsigned long,      void *):        a2ul_nc,         \
-		void (*)(unsigned long long, const char *):  a2ull_c,         \
-		void (*)(unsigned long long, const void *):  a2ull_c,         \
-		void (*)(unsigned long long, char *):        a2ull_nc,        \
-		void (*)(unsigned long long, void *):        a2ull_nc         \
-	)(n, s, __VA_ARGS__)                                                  \
-)
-
-
-#define a2sh(n, s, ...)                                                       \
-(                                                                             \
-	_Generic(s,                                                           \
-		const char *:  a2sh_c,                                        \
-		const void *:  a2sh_c,                                        \
-		char *:        a2sh_nc,                                       \
-		void *:        a2sh_nc                                        \
-	)(n, s, __VA_ARGS__)                                                  \
-)
-
-#define a2si(n, s, ...)                                                       \
-(                                                                             \
-	_Generic(s,                                                           \
-		const char *:  a2si_c,                                        \
-		const void *:  a2si_c,                                        \
-		char *:        a2si_nc,                                       \
-		void *:        a2si_nc                                        \
-	)(n, s, __VA_ARGS__)                                                  \
-)
-
-#define a2sl(n, s, ...)                                                       \
-(                                                                             \
-	_Generic(s,                                                           \
-		const char *:  a2sl_c,                                        \
-		const void *:  a2sl_c,                                        \
-		char *:        a2sl_nc,                                       \
-		void *:        a2sl_nc                                        \
-	)(n, s, __VA_ARGS__)                                                  \
-)
-
-#define a2sll(n, s, ...)                                                      \
-(                                                                             \
-	_Generic(s,                                                           \
-		const char *:  a2sll_c,                                       \
-		const void *:  a2sll_c,                                       \
-		char *:        a2sll_nc,                                      \
-		void *:        a2sll_nc                                       \
-	)(n, s, __VA_ARGS__)                                                  \
-)
-
-#define a2uh(n, s, ...)                                                       \
-(                                                                             \
-	_Generic(s,                                                           \
-		const char *:  a2uh_c,                                        \
-		const void *:  a2uh_c,                                        \
-		char *:        a2uh_nc,                                       \
-		void *:        a2uh_nc                                        \
-	)(n, s, __VA_ARGS__)                                                  \
-)
-
-#define a2ui(n, s, ...)                                                       \
-(                                                                             \
-	_Generic(s,                                                           \
-		const char *:  a2ui_c,                                        \
-		const void *:  a2ui_c,                                        \
-		char *:        a2ui_nc,                                       \
-		void *:        a2ui_nc                                        \
-	)(n, s, __VA_ARGS__)                                                  \
-)
-
-#define a2ul(n, s, ...)                                                       \
-(                                                                             \
-	_Generic(s,                                                           \
-		const char *:  a2ul_c,                                        \
-		const void *:  a2ul_c,                                        \
-		char *:        a2ul_nc,                                       \
-		void *:        a2ul_nc                                        \
-	)(n, s, __VA_ARGS__)                                                  \
-)
-
-#define a2ull(n, s, ...)                                                      \
-(                                                                             \
-	_Generic(s,                                                           \
-		const char *:  a2ull_c,                                       \
-		const void *:  a2ull_c,                                       \
-		char *:        a2ull_nc,                                      \
-		void *:        a2ull_nc                                       \
-	)(n, s, __VA_ARGS__)                                                  \
-)
-
-
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2sh_c(short *restrict n, const char *s,
-    const char **restrict endp, int base, short min, short max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2si_c(int *restrict n, const char *s,
-    const char **restrict endp, int base, int min, int max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2sl_c(long *restrict n, const char *s,
-    const char **restrict endp, int base, long min, long max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2sll_c(long long *restrict n, const char *s,
-    const char **restrict endp, int base, long long min, long long max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2uh_c(unsigned short *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned short min,
-    unsigned short max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2ui_c(unsigned int *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned int min, unsigned int max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2ul_c(unsigned long *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned long min, unsigned long max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2ull_c(unsigned long long *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned long long min,
-    unsigned long long max);
-
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2sh_nc(short *restrict n, char *s,
-    char **restrict endp, int base, short min, short max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2si_nc(int *restrict n, char *s,
-    char **restrict endp, int base, int min, int max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2sl_nc(long *restrict n, char *s,
-    char **restrict endp, int base, long min, long max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2sll_nc(long long *restrict n, char *s,
-    char **restrict endp, int base, long long min, long long max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2uh_nc(unsigned short *restrict n, char *s,
-    char **restrict endp, int base, unsigned short min, unsigned short max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2ui_nc(unsigned int *restrict n, char *s,
-    char **restrict endp, int base, unsigned int min, unsigned int max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2ul_nc(unsigned long *restrict n, char *s,
-    char **restrict endp, int base, unsigned long min, unsigned long max);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
-inline int a2ull_nc(unsigned long long *restrict n, char *s,
-    char **restrict endp, int base, unsigned long long min,
-    unsigned long long max);
-
-
-inline int
-a2sh_c(short *restrict n, const char *s,
-    const char **restrict endp, int base, short min, short max)
-{
-	return a2sh(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-inline int
-a2si_c(int *restrict n, const char *s,
-    const char **restrict endp, int base, int min, int max)
-{
-	return a2si(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-inline int
-a2sl_c(long *restrict n, const char *s,
-    const char **restrict endp, int base, long min, long max)
-{
-	return a2sl(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-inline int
-a2sll_c(long long *restrict n, const char *s,
-    const char **restrict endp, int base, long long min, long long max)
-{
-	return a2sll(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-inline int
-a2uh_c(unsigned short *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned short min,
-    unsigned short max)
-{
-	return a2uh(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-inline int
-a2ui_c(unsigned int *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned int min, unsigned int max)
-{
-	return a2ui(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-inline int
-a2ul_c(unsigned long *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned long min, unsigned long max)
-{
-	return a2ul(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-inline int
-a2ull_c(unsigned long long *restrict n, const char *s,
-    const char **restrict endp, int base, unsigned long long min,
-    unsigned long long max)
-{
-	return a2ull(n, (char *) s, (char **) endp, base, min, max);
-}
-
-
-inline int
-a2sh_nc(short *restrict n, char *s,
-    char **restrict endp, int base, short min, short max)
-{
-	int  status;
-
-	*n = strtoi_(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-inline int
-a2si_nc(int *restrict n, char *s,
-    char **restrict endp, int base, int min, int max)
-{
-	int  status;
-
-	*n = strtoi_(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-inline int
-a2sl_nc(long *restrict n, char *s,
-    char **restrict endp, int base, long min, long max)
-{
-	int  status;
-
-	*n = strtoi_(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-inline int
-a2sll_nc(long long *restrict n, char *s,
-    char **restrict endp, int base, long long min, long long max)
-{
-	int  status;
-
-	*n = strtoi_(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-inline int
-a2uh_nc(unsigned short *restrict n, char *s,
-    char **restrict endp, int base, unsigned short min,
-    unsigned short max)
-{
-	int  status;
-
-	*n = strtou_noneg(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-inline int
-a2ui_nc(unsigned int *restrict n, char *s,
-    char **restrict endp, int base, unsigned int min, unsigned int max)
-{
-	int  status;
-
-	*n = strtou_noneg(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-inline int
-a2ul_nc(unsigned long *restrict n, char *s,
-    char **restrict endp, int base, unsigned long min, unsigned long max)
-{
-	int  status;
-
-	*n = strtou_noneg(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-inline int
-a2ull_nc(unsigned long long *restrict n, char *s,
-    char **restrict endp, int base, unsigned long long min,
-    unsigned long long max)
-{
-	int  status;
-
-	*n = strtou_noneg(s, endp, base, min, max, &status);
-	if (status != 0) {
-		errno = status;
-		return -1;
-	}
-	return 0;
-}
-
-
-#endif  // include guard
diff --git a/lib/atoi/a2i/a2i.c b/lib/atoi/a2i/a2i.c
new file mode 100644
index 00000000..ec4c976d
--- /dev/null
+++ b/lib/atoi/a2i/a2i.c
@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "atoi/a2i/a2i.h"
diff --git a/lib/atoi/a2i/a2i.h b/lib/atoi/a2i/a2i.h
new file mode 100644
index 00000000..b1a47242
--- /dev/null
+++ b/lib/atoi/a2i/a2i.h
@@ -0,0 +1,62 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2I_H_
+#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2I_H_
+
+
+#include <config.h>
+
+#include "atoi/a2i/a2s_c.h"
+#include "atoi/a2i/a2s_nc.h"
+#include "atoi/a2i/a2u_c.h"
+#include "atoi/a2i/a2u_nc.h"
+
+
+/*
+ * See the manual of these macros in liba2i's documentation:
+ * <http://www.alejandro-colomar.es/share/dist/liba2i/git/HEAD/liba2i-HEAD.pdf>
+ */
+
+
+#define a2i(TYPE, n, s, ...)                                                  \
+(                                                                             \
+	_Generic((void (*)(TYPE, typeof(s))) 0,                               \
+		void (*)(short,              const char *):  a2sh_c,          \
+		void (*)(short,              const void *):  a2sh_c,          \
+		void (*)(short,              char *):        a2sh_nc,         \
+		void (*)(short,              void *):        a2sh_nc,         \
+		void (*)(int,                const char *):  a2si_c,          \
+		void (*)(int,                const void *):  a2si_c,          \
+		void (*)(int,                char *):        a2si_nc,         \
+		void (*)(int,                void *):        a2si_nc,         \
+		void (*)(long,               const char *):  a2sl_c,          \
+		void (*)(long,               const void *):  a2sl_c,          \
+		void (*)(long,               char *):        a2sl_nc,         \
+		void (*)(long,               void *):        a2sl_nc,         \
+		void (*)(long long,          const char *):  a2sll_c,         \
+		void (*)(long long,          const void *):  a2sll_c,         \
+		void (*)(long long,          char *):        a2sll_nc,        \
+		void (*)(long long,          void *):        a2sll_nc,        \
+		void (*)(unsigned short,     const char *):  a2uh_c,          \
+		void (*)(unsigned short,     const void *):  a2uh_c,          \
+		void (*)(unsigned short,     char *):        a2uh_nc,         \
+		void (*)(unsigned short,     void *):        a2uh_nc,         \
+		void (*)(unsigned int,       const char *):  a2ui_c,          \
+		void (*)(unsigned int,       const void *):  a2ui_c,          \
+		void (*)(unsigned int,       char *):        a2ui_nc,         \
+		void (*)(unsigned int,       void *):        a2ui_nc,         \
+		void (*)(unsigned long,      const char *):  a2ul_c,          \
+		void (*)(unsigned long,      const void *):  a2ul_c,          \
+		void (*)(unsigned long,      char *):        a2ul_nc,         \
+		void (*)(unsigned long,      void *):        a2ul_nc,         \
+		void (*)(unsigned long long, const char *):  a2ull_c,         \
+		void (*)(unsigned long long, const void *):  a2ull_c,         \
+		void (*)(unsigned long long, char *):        a2ull_nc,        \
+		void (*)(unsigned long long, void *):        a2ull_nc         \
+	)(n, s, __VA_ARGS__)                                                  \
+)
+
+
+#endif  // include guard
diff --git a/lib/atoi/a2i/a2s.c b/lib/atoi/a2i/a2s.c
new file mode 100644
index 00000000..a60c97bc
--- /dev/null
+++ b/lib/atoi/a2i/a2s.c
@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "atoi/a2i/a2s.h"
diff --git a/lib/atoi/a2i/a2s.h b/lib/atoi/a2i/a2s.h
new file mode 100644
index 00000000..935e109a
--- /dev/null
+++ b/lib/atoi/a2i/a2s.h
@@ -0,0 +1,56 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2S_H_
+#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2S_H_
+
+
+#include <config.h>
+
+#include "atoi/a2i/a2s_c.h"
+#include "atoi/a2i/a2s_nc.h"
+
+
+#define a2sh(n, s, ...)                                                       \
+(                                                                             \
+	_Generic(s,                                                           \
+		const char *:  a2sh_c,                                        \
+		const void *:  a2sh_c,                                        \
+		char *:        a2sh_nc,                                       \
+		void *:        a2sh_nc                                        \
+	)(n, s, __VA_ARGS__)                                                  \
+)
+
+#define a2si(n, s, ...)                                                       \
+(                                                                             \
+	_Generic(s,                                                           \
+		const char *:  a2si_c,                                        \
+		const void *:  a2si_c,                                        \
+		char *:        a2si_nc,                                       \
+		void *:        a2si_nc                                        \
+	)(n, s, __VA_ARGS__)                                                  \
+)
+
+#define a2sl(n, s, ...)                                                       \
+(                                                                             \
+	_Generic(s,                                                           \
+		const char *:  a2sl_c,                                        \
+		const void *:  a2sl_c,                                        \
+		char *:        a2sl_nc,                                       \
+		void *:        a2sl_nc                                        \
+	)(n, s, __VA_ARGS__)                                                  \
+)
+
+#define a2sll(n, s, ...)                                                      \
+(                                                                             \
+	_Generic(s,                                                           \
+		const char *:  a2sll_c,                                       \
+		const void *:  a2sll_c,                                       \
+		char *:        a2sll_nc,                                      \
+		void *:        a2sll_nc                                       \
+	)(n, s, __VA_ARGS__)                                                  \
+)
+
+
+#endif  // include guard
diff --git a/lib/atoi/a2i/a2s_c.c b/lib/atoi/a2i/a2s_c.c
new file mode 100644
index 00000000..257b8d4e
--- /dev/null
+++ b/lib/atoi/a2i/a2s_c.c
@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "atoi/a2i/a2s_c.h"
+
+
+extern inline int a2sh_c(short *restrict n, const char *s,
+    const char **restrict endp, int base, short min, short max);
+extern inline int a2si_c(int *restrict n, const char *s,
+    const char **restrict endp, int base, int min, int max);
+extern inline int a2sl_c(long *restrict n, const char *s,
+    const char **restrict endp, int base, long min, long max);
+extern inline int a2sll_c(long long *restrict n, const char *s,
+    const char **restrict endp, int base, long long min, long long max);
diff --git a/lib/atoi/a2i/a2s_c.h b/lib/atoi/a2i/a2s_c.h
new file mode 100644
index 00000000..5d0024d1
--- /dev/null
+++ b/lib/atoi/a2i/a2s_c.h
@@ -0,0 +1,64 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2S_C_H_
+#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2S_C_H_
+
+
+#include <config.h>
+
+#include <errno.h>
+#include <inttypes.h>
+
+#include "atoi/a2i/a2s_nc.h"
+#include "attr.h"
+
+
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2sh_c(short *restrict n, const char *s,
+    const char **restrict endp, int base, short min, short max);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2si_c(int *restrict n, const char *s,
+    const char **restrict endp, int base, int min, int max);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2sl_c(long *restrict n, const char *s,
+    const char **restrict endp, int base, long min, long max);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2sll_c(long long *restrict n, const char *s,
+    const char **restrict endp, int base, long long min, long long max);
+
+
+inline int
+a2sh_c(short *restrict n, const char *s,
+    const char **restrict endp, int base, short min, short max)
+{
+	return a2sh_nc(n, (char *) s, (char **) endp, base, min, max);
+}
+
+
+inline int
+a2si_c(int *restrict n, const char *s,
+    const char **restrict endp, int base, int min, int max)
+{
+	return a2si_nc(n, (char *) s, (char **) endp, base, min, max);
+}
+
+
+inline int
+a2sl_c(long *restrict n, const char *s,
+    const char **restrict endp, int base, long min, long max)
+{
+	return a2sl_nc(n, (char *) s, (char **) endp, base, min, max);
+}
+
+
+inline int
+a2sll_c(long long *restrict n, const char *s,
+    const char **restrict endp, int base, long long min, long long max)
+{
+	return a2sll_nc(n, (char *) s, (char **) endp, base, min, max);
+}
+
+
+#endif  // include guard
diff --git a/lib/atoi/a2i/a2s_nc.c b/lib/atoi/a2i/a2s_nc.c
new file mode 100644
index 00000000..7ef8be6c
--- /dev/null
+++ b/lib/atoi/a2i/a2s_nc.c
@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "atoi/a2i/a2s_nc.h"
+
+
+extern inline int a2sh_nc(short *restrict n, char *s,
+    char **restrict endp, int base, short min, short max);
+extern inline int a2si_nc(int *restrict n, char *s,
+    char **restrict endp, int base, int min, int max);
+extern inline int a2sl_nc(long *restrict n, char *s,
+    char **restrict endp, int base, long min, long max);
+extern inline int a2sll_nc(long long *restrict n, char *s,
+    char **restrict endp, int base, long long min, long long max);
diff --git a/lib/atoi/a2i/a2s_nc.h b/lib/atoi/a2i/a2s_nc.h
new file mode 100644
index 00000000..8ca16f27
--- /dev/null
+++ b/lib/atoi/a2i/a2s_nc.h
@@ -0,0 +1,91 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2S_NC_H_
+#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2S_NC_H_
+
+
+#include <config.h>
+
+#include <errno.h>
+
+#include "atoi/strtoi/strtoi.h"
+#include "attr.h"
+
+
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2sh_nc(short *restrict n, char *s,
+    char **restrict endp, int base, short min, short max);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2si_nc(int *restrict n, char *s,
+    char **restrict endp, int base, int min, int max);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2sl_nc(long *restrict n, char *s,
+    char **restrict endp, int base, long min, long max);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2sll_nc(long long *restrict n, char *s,
+    char **restrict endp, int base, long long min, long long max);
+
+
+inline int
+a2sh_nc(short *restrict n, char *s,
+    char **restrict endp, int base, short min, short max)
+{
+	int  status;
+
+	*n = strtoi_(s, endp, base, min, max, &status);
+	if (status != 0) {
+		errno = status;
+		return -1;
+	}
+	return 0;
+}
+
+
+inline int
+a2si_nc(int *restrict n, char *s,
+    char **restrict endp, int base, int min, int max)
+{
+	int  status;
+
+	*n = strtoi_(s, endp, base, min, max, &status);
+	if (status != 0) {
+		errno = status;
+		return -1;
+	}
+	return 0;
+}
+
+
+inline int
+a2sl_nc(long *restrict n, char *s,
+    char **restrict endp, int base, long min, long max)
+{
+	int  status;
+
+	*n = strtoi_(s, endp, base, min, max, &status);
+	if (status != 0) {
+		errno = status;
+		return -1;
+	}
+	return 0;
+}
+
+
+inline int
+a2sll_nc(long long *restrict n, char *s,
+    char **restrict endp, int base, long long min, long long max)
+{
+	int  status;
+
+	*n = strtoi_(s, endp, base, min, max, &status);
+	if (status != 0) {
+		errno = status;
+		return -1;
+	}
+	return 0;
+}
+
+
+#endif  // include guard
diff --git a/lib/atoi/a2i/a2u.c b/lib/atoi/a2i/a2u.c
new file mode 100644
index 00000000..8523e8bf
--- /dev/null
+++ b/lib/atoi/a2i/a2u.c
@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "atoi/a2i/a2u.h"
diff --git a/lib/atoi/a2i/a2u.h b/lib/atoi/a2i/a2u.h
new file mode 100644
index 00000000..2a3852e4
--- /dev/null
+++ b/lib/atoi/a2i/a2u.h
@@ -0,0 +1,56 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2U_H_
+#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2U_H_
+
+
+#include <config.h>
+
+#include "atoi/a2i/a2u_c.h"
+#include "atoi/a2i/a2u_nc.h"
+
+
+#define a2uh(n, s, ...)                                                       \
+(                                                                             \
+	_Generic(s,                                                           \
+		const char *:  a2uh_c,                                        \
+		const void *:  a2uh_c,                                        \
+		char *:        a2uh_nc,                                       \
+		void *:        a2uh_nc                                        \
+	)(n, s, __VA_ARGS__)                                                  \
+)
+
+#define a2ui(n, s, ...)                                                       \
+(                                                                             \
+	_Generic(s,                                                           \
+		const char *:  a2ui_c,                                        \
+		const void *:  a2ui_c,                                        \
+		char *:        a2ui_nc,                                       \
+		void *:        a2ui_nc                                        \
+	)(n, s, __VA_ARGS__)                                                  \
+)
+
+#define a2ul(n, s, ...)                                                       \
+(                                                                             \
+	_Generic(s,                                                           \
+		const char *:  a2ul_c,                                        \
+		const void *:  a2ul_c,                                        \
+		char *:        a2ul_nc,                                       \
+		void *:        a2ul_nc                                        \
+	)(n, s, __VA_ARGS__)                                                  \
+)
+
+#define a2ull(n, s, ...)                                                      \
+(                                                                             \
+	_Generic(s,                                                           \
+		const char *:  a2ull_c,                                       \
+		const void *:  a2ull_c,                                       \
+		char *:        a2ull_nc,                                      \
+		void *:        a2ull_nc                                       \
+	)(n, s, __VA_ARGS__)                                                  \
+)
+
+
+#endif  // include guard
diff --git a/lib/atoi/a2i/a2u_c.c b/lib/atoi/a2i/a2u_c.c
new file mode 100644
index 00000000..e1d04b85
--- /dev/null
+++ b/lib/atoi/a2i/a2u_c.c
@@ -0,0 +1,19 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "atoi/a2i/a2u_c.h"
+
+
+extern inline int a2uh_c(unsigned short *restrict n, const char *s,
+    const char **restrict endp, int base, unsigned short min,
+    unsigned short max);
+extern inline int a2ui_c(unsigned int *restrict n, const char *s,
+    const char **restrict endp, int base, unsigned int min, unsigned int max);
+extern inline int a2ul_c(unsigned long *restrict n, const char *s,
+    const char **restrict endp, int base, unsigned long min, unsigned long max);
+extern inline int a2ull_c(unsigned long long *restrict n, const char *s,
+    const char **restrict endp, int base, unsigned long long min,
+    unsigned long long max);
diff --git a/lib/atoi/a2i/a2u_c.h b/lib/atoi/a2i/a2u_c.h
new file mode 100644
index 00000000..420e7852
--- /dev/null
+++ b/lib/atoi/a2i/a2u_c.h
@@ -0,0 +1,65 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2U_C_H_
+#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2U_C_H_
+
+
+#include <config.h>
+
+#include "atoi/a2i/a2u_nc.h"
+#include "attr.h"
+
+
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2uh_c(unsigned short *restrict n, const char *s,
+    const char **restrict endp, int base, unsigned short min,
+    unsigned short max);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2ui_c(unsigned int *restrict n, const char *s,
+    const char **restrict endp, int base, unsigned int min, unsigned int max);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2ul_c(unsigned long *restrict n, const char *s,
+    const char **restrict endp, int base, unsigned long min, unsigned long max);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2ull_c(unsigned long long *restrict n, const char *s,
+    const char **restrict endp, int base, unsigned long long min,
+    unsigned long long max);
+
+
+inline int
+a2uh_c(unsigned short *restrict n, const char *s,
+    const char **restrict endp, int base, unsigned short min,
+    unsigned short max)
+{
+	return a2uh_nc(n, (char *) s, (char **) endp, base, min, max);
+}
+
+
+inline int
+a2ui_c(unsigned int *restrict n, const char *s,
+    const char **restrict endp, int base, unsigned int min, unsigned int max)
+{
+	return a2ui_nc(n, (char *) s, (char **) endp, base, min, max);
+}
+
+
+inline int
+a2ul_c(unsigned long *restrict n, const char *s,
+    const char **restrict endp, int base, unsigned long min, unsigned long max)
+{
+	return a2ul_nc(n, (char *) s, (char **) endp, base, min, max);
+}
+
+
+inline int
+a2ull_c(unsigned long long *restrict n, const char *s,
+    const char **restrict endp, int base, unsigned long long min,
+    unsigned long long max)
+{
+	return a2ull_nc(n, (char *) s, (char **) endp, base, min, max);
+}
+
+
+#endif  // include guard
diff --git a/lib/atoi/a2i/a2u_nc.c b/lib/atoi/a2i/a2u_nc.c
new file mode 100644
index 00000000..4ca282bd
--- /dev/null
+++ b/lib/atoi/a2i/a2u_nc.c
@@ -0,0 +1,18 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "atoi/a2i/a2u_nc.h"
+
+
+extern inline int a2uh_nc(unsigned short *restrict n, char *s,
+    char **restrict endp, int base, unsigned short min, unsigned short max);
+extern inline int a2ui_nc(unsigned int *restrict n, char *s,
+    char **restrict endp, int base, unsigned int min, unsigned int max);
+extern inline int a2ul_nc(unsigned long *restrict n, char *s,
+    char **restrict endp, int base, unsigned long min, unsigned long max);
+extern inline int a2ull_nc(unsigned long long *restrict n, char *s,
+    char **restrict endp, int base, unsigned long long min,
+    unsigned long long max);
diff --git a/lib/atoi/a2i/a2u_nc.h b/lib/atoi/a2i/a2u_nc.h
new file mode 100644
index 00000000..c8d993e7
--- /dev/null
+++ b/lib/atoi/a2i/a2u_nc.h
@@ -0,0 +1,94 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ATOI_A2I_A2U_NC_H_
+#define SHADOW_INCLUDE_LIB_ATOI_A2I_A2U_NC_H_
+
+
+#include <config.h>
+
+#include <errno.h>
+
+#include "atoi/strtoi/strtou_noneg.h"
+#include "attr.h"
+
+
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2uh_nc(unsigned short *restrict n, char *s,
+    char **restrict endp, int base, unsigned short min, unsigned short max);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2ui_nc(unsigned int *restrict n, char *s,
+    char **restrict endp, int base, unsigned int min, unsigned int max);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2ul_nc(unsigned long *restrict n, char *s,
+    char **restrict endp, int base, unsigned long min, unsigned long max);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1) ATTR_ACCESS(write_only, 3)
+inline int a2ull_nc(unsigned long long *restrict n, char *s,
+    char **restrict endp, int base, unsigned long long min,
+    unsigned long long max);
+
+
+inline int
+a2uh_nc(unsigned short *restrict n, char *s,
+    char **restrict endp, int base, unsigned short min,
+    unsigned short max)
+{
+	int  status;
+
+	*n = strtou_noneg(s, endp, base, min, max, &status);
+	if (status != 0) {
+		errno = status;
+		return -1;
+	}
+	return 0;
+}
+
+
+inline int
+a2ui_nc(unsigned int *restrict n, char *s,
+    char **restrict endp, int base, unsigned int min, unsigned int max)
+{
+	int  status;
+
+	*n = strtou_noneg(s, endp, base, min, max, &status);
+	if (status != 0) {
+		errno = status;
+		return -1;
+	}
+	return 0;
+}
+
+
+inline int
+a2ul_nc(unsigned long *restrict n, char *s,
+    char **restrict endp, int base, unsigned long min, unsigned long max)
+{
+	int  status;
+
+	*n = strtou_noneg(s, endp, base, min, max, &status);
+	if (status != 0) {
+		errno = status;
+		return -1;
+	}
+	return 0;
+}
+
+
+inline int
+a2ull_nc(unsigned long long *restrict n, char *s,
+    char **restrict endp, int base, unsigned long long min,
+    unsigned long long max)
+{
+	int  status;
+
+	*n = strtou_noneg(s, endp, base, min, max, &status);
+	if (status != 0) {
+		errno = status;
+		return -1;
+	}
+	return 0;
+}
+
+
+#endif  // include guard
diff --git a/lib/atoi/getnum.c b/lib/atoi/getnum.c
new file mode 100644
index 00000000..3c67eb20
--- /dev/null
+++ b/lib/atoi/getnum.c
@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 2009, Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include <sys/types.h>
+
+#include "atoi/getnum.h"
+
+
+extern inline int get_fd(const char *restrict fdstr, int *restrict fd);
+extern inline int get_gid(const char *restrict gidstr, gid_t *restrict gid);
+extern inline int get_pid(const char *restrict pidstr, pid_t *restrict pid);
+extern inline int get_uid(const char *restrict uidstr, uid_t *restrict uid);
diff --git a/lib/atoi/getnum.h b/lib/atoi/getnum.h
new file mode 100644
index 00000000..33d4876a
--- /dev/null
+++ b/lib/atoi/getnum.h
@@ -0,0 +1,60 @@
+// SPDX-FileCopyrightText: 2009, Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ATOI_GETNUM_H_
+#define SHADOW_INCLUDE_LIB_ATOI_GETNUM_H_
+
+
+#include <config.h>
+
+#include <limits.h>
+#include <stddef.h>
+#include <sys/types.h>
+
+#include "atoi/a2i/a2i.h"
+#include "atoi/a2i/a2s.h"
+#include "attr.h"
+#include "typetraits.h"
+
+
+ATTR_STRING(1) ATTR_ACCESS(write_only, 2)
+inline int get_fd(const char *restrict fdstr, int *restrict fd);
+ATTR_STRING(1) ATTR_ACCESS(write_only, 2)
+inline int get_gid(const char *restrict gidstr, gid_t *restrict gid);
+ATTR_STRING(1) ATTR_ACCESS(write_only, 2)
+inline int get_pid(const char *restrict pidstr, pid_t *restrict pid);
+ATTR_STRING(1) ATTR_ACCESS(write_only, 2)
+inline int get_uid(const char *restrict uidstr, uid_t *restrict uid);
+
+
+inline int
+get_fd(const char *restrict fdstr, int *restrict fd)
+{
+	return a2si(fd, fdstr, NULL, 10, 0, INT_MAX);
+}
+
+
+inline int
+get_gid(const char *restrict gidstr, gid_t *restrict gid)
+{
+	return a2i(gid_t, gid, gidstr, NULL, 10, type_min(gid_t), type_max(gid_t));
+}
+
+
+inline int
+get_pid(const char *restrict pidstr, pid_t *restrict pid)
+{
+	return a2i(pid_t, pid, pidstr, NULL, 10, 1, type_max(pid_t));
+}
+
+
+inline int
+get_uid(const char *restrict uidstr, uid_t *restrict uid)
+{
+	return a2i(uid_t, uid, uidstr, NULL, 10, type_min(uid_t), type_max(uid_t));
+}
+
+
+#endif  // include guard
diff --git a/lib/atoi/str2i.h b/lib/atoi/str2i.h
deleted file mode 100644
index b3ded031..00000000
--- a/lib/atoi/str2i.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// SPDX-FileCopyrightText: 2007-2009, Nicolas François
-// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ATOI_STR2I_H_
-#define SHADOW_INCLUDE_LIB_ATOI_STR2I_H_
-
-
-#include <config.h>
-
-#include <limits.h>
-#include <stddef.h>
-
-#include "atoi/a2i.h"
-#include "attr.h"
-
-
-#define str2i(TYPE, ...)                                                      \
-(                                                                             \
-	_Generic((TYPE) 0,                                                    \
-		short:              str2sh,                                   \
-		int:                str2si,                                   \
-		long:               str2sl,                                   \
-		long long:          str2sll,                                  \
-		unsigned short:     str2uh,                                   \
-		unsigned int:       str2ui,                                   \
-		unsigned long:      str2ul,                                   \
-		unsigned long long: str2ull                                   \
-	)(__VA_ARGS__)                                                        \
-)
-
-
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
-inline int str2sh(short *restrict n, const char *restrict s);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
-inline int str2si(int *restrict n, const char *restrict s);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
-inline int str2sl(long *restrict n, const char *restrict s);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
-inline int str2sll(long long *restrict n, const char *restrict s);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
-inline int str2uh(unsigned short *restrict n, const char *restrict s);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
-inline int str2ui(unsigned int *restrict n, const char *restrict s);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
-inline int str2ul(unsigned long *restrict n, const char *restrict s);
-ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
-inline int str2ull(unsigned long long *restrict n, const char *restrict s);
-
-
-inline int
-str2sh(short *restrict n, const char *restrict s)
-{
-	return a2sh(n, s, NULL, 0, SHRT_MIN, SHRT_MAX);
-}
-
-
-inline int
-str2si(int *restrict n, const char *restrict s)
-{
-	return a2si(n, s, NULL, 0, INT_MIN, INT_MAX);
-}
-
-
-inline int
-str2sl(long *restrict n, const char *restrict s)
-{
-	return a2sl(n, s, NULL, 0, LONG_MIN, LONG_MAX);
-}
-
-
-inline int
-str2sll(long long *restrict n, const char *restrict s)
-{
-	return a2sll(n, s, NULL, 0, LLONG_MIN, LLONG_MAX);
-}
-
-
-inline int
-str2uh(unsigned short *restrict n, const char *restrict s)
-{
-	return a2uh(n, s, NULL, 0, 0, USHRT_MAX);
-}
-
-
-inline int
-str2ui(unsigned int *restrict n, const char *restrict s)
-{
-	return a2ui(n, s, NULL, 0, 0, UINT_MAX);
-}
-
-
-inline int
-str2ul(unsigned long *restrict n, const char *restrict s)
-{
-	return a2ul(n, s, NULL, 0, 0, ULONG_MAX);
-}
-
-
-inline int
-str2ull(unsigned long long *restrict n, const char *restrict s)
-{
-	return a2ull(n, s, NULL, 0, 0, ULLONG_MAX);
-}
-
-
-#endif  // include guard
diff --git a/lib/atoi/str2i/str2i.c b/lib/atoi/str2i/str2i.c
new file mode 100644
index 00000000..ff5ad8f0
--- /dev/null
+++ b/lib/atoi/str2i/str2i.c
@@ -0,0 +1,8 @@
+// SPDX-FileCopyrightText: 2007-2009, Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "atoi/str2i/str2i.h"
diff --git a/lib/atoi/str2i/str2i.h b/lib/atoi/str2i/str2i.h
new file mode 100644
index 00000000..e2cecc75
--- /dev/null
+++ b/lib/atoi/str2i/str2i.h
@@ -0,0 +1,31 @@
+// SPDX-FileCopyrightText: 2007-2009, Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ATOI_STR2I_STR2I_H_
+#define SHADOW_INCLUDE_LIB_ATOI_STR2I_STR2I_H_
+
+
+#include <config.h>
+
+#include "atoi/str2i/str2s.h"
+#include "atoi/str2i/str2u.h"
+
+
+#define str2i(TYPE, ...)                                                      \
+(                                                                             \
+	_Generic((TYPE) 0,                                                    \
+		short:              str2sh,                                   \
+		int:                str2si,                                   \
+		long:               str2sl,                                   \
+		long long:          str2sll,                                  \
+		unsigned short:     str2uh,                                   \
+		unsigned int:       str2ui,                                   \
+		unsigned long:      str2ul,                                   \
+		unsigned long long: str2ull                                   \
+	)(__VA_ARGS__)                                                        \
+)
+
+
+#endif  // include guard
diff --git a/lib/atoi/str2i/str2s.c b/lib/atoi/str2i/str2s.c
new file mode 100644
index 00000000..f77c594e
--- /dev/null
+++ b/lib/atoi/str2i/str2s.c
@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2007-2009, Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "atoi/str2i/str2s.h"
+
+
+extern inline int str2sh(short *restrict n, const char *restrict s);
+extern inline int str2si(int *restrict n, const char *restrict s);
+extern inline int str2sl(long *restrict n, const char *restrict s);
+extern inline int str2sll(long long *restrict n, const char *restrict s);
diff --git a/lib/atoi/str2i/str2s.h b/lib/atoi/str2i/str2s.h
new file mode 100644
index 00000000..dc20faa1
--- /dev/null
+++ b/lib/atoi/str2i/str2s.h
@@ -0,0 +1,57 @@
+// SPDX-FileCopyrightText: 2007-2009, Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ATOI_STR2I_STR2S_H_
+#define SHADOW_INCLUDE_LIB_ATOI_STR2I_STR2S_H_
+
+
+#include <config.h>
+
+#include <limits.h>
+#include <stddef.h>
+
+#include "atoi/a2i/a2s.h"
+#include "attr.h"
+
+
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
+inline int str2sh(short *restrict n, const char *restrict s);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
+inline int str2si(int *restrict n, const char *restrict s);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
+inline int str2sl(long *restrict n, const char *restrict s);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
+inline int str2sll(long long *restrict n, const char *restrict s);
+
+
+inline int
+str2sh(short *restrict n, const char *restrict s)
+{
+	return a2sh(n, s, NULL, 0, SHRT_MIN, SHRT_MAX);
+}
+
+
+inline int
+str2si(int *restrict n, const char *restrict s)
+{
+	return a2si(n, s, NULL, 0, INT_MIN, INT_MAX);
+}
+
+
+inline int
+str2sl(long *restrict n, const char *restrict s)
+{
+	return a2sl(n, s, NULL, 0, LONG_MIN, LONG_MAX);
+}
+
+
+inline int
+str2sll(long long *restrict n, const char *restrict s)
+{
+	return a2sll(n, s, NULL, 0, LLONG_MIN, LLONG_MAX);
+}
+
+
+#endif  // include guard
diff --git a/lib/atoi/str2i.c b/lib/atoi/str2i/str2u.c
similarity index 62%
rename from lib/atoi/str2i.c
rename to lib/atoi/str2i/str2u.c
index 25ce3609..25fffda9 100644
--- a/lib/atoi/str2i.c
+++ b/lib/atoi/str2i/str2u.c
@@ -5,13 +5,9 @@
 
 #include <config.h>
 
-#include "atoi/str2i.h"
+#include "atoi/str2i/str2u.h"
 
 
-extern inline int str2sh(short *restrict n, const char *restrict s);
-extern inline int str2si(int *restrict n, const char *restrict s);
-extern inline int str2sl(long *restrict n, const char *restrict s);
-extern inline int str2sll(long long *restrict n, const char *restrict s);
 extern inline int str2uh(unsigned short *restrict n, const char *restrict s);
 extern inline int str2ui(unsigned int *restrict n, const char *restrict s);
 extern inline int str2ul(unsigned long *restrict n, const char *restrict s);
diff --git a/lib/atoi/str2i/str2u.h b/lib/atoi/str2i/str2u.h
new file mode 100644
index 00000000..c25941ce
--- /dev/null
+++ b/lib/atoi/str2i/str2u.h
@@ -0,0 +1,57 @@
+// SPDX-FileCopyrightText: 2007-2009, Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ATOI_STR2I_STR2U_H_
+#define SHADOW_INCLUDE_LIB_ATOI_STR2I_STR2U_H_
+
+
+#include <config.h>
+
+#include <limits.h>
+#include <stddef.h>
+
+#include "atoi/a2i/a2u.h"
+#include "attr.h"
+
+
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
+inline int str2uh(unsigned short *restrict n, const char *restrict s);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
+inline int str2ui(unsigned int *restrict n, const char *restrict s);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
+inline int str2ul(unsigned long *restrict n, const char *restrict s);
+ATTR_STRING(2) ATTR_ACCESS(write_only, 1)
+inline int str2ull(unsigned long long *restrict n, const char *restrict s);
+
+
+inline int
+str2uh(unsigned short *restrict n, const char *restrict s)
+{
+	return a2uh(n, s, NULL, 0, 0, USHRT_MAX);
+}
+
+
+inline int
+str2ui(unsigned int *restrict n, const char *restrict s)
+{
+	return a2ui(n, s, NULL, 0, 0, UINT_MAX);
+}
+
+
+inline int
+str2ul(unsigned long *restrict n, const char *restrict s)
+{
+	return a2ul(n, s, NULL, 0, 0, ULONG_MAX);
+}
+
+
+inline int
+str2ull(unsigned long long *restrict n, const char *restrict s)
+{
+	return a2ull(n, s, NULL, 0, 0, ULLONG_MAX);
+}
+
+
+#endif  // include guard
diff --git a/lib/atoi/strtoi.c b/lib/atoi/strtoi.c
deleted file mode 100644
index 197707b1..00000000
--- a/lib/atoi/strtoi.c
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#include "atoi/strtoi.h"
-
-#include <stdint.h>
-
-
-extern inline intmax_t strtoi_(const char *s, char **restrict endp, int base,
-    intmax_t min, intmax_t max, int *restrict status);
-extern inline uintmax_t strtou_(const char *s, char **restrict endp, int base,
-    uintmax_t min, uintmax_t max, int *restrict status);
diff --git a/lib/atoi/strtoi.h b/lib/atoi/strtoi.h
deleted file mode 100644
index 1f061fc0..00000000
--- a/lib/atoi/strtoi.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_ATOI_STRTOI_H_
-#define SHADOW_INCLUDE_LIB_ATOI_STRTOI_H_
-
-
-#include <config.h>
-
-#include <errno.h>
-#include <inttypes.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <sys/param.h>
-
-#include "attr.h"
-
-
-#define strtoNmax(TYPE, ...)                                                  \
-(                                                                             \
-	_Generic((TYPE) 0,                                                    \
-		intmax_t:  strtoimax,                                         \
-		uintmax_t: strtoumax                                          \
-	)(__VA_ARGS__)                                                        \
-)
-
-
-#define strtoN(s, endp, base, min, max, status, TYPE)                         \
-({                                                                            \
-	const char  *s_ = s;                                                  \
-	char        **endp_ = endp;                                           \
-	int         base_ = base;                                             \
-	TYPE        min_ = min;                                               \
-	TYPE        max_ = max;                                               \
-	int         *status_ = status;                                        \
-                                                                              \
-	int         e_, st_;                                                  \
-	char        *end_;                                                    \
-	TYPE        n_;                                                       \
-                                                                              \
-	if (endp_ == NULL)                                                    \
-		endp_ = &end_;                                                \
-	if (status_ == NULL)                                                  \
-		status_ = &st_;                                               \
-                                                                              \
-	if (base_ != 0 && (base_ < 0 || base_ > 36)) {                        \
-		*status_ = EINVAL;                                            \
-		n_ = 0;                                                       \
-                                                                              \
-	} else {                                                              \
-		e_ = errno;                                                   \
-		errno = 0;                                                    \
-		n_ = strtoNmax(TYPE, s_, endp_, base_);                       \
-                                                                              \
-		if (*endp_ == s_)                                             \
-			*status_ = ECANCELED;                                 \
-		else if (errno == ERANGE || n_ < min_ || n_ > max_)           \
-			*status_ = ERANGE;                                    \
-		else if (**endp_ != '\0')                                     \
-			*status_ = ENOTSUP;                                   \
-		else                                                          \
-			*status_ = 0;                                         \
-                                                                              \
-		errno = e_;                                                   \
-	}                                                                     \
-	MAX(min_, MIN(max_, n_));                                             \
-})
-
-
-ATTR_STRING(1) ATTR_ACCESS(write_only, 2) ATTR_ACCESS(write_only, 6)
-inline intmax_t strtoi_(const char *s, char **restrict endp, int base,
-    intmax_t min, intmax_t max, int *restrict status);
-ATTR_STRING(1) ATTR_ACCESS(write_only, 2) ATTR_ACCESS(write_only, 6)
-inline uintmax_t strtou_(const char *s, char **restrict endp, int base,
-    uintmax_t min, uintmax_t max, int *restrict status);
-
-
-inline intmax_t
-strtoi_(const char *s, char **restrict endp, int base,
-    intmax_t min, intmax_t max, int *restrict status)
-{
-	return strtoN(s, endp, base, min, max, status, intmax_t);
-}
-
-
-inline uintmax_t
-strtou_(const char *s, char **restrict endp, int base,
-    uintmax_t min, uintmax_t max, int *restrict status)
-{
-	return strtoN(s, endp, base, min, max, status, uintmax_t);
-}
-
-
-#endif  // include guard
diff --git a/lib/atoi/strtoi/strtoi.c b/lib/atoi/strtoi/strtoi.c
new file mode 100644
index 00000000..c478c2a1
--- /dev/null
+++ b/lib/atoi/strtoi/strtoi.c
@@ -0,0 +1,13 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "atoi/strtoi/strtoi.h"
+
+#include <stdint.h>
+
+
+extern inline intmax_t strtoi_(const char *s, char **restrict endp, int base,
+    intmax_t min, intmax_t max, int *restrict status);
diff --git a/lib/atoi/strtoi/strtoi.h b/lib/atoi/strtoi/strtoi.h
new file mode 100644
index 00000000..8fa6b62f
--- /dev/null
+++ b/lib/atoi/strtoi/strtoi.h
@@ -0,0 +1,64 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ATOI_STRTOI_STRTOI_H_
+#define SHADOW_INCLUDE_LIB_ATOI_STRTOI_STRTOI_H_
+
+
+#include <config.h>
+
+#include <errno.h>
+#include <inttypes.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <sys/param.h>
+
+#include "attr.h"
+
+
+ATTR_STRING(1) ATTR_ACCESS(write_only, 2) ATTR_ACCESS(write_only, 6)
+inline intmax_t strtoi_(const char *s, char **restrict endp, int base,
+    intmax_t min, intmax_t max, int *restrict status);
+
+
+inline intmax_t
+strtoi_(const char *s, char **restrict endp, int base,
+    intmax_t min, intmax_t max, int *restrict status)
+{
+	int        e, st;
+	char       *end;
+	intmax_t   n;
+
+	if (endp == NULL)
+		endp = &end;
+	if (status == NULL)
+		status = &st;
+
+	if (base != 0 && (base < 2 || base > 36)) {
+		*status = EINVAL;
+		return MAX(min, MIN(max, 0));
+	}
+
+	e = errno;
+	errno = 0;
+
+	n = strtoimax(s, endp, base);
+
+	if (*endp == s)
+		*status = ECANCELED;
+	else if (errno == ERANGE || n < min || n > max)
+		*status = ERANGE;
+	else if (**endp != '\0')
+		*status = ENOTSUP;
+	else
+		*status = 0;
+
+	errno = e;
+
+	return MAX(min, MIN(max, n));
+}
+
+
+#endif  // include guard
diff --git a/lib/atoi/strtoi/strtou.c b/lib/atoi/strtoi/strtou.c
new file mode 100644
index 00000000..c70ca4e8
--- /dev/null
+++ b/lib/atoi/strtoi/strtou.c
@@ -0,0 +1,13 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "atoi/strtoi/strtou.h"
+
+#include <stdint.h>
+
+
+extern inline uintmax_t strtou_(const char *s, char **restrict endp, int base,
+    uintmax_t min, uintmax_t max, int *restrict status);
diff --git a/lib/atoi/strtoi/strtou.h b/lib/atoi/strtoi/strtou.h
new file mode 100644
index 00000000..7ca6b346
--- /dev/null
+++ b/lib/atoi/strtoi/strtou.h
@@ -0,0 +1,64 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_ATOI_STRTOI_STRTOU_H_
+#define SHADOW_INCLUDE_LIB_ATOI_STRTOI_STRTOU_H_
+
+
+#include <config.h>
+
+#include <errno.h>
+#include <inttypes.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <sys/param.h>
+
+#include "attr.h"
+
+
+ATTR_STRING(1) ATTR_ACCESS(write_only, 2) ATTR_ACCESS(write_only, 6)
+inline uintmax_t strtou_(const char *s, char **restrict endp, int base,
+    uintmax_t min, uintmax_t max, int *restrict status);
+
+
+inline uintmax_t
+strtou_(const char *s, char **restrict endp, int base,
+    uintmax_t min, uintmax_t max, int *restrict status)
+{
+	int        e, st;
+	char       *end;
+	uintmax_t  n;
+
+	if (endp == NULL)
+		endp = &end;
+	if (status == NULL)
+		status = &st;
+
+	if (base != 0 && (base < 2 || base > 36)) {
+		*status = EINVAL;
+		return MAX(min, 0);
+	}
+
+	e = errno;
+	errno = 0;
+
+	n = strtoumax(s, endp, base);
+
+	if (*endp == s)
+		*status = ECANCELED;
+	else if (errno == ERANGE || n < min || n > max)
+		*status = ERANGE;
+	else if (**endp != '\0')
+		*status = ENOTSUP;
+	else
+		*status = 0;
+
+	errno = e;
+
+	return MAX(min, MIN(max, n));
+}
+
+
+#endif  // include guard
diff --git a/lib/atoi/strtou_noneg.c b/lib/atoi/strtoi/strtou_noneg.c
similarity index 67%
rename from lib/atoi/strtou_noneg.c
rename to lib/atoi/strtoi/strtou_noneg.c
index 71cacbd1..51d60c93 100644
--- a/lib/atoi/strtou_noneg.c
+++ b/lib/atoi/strtoi/strtou_noneg.c
@@ -1,10 +1,10 @@
-// SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause
 
 
 #include <config.h>
 
-#include "atoi/strtou_noneg.h"
+#include "atoi/strtoi/strtou_noneg.h"
 
 #include <stdint.h>
 
diff --git a/lib/atoi/strtou_noneg.h b/lib/atoi/strtoi/strtou_noneg.h
similarity index 73%
rename from lib/atoi/strtou_noneg.h
rename to lib/atoi/strtoi/strtou_noneg.h
index 6d77adf5..52fa9034 100644
--- a/lib/atoi/strtou_noneg.h
+++ b/lib/atoi/strtoi/strtou_noneg.h
@@ -1,9 +1,9 @@
-// SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
 // SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_ATOI_STRTOU_NONEG_H_
-#define SHADOW_INCLUDE_LIB_ATOI_STRTOU_NONEG_H_
+#ifndef SHADOW_INCLUDE_LIB_ATOI_STRTOI_STRTOU_NONEG_H_
+#define SHADOW_INCLUDE_LIB_ATOI_STRTOI_STRTOU_NONEG_H_
 
 
 #include <config.h>
@@ -12,7 +12,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "atoi/strtoi.h"
+#include "atoi/strtoi/strtoi.h"
+#include "atoi/strtoi/strtou.h"
 #include "attr.h"
 
 
diff --git a/lib/attr.h b/lib/attr.h
index 3835848d..02c7e252 100644
--- a/lib/attr.h
+++ b/lib/attr.h
@@ -6,15 +6,17 @@
 
 
 #if defined(__GNUC__)
-# define MAYBE_UNUSED                __attribute__((unused))
-# define NORETURN                    __attribute__((__noreturn__))
-# define format_attr(type, fmt, va)  __attribute__((format(type, fmt, va)))
-# define ATTR_ACCESS(...)            __attribute__((access(__VA_ARGS__)))
+# define MAYBE_UNUSED                [[gnu::unused]]
+# define NORETURN                    [[gnu::__noreturn__]]
+# define format_attr(type, fmt, va)  [[gnu::format(type, fmt, va)]]
+# define ATTR_ACCESS(...)            [[gnu::access(__VA_ARGS__)]]
+# define ATTR_ALLOC_SIZE(...)        [[gnu::alloc_size(__VA_ARGS__)]]
 #else
 # define MAYBE_UNUSED
 # define NORETURN
 # define format_attr(type, fmt, va)
 # define ATTR_ACCESS(...)
+# define ATTR_ALLOC_SIZE(...)
 #endif
 
 #if (__GNUC__ >= 11) && !defined(__clang__)
@@ -24,9 +26,9 @@
 #endif
 
 #if (__GNUC__ >= 14)
-# define ATTR_STRING(...)       [[gnu::null_terminated_string_arg(__VA_ARGS__)]]
+# define ATTR_STRING(i)              [[gnu::null_terminated_string_arg(i)]]
 #else
-# define ATTR_STRING(...)
+# define ATTR_STRING(i)
 #endif
 
 
diff --git a/lib/chkname.c b/lib/chkname.c
index 995562fa..8bde7a2d 100644
--- a/lib/chkname.c
+++ b/lib/chkname.c
@@ -12,6 +12,9 @@
  * return values:
  *   true  - OK
  *   false - bad name
+ * errors:
+ *   EINVAL	Invalid name characters or sequences
+ *   EOVERFLOW	Name longer than maximum size
  */
 
 
@@ -24,6 +27,8 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stddef.h>
+#include <stdint.h>
+#include <sys/param.h>
 #include <unistd.h>
 
 #include "defines.h"
@@ -43,11 +48,12 @@ login_name_max_size(void)
 	if (conf == -1 && errno != 0)
 		return LOGIN_NAME_MAX;
 
-	return conf;
+	return MIN(conf, PTRDIFF_MAX);
 }
 
 
-static bool is_valid_name (const char *name)
+static bool
+is_valid_name(const char *name)
 {
 	if (allow_bad_names) {
 		return true;
@@ -71,7 +77,9 @@ static bool is_valid_name (const char *name)
 	      (*name >= 'A' && *name <= 'Z') ||
 	      (*name >= '0' && *name <= '9') ||
 	      *name == '_' ||
-	      *name == '.')) {
+	      *name == '.'))
+	{
+		errno = EINVAL;
 		return false;
 	}
 
@@ -85,34 +93,46 @@ static bool is_valid_name (const char *name)
 		      *name == '.' ||
 		      *name == '-' ||
 		      (*name == '$' && name[1] == '\0')
-		     )) {
+		     ))
+		{
+			errno = EINVAL;
 			return false;
 		}
 		numeric &= isdigit(*name);
 	}
 
-	return !numeric;
+	if (numeric) {
+		errno = EINVAL;
+		return false;
+	}
+
+	return true;
 }
 
 
 bool
 is_valid_user_name(const char *name)
 {
-	if (strlen(name) >= login_name_max_size())
+	if (strlen(name) >= login_name_max_size()) {
+		errno = EOVERFLOW;
 		return false;
+	}
 
 	return is_valid_name(name);
 }
 
 
-bool is_valid_group_name (const char *name)
+bool
+is_valid_group_name(const char *name)
 {
 	/*
 	 * Arbitrary limit for group names.
 	 * HP-UX 10 limits to 16 characters
 	 */
 	if (   (GROUP_NAME_MAX_LENGTH > 0)
-	    && (strlen (name) > GROUP_NAME_MAX_LENGTH)) {
+	    && (strlen (name) > GROUP_NAME_MAX_LENGTH))
+	{
+		errno = EOVERFLOW;
 		return false;
 	}
 
diff --git a/lib/chowndir.c b/lib/chowndir.c
index d31618a5..91fc657e 100644
--- a/lib/chowndir.c
+++ b/lib/chowndir.c
@@ -13,12 +13,15 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "prototypes.h"
-#include "defines.h"
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
 
+#include "defines.h"
+#include "prototypes.h"
+#include "string/strcmp/streq.h"
+
+
 static int chown_tree_at (int at_fd,
                 const char *path,
                 uid_t old_uid,
@@ -56,8 +59,8 @@ static int chown_tree_at (int at_fd,
 		/*
 		 * Skip the "." and ".." entries
 		 */
-		if (   (strcmp (ent->d_name, ".") == 0)
-		    || (strcmp (ent->d_name, "..") == 0)) {
+		if (   streq(ent->d_name, ".")
+		    || streq(ent->d_name, "..")) {
 			continue;
 		}
 
diff --git a/lib/cleanup.c b/lib/cleanup.c
index c16f1bcd..4a722212 100644
--- a/lib/cleanup.c
+++ b/lib/cleanup.c
@@ -44,7 +44,7 @@ void do_cleanups (void)
 {
 	unsigned int i;
 
-	/* Make sure there were no overflow */
+	/* Make sure there were no overflows */
 	assert (NULL == cleanup_functions[CLEANUP_FUNCTIONS-1]);
 
 	if (getpid () != cleanup_pid) {
diff --git a/lib/commonio.c b/lib/commonio.c
index 01a26c96..4d83e83c 100644
--- a/lib/commonio.c
+++ b/lib/commonio.c
@@ -11,28 +11,33 @@
 
 #ident "$Id$"
 
-#include "defines.h"
 #include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <stdlib.h>
-#include <limits.h>
 #include <utime.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <signal.h>
 
-#include "alloc.h"
-#include "memzero.h"
+#include "alloc/malloc.h"
+#include "alloc/reallocf.h"
+#include "atoi/getnum.h"
+#include "commonio.h"
+#include "defines.h"
 #include "nscd.h"
-#include "sssd.h"
 #ifdef WITH_TCB
 #include <tcb.h>
 #endif				/* WITH_TCB */
 #include "prototypes.h"
-#include "commonio.h"
 #include "shadowlog_internal.h"
-#include "string/sprintf.h"
+#include "sssd.h"
+#include "string/memset/memzero.h"
+#include "string/sprintf/snprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strtok/stpsep.h"
 
 
 /* local function prototypes */
@@ -194,7 +199,7 @@ static int do_lock_file (const char *file, const char *lock, bool log)
 		errno = EINVAL;
 		return 0;
 	}
-	buf[len] = '\0';
+	stpcpy(&buf[len], "");
 	if (get_pid(buf, &pid) == -1) {
 		if (log) {
 			(void) fprintf (shadow_logfd,
@@ -573,9 +578,7 @@ static void add_one_entry_nis (struct commonio_db *db,
 int commonio_open (struct commonio_db *db, int mode)
 {
 	char *buf;
-	char *cp;
 	char *line;
-	struct commonio_entry *p;
 	void *eptr = NULL;
 	int flags = mode;
 	size_t buflen;
@@ -636,21 +639,21 @@ int commonio_open (struct commonio_db *db, int mode)
 
 	buflen = BUFLEN;
 	buf = MALLOC(buflen, char);
-	if (NULL == buf) {
-		goto cleanup_ENOMEM;
-	}
+	if (NULL == buf)
+		goto cleanup_errno;
 
 	while (db->ops->fgets (buf, buflen, db->fp) == buf) {
+		struct commonio_entry  *p;
+
 		while (   (strrchr (buf, '\n') == NULL)
 		       && (feof (db->fp) == 0)) {
 			size_t len;
 
 			buflen += BUFLEN;
-			cp = REALLOC(buf, buflen, char);
-			if (NULL == cp) {
-				goto cleanup_buf;
-			}
-			buf = cp;
+			buf = REALLOCF(buf, buflen, char);
+			if (NULL == buf)
+				goto cleanup_errno;
+
 			len = strlen (buf);
 			if (db->ops->fgets (buf + len,
 			                    (int) (buflen - len),
@@ -658,10 +661,7 @@ int commonio_open (struct commonio_db *db, int mode)
 				goto cleanup_buf;
 			}
 		}
-		cp = strrchr (buf, '\n');
-		if (NULL != cp) {
-			*cp = '\0';
-		}
+		stpsep(buf, "\n");
 
 		line = strdup (buf);
 		if (NULL == line) {
@@ -713,7 +713,6 @@ int commonio_open (struct commonio_db *db, int mode)
 	free (line);
       cleanup_buf:
 	free (buf);
-      cleanup_ENOMEM:
 	errno = ENOMEM;
       cleanup_errno:
 	saved_errno = errno;
@@ -832,10 +831,8 @@ int commonio_sort_wrt (struct commonio_db *shadow,
 			if (NULL == spw_ptr->eptr) {
 				continue;
 			}
-			if (strcmp (name, shadow->ops->getname (spw_ptr->eptr))
-			    == 0) {
+			if (streq(name, shadow->ops->getname(spw_ptr->eptr)))
 				break;
-			}
 		}
 		if (NULL == spw_ptr) {
 			continue;
@@ -1036,7 +1033,7 @@ static /*@dependent@*/ /*@null@*/struct commonio_entry *next_entry_by_name (
 	for (p = pos; NULL != p; p = p->next) {
 		ep = p->eptr;
 		if (   (NULL != ep)
-		    && (strcmp (db->ops->getname (ep), name) == 0)) {
+		    && streq(db->ops->getname(ep), name)) {
 			break;
 		}
 	}
@@ -1242,7 +1239,7 @@ int commonio_rewind (struct commonio_db *db)
 
 	if (!db->isopen) {
 		errno = EINVAL;
-		return 0;
+		return NULL;
 	}
 	if (NULL == db->cursor) {
 		db->cursor = db->head;
diff --git a/lib/console.c b/lib/console.c
index 92065d9b..28389331 100644
--- a/lib/console.c
+++ b/lib/console.c
@@ -9,20 +9,25 @@
  */
 
 #include <config.h>
-#include "defines.h"
+
 #include <stdio.h>
+#include <string.h>
+
+#include "defines.h"
 #include "getdef.h"
 #include "prototypes.h"
-#include "string/strtcpy.h"
+#include "string/strcmp/streq.h"
+#include "string/strcpy/strtcpy.h"
+#include "string/strtok/stpsep.h"
 
-#ident "$Id$"
 
 /*
  * This is now rather generic function which decides if "tty" is listed
  * under "cfgin" in config (directly or indirectly). Fallback to default if
  * something is bad.
  */
-static bool is_listed (const char *cfgin, const char *tty, bool def)
+static bool
+is_listed(const char *cfgin, const char *tty, bool def)
 {
 	FILE *fp;
 	char buf[1024], *s;
@@ -45,14 +50,13 @@ static bool is_listed (const char *cfgin, const char *tty, bool def)
 
 	if (*cons != '/') {
 		char *pbuf;
+
 		STRTCPY(buf, cons);
-		pbuf = &buf[0];
-		while ((s = strtok (pbuf, ":")) != NULL) {
-			if (strcmp (s, tty) == 0) {
+		pbuf = buf;
+		while (NULL != (s = strsep(&pbuf, ":"))) {
+			if (streq(s, tty)) {
 				return true;
 			}
-
-			pbuf = NULL;
 		}
 		return false;
 	}
@@ -72,9 +76,8 @@ static bool is_listed (const char *cfgin, const char *tty, bool def)
 	 */
 
 	while (fgets (buf, sizeof (buf), fp) != NULL) {
-		/* Remove optional trailing '\n'. */
-		buf[strcspn (buf, "\n")] = '\0';
-		if (strcmp (buf, tty) == 0) {
+		stpsep(buf, "\n");
+		if (streq(buf, tty)) {
 			(void) fclose (fp);
 			return true;
 		}
diff --git a/lib/copydir.c b/lib/copydir.c
index 926033af..6312399e 100644
--- a/lib/copydir.c
+++ b/lib/copydir.c
@@ -17,9 +17,11 @@
 #include <sys/time.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <string.h>
 
-#include "alloc.h"
+#include "alloc/x/xmalloc.h"
 #include "attr.h"
+#include "fs/readlink/areadlink.h"
 #include "prototypes.h"
 #include "defines.h"
 #ifdef WITH_SELINUX
@@ -36,7 +38,8 @@
 #include <attr/libattr.h>
 #endif				/* WITH_ATTR */
 #include "shadowlog.h"
-#include "string/sprintf.h"
+#include "string/sprintf/xasprintf.h"
+#include "string/strcmp/streq.h"
 
 
 static /*@null@*/const char *src_orig;
@@ -66,7 +69,6 @@ static int copy_dir (const struct path_info *src, const struct path_info *dst,
                      const struct stat *statp, const struct timespec mt[],
                      uid_t old_uid, uid_t new_uid,
                      gid_t old_gid, gid_t new_gid);
-static /*@null@*/char *readlink_malloc (const char *filename);
 static int copy_symlink (const struct path_info *src, const struct path_info *dst,
                          MAYBE_UNUSED bool reset_selinux,
                          const struct stat *statp, const struct timespec mt[],
@@ -313,8 +315,8 @@ static int copy_tree_impl (const struct path_info *src, const struct path_info *
 		/*
 		 * Skip the "." and ".." entries
 		 */
-		if (strcmp(ent->d_name, ".") == 0 ||
-		    strcmp(ent->d_name, "..") == 0)
+		if (streq(ent->d_name, ".") ||
+		    streq(ent->d_name, ".."))
 		{
 			continue;
 		}
@@ -536,42 +538,6 @@ static int copy_dir (const struct path_info *src, const struct path_info *dst,
 	return err;
 }
 
-/*
- * readlink_malloc - wrapper for readlink
- *
- * return NULL on error.
- * The return string shall be freed by the caller.
- */
-static /*@null@*/char *readlink_malloc (const char *filename)
-{
-	size_t size = 1024;
-
-	while (true) {
-		ssize_t nchars;
-		char *buffer = MALLOC(size, char);
-		if (NULL == buffer) {
-			return NULL;
-		}
-
-		nchars = readlink (filename, buffer, size);
-
-		if (nchars < 0) {
-			free(buffer);
-			return NULL;
-		}
-
-		if ((size_t) nchars < size) { /* The buffer was large enough */
-			/* readlink does not nul-terminate */
-			buffer[nchars] = '\0';
-			return buffer;
-		}
-
-		/* Try again with a bigger buffer */
-		free (buffer);
-		size *= 2;
-	}
-}
-
 /*
  * copy_symlink - copy a symlink
  *
@@ -602,10 +568,9 @@ static int copy_symlink (const struct path_info *src, const struct path_info *ds
 	 * destination directory name.
 	 */
 
-	oldlink = readlink_malloc (src->full_path);
-	if (NULL == oldlink) {
+	oldlink = areadlink(src->full_path);
+	if (NULL == oldlink)
 		return -1;
-	}
 
 	/* If src was a link to an entry of the src_orig directory itself,
 	 * create a link to the corresponding entry in the dst_orig
diff --git a/lib/csrand.c b/lib/csrand.c
index 9d6f1503..1914a303 100644
--- a/lib/csrand.c
+++ b/lib/csrand.c
@@ -1,21 +1,19 @@
-/*
- * SPDX-FileCopyrightText:  Alejandro Colomar <alx@kernel.org>
- *
- * SPDX-License-Identifier:  BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
 
 #include <config.h>
 
 #ident "$Id$"
 
+#include <fcntl.h>
 #include <limits.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #if HAVE_SYS_RANDOM_H
 #include <sys/random.h>
 #endif
+
 #include "bit.h"
 #include "defines.h"
 #include "prototypes.h"
@@ -23,6 +21,7 @@
 #include "sizeof.h"
 
 
+static uint32_t csrand32(void);
 static uint32_t csrand_uniform32(uint32_t n);
 static unsigned long csrand_uniform_slow(unsigned long n);
 
@@ -33,7 +32,7 @@ static unsigned long csrand_uniform_slow(unsigned long n);
 unsigned long
 csrand(void)
 {
-	FILE           *fp;
+	int            fd;
 	unsigned long  r;
 
 #ifdef HAVE_GETENTROPY
@@ -55,17 +54,16 @@ csrand(void)
 #endif
 
 	/* Use /dev/urandom as a last resort.  */
-	fp = fopen("/dev/urandom", "r");
-	if (NULL == fp) {
+	fd = open("/dev/urandom", O_RDONLY);
+	if (fd == -1)
+		goto fail;
+
+	if (read(fd, &r, sizeof(r)) != sizeof(r)) {
+		close(fd);
 		goto fail;
 	}
 
-	if (fread(&r, sizeof(r), 1, fp) != 1) {
-		fclose(fp);
-		goto fail;
-	}
-
-	fclose(fp);
+	close(fd);
 	return r;
 
 fail:
@@ -97,6 +95,13 @@ csrand_interval(unsigned long min, unsigned long max)
 }
 
 
+static uint32_t
+csrand32(void)
+{
+	return csrand();
+}
+
+
 /*
  * Fast Random Integer Generation in an Interval
  * ACM Transactions on Modeling and Computer Simulation 29 (1), 2019
@@ -109,12 +114,12 @@ csrand_uniform32(uint32_t n)
 	uint64_t  r, mult;
 
 	if (n == 0)
-		return csrand();
+		return csrand32();
 
 	bound = -n % n;  // analogous to `2^32 % n`, since `x % y == (x-y) % y`
 
 	do {
-		r = csrand();
+		r = csrand32();
 		mult = r * n;
 		rem = mult;  // analogous to `mult % 2^32`
 	} while (rem < bound);  // p = (2^32 % n) / 2^32;  W.C.: n=2^31+1, p=0.5
diff --git a/lib/env.c b/lib/env.c
index 9b5fd32f..9cb31371 100644
--- a/lib/env.c
+++ b/lib/env.c
@@ -16,11 +16,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "alloc.h"
+#include "alloc/x/xmalloc.h"
+#include "alloc/x/xrealloc.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "shadowlog.h"
-#include "string/sprintf.h"
+#include "string/sprintf/snprintf.h"
+#include "string/sprintf/xasprintf.h"
+#include "string/strdup/xstrdup.h"
 
 
 /*
diff --git a/lib/failure.c b/lib/failure.c
index e42e7107..afff11aa 100644
--- a/lib/failure.c
+++ b/lib/failure.c
@@ -18,10 +18,10 @@
 #include "defines.h"
 #include "faillog.h"
 #include "failure.h"
-#include "memzero.h"
 #include "prototypes.h"
+#include "string/memset/memzero.h"
 #include "string/strftime.h"
-#include "string/strtcpy.h"
+#include "string/strcpy/strtcpy.h"
 
 
 #define	YEAR	(365L*DAY)
@@ -82,7 +82,7 @@ void failure (uid_t uid, const char *tty, struct faillog *fl)
 	}
 
 	STRTCPY(fl->fail_line, tty);
-	(void) time (&fl->fail_time);
+	fl->fail_time = time(NULL);
 
 	/*
 	 * Seek back to the correct position in the file and write the
@@ -126,7 +126,7 @@ static bool too_many_failures (const struct faillog *fl)
 		return true;	/* locked until reset manually */
 	}
 
-	(void) time (&now);
+	now = time(NULL);
 	if ((fl->fail_time + fl->fail_locktime) < now) {
 		return false;	/* enough time since last failure */
 	}
@@ -242,14 +242,12 @@ void failprint (const struct faillog *fail)
 	struct tm *tp;
 	char lasttimeb[256];
 	char *lasttime = lasttimeb;
-	time_t NOW;
 
 	if (0 == fail->fail_cnt) {
 		return;
 	}
 
 	tp = localtime (&(fail->fail_time));
-	(void) time (&NOW);
 
 	/*
 	 * Print all information we have.
diff --git a/lib/fields.c b/lib/fields.c
index 53929248..b4aa868c 100644
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -14,7 +14,12 @@
 #include <ctype.h>
 #include <string.h>
 #include <stdio.h>
+
 #include "prototypes.h"
+#include "string/strchr/stpspn.h"
+#include "string/strchr/strrspn.h"
+#include "string/strtok/stpsep.h"
+
 
 /*
  * valid_field - insure that a field contains all legal characters
@@ -62,7 +67,8 @@ int valid_field (const char *field, const char *illegal)
  * prompt the user with the name of the field being changed and the
  * current value.
  */
-void change_field (char *buf, size_t maxsize, const char *prompt)
+void
+change_field(char *buf, size_t maxsize, const char *prompt)
 {
 	char newf[200];
 	char *cp;
@@ -77,11 +83,8 @@ void change_field (char *buf, size_t maxsize, const char *prompt)
 		return;
 	}
 
-	cp = strchr (newf, '\n');
-	if (NULL == cp) {
+	if (stpsep(newf, "\n") == NULL)
 		return;
-	}
-	*cp = '\0';
 
 	if ('\0' != newf[0]) {
 		/*
@@ -89,17 +92,8 @@ void change_field (char *buf, size_t maxsize, const char *prompt)
 		 * makes it possible to change the field to empty, by
 		 * entering a space.  --marekm
 		 */
-
-		while (newf < cp && isspace (cp[-1])) {
-			cp--;
-		}
-		*cp = '\0';
-
-		cp = newf;
-		while (isspace (*cp)) {
-			cp++;
-		}
-
+		stpcpy(strrspn(newf, " \t"), "");
+		cp = stpspn(newf, " \t");
 		strcpy (buf, cp);
 	}
 }
diff --git a/lib/find_new_gid.c b/lib/find_new_gid.c
index cfd56098..cdf8779e 100644
--- a/lib/find_new_gid.c
+++ b/lib/find_new_gid.c
@@ -9,10 +9,11 @@
 #include <config.h>
 
 #include <assert.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <errno.h>
 
-#include "alloc.h"
+#include "alloc/calloc.h"
 #include "prototypes.h"
 #include "groupio.h"
 #include "getdef.h"
diff --git a/lib/find_new_uid.c b/lib/find_new_uid.c
index 45ce712c..f2ca60ff 100644
--- a/lib/find_new_uid.c
+++ b/lib/find_new_uid.c
@@ -9,10 +9,11 @@
 #include <config.h>
 
 #include <assert.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <errno.h>
 
-#include "alloc.h"
+#include "alloc/calloc.h"
 #include "prototypes.h"
 #include "pwio.h"
 #include "getdef.h"
@@ -304,7 +305,7 @@ int find_new_uid(bool sys_user,
 				return 0;
 			} else if (result == EEXIST || result == EINVAL) {
 				/*
-				 * This GID is in use or unusable, we'll
+				 * This UID is in use or unusable, we'll
 				 * continue to the next.
 				 */
 			} else {
@@ -350,7 +351,7 @@ int find_new_uid(bool sys_user,
 					return 0;
 				} else if (result == EEXIST || result == EINVAL) {
 					/*
-					 * This GID is in use or unusable, we'll
+					 * This UID is in use or unusable, we'll
 					 * continue to the next.
 					 */
 				} else {
@@ -413,7 +414,7 @@ int find_new_uid(bool sys_user,
 				return 0;
 			} else if (result == EEXIST || result == EINVAL) {
 				/*
-				 * This GID is in use or unusable, we'll
+				 * This UID is in use or unusable, we'll
 				 * continue to the next.
 				 */
 			} else {
@@ -459,7 +460,7 @@ int find_new_uid(bool sys_user,
 					return 0;
 				} else if (result == EEXIST || result == EINVAL) {
 					/*
-					 * This GID is in use or unusable, we'll
+					 * This UID is in use or unusable, we'll
 					 * continue to the next.
 					 */
 				} else {
diff --git a/lib/fputsx.c b/lib/fputsx.c
index 05653101..a43c2ac1 100644
--- a/lib/fputsx.c
+++ b/lib/fputsx.c
@@ -10,6 +10,8 @@
 #include <config.h>
 
 #include <stdio.h>
+#include <string.h>
+
 #include "defines.h"
 #include "prototypes.h"
 
@@ -25,7 +27,7 @@ fgetsx(/*@returned@*/char *restrict buf, int cnt, FILE *restrict f)
 	while (cnt > 0) {
 		if (fgets (cp, cnt, f) != cp) {
 			if (cp == buf) {
-				return 0;
+				return NULL;
 			} else {
 				break;
 			}
@@ -33,10 +35,8 @@ fgetsx(/*@returned@*/char *restrict buf, int cnt, FILE *restrict f)
 		ep = strrchr (cp, '\\');
 		if ((NULL != ep) && (*(ep + 1) == '\n')) {
 			cnt -= ep - cp;
-			if (cnt > 0) {
-				cp = ep;
-				*cp = '\0';
-			}
+			if (cnt > 0)
+				cp = stpcpy(ep, "");
 		} else {
 			break;
 		}
diff --git a/lib/fs/readlink/areadlink.c b/lib/fs/readlink/areadlink.c
new file mode 100644
index 00000000..b569e3f2
--- /dev/null
+++ b/lib/fs/readlink/areadlink.c
@@ -0,0 +1,10 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "fs/readlink/areadlink.h"
+
+
+extern inline char *areadlink(const char *link);
diff --git a/lib/fs/readlink/areadlink.h b/lib/fs/readlink/areadlink.h
new file mode 100644
index 00000000..de931a7b
--- /dev/null
+++ b/lib/fs/readlink/areadlink.h
@@ -0,0 +1,53 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_FS_READLINK_AREADLINK_H_
+#define SHADOW_INCLUDE_LIB_FS_READLINK_AREADLINK_H_
+
+
+#include <config.h>
+
+#include <errno.h>
+#include <limits.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdlib.h>
+
+#include "alloc/malloc.h"
+#include "attr.h"
+#include "fs/readlink/readlinknul.h"
+
+
+ATTR_STRING(1)
+inline char *areadlink(const char *link);
+
+
+// Similar to readlink(2), but allocate and terminate the string.
+inline char *
+areadlink(const char *link)
+{
+	size_t  size = PATH_MAX;
+
+	while (true) {
+		int   len;
+		char  *buf;
+
+		buf = MALLOC(size, char);
+		if (NULL == buf)
+			return NULL;
+
+		len = readlinknul(link, buf, size);
+		if (len != -1)
+			return buf;
+
+		free(buf);
+		if (errno != E2BIG)
+			return NULL;
+
+		size *= 2;
+	}
+}
+
+
+#endif  // include guard
diff --git a/lib/fs/readlink/readlinknul.c b/lib/fs/readlink/readlinknul.c
new file mode 100644
index 00000000..4baea0d0
--- /dev/null
+++ b/lib/fs/readlink/readlinknul.c
@@ -0,0 +1,13 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "fs/readlink/readlinknul.h"
+
+#include <stddef.h>
+
+
+extern inline int readlinknul(const char *restrict link, char *restrict buf,
+    size_t size);
diff --git a/lib/fs/readlink/readlinknul.h b/lib/fs/readlink/readlinknul.h
new file mode 100644
index 00000000..bb228dfa
--- /dev/null
+++ b/lib/fs/readlink/readlinknul.h
@@ -0,0 +1,50 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_FS_READLINK_READLINKNUL_H_
+#define SHADOW_INCLUDE_LIB_FS_READLINK_READLINKNUL_H_
+
+
+#include <config.h>
+
+#include <errno.h>
+#include <stddef.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "attr.h"
+#include "sizeof.h"
+
+
+#define READLINKNUL(link, buf)  readlinknul(link, buf, NITEMS(buf))
+
+
+ATTR_STRING(1)
+inline int readlinknul(const char *restrict link, char *restrict buf,
+    size_t size);
+
+
+// Similar to readlink(2), but terminate the string.
+inline int
+readlinknul(const char *restrict link, char *restrict buf, size_t size)
+{
+	ssize_t  len;
+
+	len = readlink(link, buf, size);
+	if (len == -1)
+		return -1;
+
+	if (len == size) {
+		stpcpy(&buf[size-1], "");
+		errno = E2BIG;
+		return -1;
+	}
+
+	stpcpy(&buf[len], "");
+	return len;
+}
+
+
+#endif  // include guard
diff --git a/lib/get_gid.c b/lib/get_gid.c
deleted file mode 100644
index 2420137b..00000000
--- a/lib/get_gid.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2009       , Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include "prototypes.h"
-#include "defines.h"
-
-
-int
-get_gid(const char *gidstr, gid_t *gid)
-{
-	char       *end;
-	long long  val;
-
-	errno = 0;
-	val = strtoll(gidstr, &end, 10);
-	if (   ('\0' == *gidstr)
-	    || ('\0' != *end)
-	    || (0 != errno)
-	    || (/*@+longintegral@*/val != (gid_t)val)/*@=longintegral@*/) {
-		return -1;
-	}
-
-	*gid = val;
-	return 0;
-}
-
diff --git a/lib/get_pid.c b/lib/get_pid.c
index af3f2f8e..f4d31cfd 100644
--- a/lib/get_pid.c
+++ b/lib/get_pid.c
@@ -1,8 +1,7 @@
-/*
- * SPDX-FileCopyrightText: 2009       , Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 2009, Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
 
 #include <config.h>
 
@@ -14,29 +13,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "string/sprintf.h"
+#include "atoi/getnum.h"
+#include "string/sprintf/snprintf.h"
 
 
-int
-get_pid(const char *pidstr, pid_t *pid)
-{
-	char       *end;
-	long long  val;
-
-	errno = 0;
-	val = strtoll(pidstr, &end, 10);
-	if (   ('\0' == *pidstr)
-	    || ('\0' != *end)
-	    || (0 != errno)
-	    || (val < 1)
-	    || (/*@+longintegral@*/val != (pid_t)val)/*@=longintegral@*/) {
-		return -1;
-	}
-
-	*pid = val;
-	return 0;
-}
-
 /*
  * If use passed in fd:4 as an argument, then return the
  * value '4', the fd to use.
@@ -44,20 +24,12 @@ get_pid(const char *pidstr, pid_t *pid)
  */
 int get_pidfd_from_fd(const char *pidfdstr)
 {
-	char         *end;
-	long long    val;
+	int          pidfd;
 	struct stat  st;
 	dev_t proc_st_dev, proc_st_rdev;
 
-	errno = 0;
-	val = strtoll(pidfdstr, &end, 10);
-	if (   ('\0' == *pidfdstr)
-	    || ('\0' != *end)
-	    || (0 != errno)
-	    || (val < 0)
-	    || (/*@+longintegral@*/val != (int)val)/*@=longintegral@*/) {
+	if (get_fd(pidfdstr, &pidfd) == -1)
 		return -1;
-	}
 
 	if (stat("/proc/self/uid_map", &st) < 0) {
 		return -1;
@@ -66,7 +38,7 @@ int get_pidfd_from_fd(const char *pidfdstr)
 	proc_st_dev = st.st_dev;
 	proc_st_rdev = st.st_rdev;
 
-	if (fstat(val, &st) < 0) {
+	if (fstat(pidfd, &st) < 0) {
 		return -1;
 	}
 
@@ -74,7 +46,7 @@ int get_pidfd_from_fd(const char *pidfdstr)
 		return -1;
 	}
 
-	return (int)val;
+	return pidfd;
 }
 
 int open_pidfd(const char *pidstr)
diff --git a/lib/get_uid.c b/lib/get_uid.c
deleted file mode 100644
index 77fe9660..00000000
--- a/lib/get_uid.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2009       , Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include "prototypes.h"
-#include "defines.h"
-
-
-int
-get_uid(const char *uidstr, uid_t *uid)
-{
-	char       *end;
-	long long  val;
-
-	errno = 0;
-	val = strtoll(uidstr, &end, 10);
-	if (   ('\0' == *uidstr)
-	    || ('\0' != *end)
-	    || (0 != errno)
-	    || (/*@+longintegral@*/val != (uid_t)val)/*@=longintegral@*/) {
-		return -1;
-	}
-
-	*uid = val;
-	return 0;
-}
-
diff --git a/lib/getdate.c b/lib/getdate.c
index 556ce624..74c8fce1 100644
--- a/lib/getdate.c
+++ b/lib/getdate.c
@@ -94,14 +94,16 @@
 # undef static
 #endif
 
-#include <stdio.h>
 #include <ctype.h>
+#include <stdio.h>
+#include <string.h>
 #include <time.h>
 
 #include "attr.h"
 #include "getdate.h"
+#include "string/strchr/stpspn.h"
+#include "string/strcmp/streq.h"
 
-#include <string.h>
 
 /* Some old versions of bison generate parsers that use bcopy.
    That loses on systems that don't provide the function, so we have
@@ -213,7 +215,7 @@ static int	yyRelSeconds;
 static int	yyRelYear;
 
 
-#line 217 "getdate.c"
+#line 219 "getdate.c"
 
 # ifndef YY_CAST
 #  ifdef __cplusplus
@@ -299,12 +301,12 @@ extern int yydebug;
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 union YYSTYPE
 {
-#line 147 "getdate.y"
+#line 149 "getdate.y"
 
     int			Number;
     enum _MERIDIAN	Meridian;
 
-#line 308 "getdate.c"
+#line 310 "getdate.c"
 
 };
 typedef union YYSTYPE YYSTYPE;
@@ -744,12 +746,12 @@ static const yytype_int8 yytranslate[] =
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline[] =
 {
-       0,   163,   163,   164,   167,   170,   173,   176,   179,   182,
-     185,   191,   197,   206,   212,   224,   227,   231,   236,   240,
-     244,   250,   254,   272,   278,   284,   288,   293,   297,   304,
-     312,   315,   318,   321,   324,   327,   330,   333,   336,   339,
-     342,   345,   348,   351,   354,   357,   360,   363,   366,   371,
-     405,   408
+       0,   165,   165,   166,   169,   172,   175,   178,   181,   184,
+     187,   193,   199,   208,   214,   226,   229,   233,   238,   242,
+     246,   252,   256,   274,   280,   286,   290,   295,   299,   306,
+     314,   317,   320,   323,   326,   329,   332,   335,   338,   341,
+     344,   347,   350,   353,   356,   359,   362,   365,   368,   373,
+     407,   410
 };
 #endif
 
@@ -1350,69 +1352,69 @@ yyreduce:
   switch (yyn)
     {
   case 4: /* item: time  */
-#line 167 "getdate.y"
+#line 169 "getdate.y"
                {
 	    yyHaveTime++;
 	}
-#line 1358 "getdate.c"
+#line 1360 "getdate.c"
     break;
 
   case 5: /* item: zone  */
-#line 170 "getdate.y"
+#line 172 "getdate.y"
                {
 	    yyHaveZone++;
 	}
-#line 1366 "getdate.c"
+#line 1368 "getdate.c"
     break;
 
   case 6: /* item: date  */
-#line 173 "getdate.y"
+#line 175 "getdate.y"
                {
 	    yyHaveDate++;
 	}
-#line 1374 "getdate.c"
+#line 1376 "getdate.c"
     break;
 
   case 7: /* item: day  */
-#line 176 "getdate.y"
+#line 178 "getdate.y"
               {
 	    yyHaveDay++;
 	}
-#line 1382 "getdate.c"
+#line 1384 "getdate.c"
     break;
 
   case 8: /* item: rel  */
-#line 179 "getdate.y"
+#line 181 "getdate.y"
               {
 	    yyHaveRel++;
 	}
-#line 1390 "getdate.c"
+#line 1392 "getdate.c"
     break;
 
   case 10: /* time: tUNUMBER tMERIDIAN  */
-#line 185 "getdate.y"
+#line 187 "getdate.y"
                              {
 	    yyHour = (yyvsp[-1].Number);
 	    yyMinutes = 0;
 	    yySeconds = 0;
 	    yyMeridian = (yyvsp[0].Meridian);
 	}
-#line 1401 "getdate.c"
+#line 1403 "getdate.c"
     break;
 
   case 11: /* time: tUNUMBER ':' tUNUMBER o_merid  */
-#line 191 "getdate.y"
+#line 193 "getdate.y"
                                         {
 	    yyHour = (yyvsp[-3].Number);
 	    yyMinutes = (yyvsp[-1].Number);
 	    yySeconds = 0;
 	    yyMeridian = (yyvsp[0].Meridian);
 	}
-#line 1412 "getdate.c"
+#line 1414 "getdate.c"
     break;
 
   case 12: /* time: tUNUMBER ':' tUNUMBER tSNUMBER  */
-#line 197 "getdate.y"
+#line 199 "getdate.y"
                                          {
 	    yyHour = (yyvsp[-3].Number);
 	    yyMinutes = (yyvsp[-1].Number);
@@ -1422,22 +1424,22 @@ yyreduce:
 			  ? -(yyvsp[0].Number) % 100 + (-(yyvsp[0].Number) / 100) * 60
 			  : - ((yyvsp[0].Number) % 100 + ((yyvsp[0].Number) / 100) * 60));
 	}
-#line 1426 "getdate.c"
+#line 1428 "getdate.c"
     break;
 
   case 13: /* time: tUNUMBER ':' tUNUMBER ':' tUNUMBER o_merid  */
-#line 206 "getdate.y"
+#line 208 "getdate.y"
                                                      {
 	    yyHour = (yyvsp[-5].Number);
 	    yyMinutes = (yyvsp[-3].Number);
 	    yySeconds = (yyvsp[-1].Number);
 	    yyMeridian = (yyvsp[0].Meridian);
 	}
-#line 1437 "getdate.c"
+#line 1439 "getdate.c"
     break;
 
   case 14: /* time: tUNUMBER ':' tUNUMBER ':' tUNUMBER tSNUMBER  */
-#line 212 "getdate.y"
+#line 214 "getdate.y"
                                                       {
 	    yyHour = (yyvsp[-5].Number);
 	    yyMinutes = (yyvsp[-3].Number);
@@ -1448,71 +1450,71 @@ yyreduce:
 			  ? -(yyvsp[0].Number) % 100 + (-(yyvsp[0].Number) / 100) * 60
 			  : - ((yyvsp[0].Number) % 100 + ((yyvsp[0].Number) / 100) * 60));
 	}
-#line 1452 "getdate.c"
+#line 1454 "getdate.c"
     break;
 
   case 15: /* zone: tZONE  */
-#line 224 "getdate.y"
+#line 226 "getdate.y"
                 {
 	    yyTimezone = (yyvsp[0].Number);
 	}
-#line 1460 "getdate.c"
+#line 1462 "getdate.c"
     break;
 
   case 16: /* zone: tDAYZONE  */
-#line 227 "getdate.y"
+#line 229 "getdate.y"
                    {
 	    yyTimezone = (yyvsp[0].Number) - 60;
 	}
-#line 1468 "getdate.c"
+#line 1470 "getdate.c"
     break;
 
   case 17: /* zone: tZONE tDST  */
-#line 231 "getdate.y"
+#line 233 "getdate.y"
                      {
 	    yyTimezone = (yyvsp[-1].Number) - 60;
 	}
-#line 1476 "getdate.c"
+#line 1478 "getdate.c"
     break;
 
   case 18: /* day: tDAY  */
-#line 236 "getdate.y"
+#line 238 "getdate.y"
                {
 	    yyDayOrdinal = 1;
 	    yyDayNumber = (yyvsp[0].Number);
 	}
-#line 1485 "getdate.c"
+#line 1487 "getdate.c"
     break;
 
   case 19: /* day: tDAY ','  */
-#line 240 "getdate.y"
+#line 242 "getdate.y"
                    {
 	    yyDayOrdinal = 1;
 	    yyDayNumber = (yyvsp[-1].Number);
 	}
-#line 1494 "getdate.c"
+#line 1496 "getdate.c"
     break;
 
   case 20: /* day: tUNUMBER tDAY  */
-#line 244 "getdate.y"
+#line 246 "getdate.y"
                         {
 	    yyDayOrdinal = (yyvsp[-1].Number);
 	    yyDayNumber = (yyvsp[0].Number);
 	}
-#line 1503 "getdate.c"
+#line 1505 "getdate.c"
     break;
 
   case 21: /* date: tUNUMBER '/' tUNUMBER  */
-#line 250 "getdate.y"
+#line 252 "getdate.y"
                                 {
 	    yyMonth = (yyvsp[-2].Number);
 	    yyDay = (yyvsp[0].Number);
 	}
-#line 1512 "getdate.c"
+#line 1514 "getdate.c"
     break;
 
   case 22: /* date: tUNUMBER '/' tUNUMBER '/' tUNUMBER  */
-#line 254 "getdate.y"
+#line 256 "getdate.y"
                                              {
 	  /* Interpret as YYYY/MM/DD if $1 >= 1000, otherwise as MM/DD/YY.
 	     The goal in recognizing YYYY/MM/DD is solely to support legacy
@@ -1531,71 +1533,71 @@ yyreduce:
 	      yyYear = (yyvsp[0].Number);
 	    }
 	}
-#line 1535 "getdate.c"
+#line 1537 "getdate.c"
     break;
 
   case 23: /* date: tUNUMBER tSNUMBER tSNUMBER  */
-#line 272 "getdate.y"
+#line 274 "getdate.y"
                                      {
 	    /* ISO 8601 format.  yyyy-mm-dd.  */
 	    yyYear = (yyvsp[-2].Number);
 	    yyMonth = -(yyvsp[-1].Number);
 	    yyDay = -(yyvsp[0].Number);
 	}
-#line 1546 "getdate.c"
+#line 1548 "getdate.c"
     break;
 
   case 24: /* date: tUNUMBER tMONTH tSNUMBER  */
-#line 278 "getdate.y"
+#line 280 "getdate.y"
                                    {
 	    /* e.g. 17-JUN-1992.  */
 	    yyDay = (yyvsp[-2].Number);
 	    yyMonth = (yyvsp[-1].Number);
 	    yyYear = -(yyvsp[0].Number);
 	}
-#line 1557 "getdate.c"
+#line 1559 "getdate.c"
     break;
 
   case 25: /* date: tMONTH tUNUMBER  */
-#line 284 "getdate.y"
+#line 286 "getdate.y"
                           {
 	    yyMonth = (yyvsp[-1].Number);
 	    yyDay = (yyvsp[0].Number);
 	}
-#line 1566 "getdate.c"
+#line 1568 "getdate.c"
     break;
 
   case 26: /* date: tMONTH tUNUMBER ',' tUNUMBER  */
-#line 288 "getdate.y"
+#line 290 "getdate.y"
                                        {
 	    yyMonth = (yyvsp[-3].Number);
 	    yyDay = (yyvsp[-2].Number);
 	    yyYear = (yyvsp[0].Number);
 	}
-#line 1576 "getdate.c"
+#line 1578 "getdate.c"
     break;
 
   case 27: /* date: tUNUMBER tMONTH  */
-#line 293 "getdate.y"
+#line 295 "getdate.y"
                           {
 	    yyMonth = (yyvsp[0].Number);
 	    yyDay = (yyvsp[-1].Number);
 	}
-#line 1585 "getdate.c"
+#line 1587 "getdate.c"
     break;
 
   case 28: /* date: tUNUMBER tMONTH tUNUMBER  */
-#line 297 "getdate.y"
+#line 299 "getdate.y"
                                    {
 	    yyMonth = (yyvsp[-1].Number);
 	    yyDay = (yyvsp[-2].Number);
 	    yyYear = (yyvsp[0].Number);
 	}
-#line 1595 "getdate.c"
+#line 1597 "getdate.c"
     break;
 
   case 29: /* rel: relunit tAGO  */
-#line 304 "getdate.y"
+#line 306 "getdate.y"
                        {
 	    yyRelSeconds = -yyRelSeconds;
 	    yyRelMinutes = -yyRelMinutes;
@@ -1604,155 +1606,155 @@ yyreduce:
 	    yyRelMonth = -yyRelMonth;
 	    yyRelYear = -yyRelYear;
 	}
-#line 1608 "getdate.c"
+#line 1610 "getdate.c"
     break;
 
   case 31: /* relunit: tUNUMBER tYEAR_UNIT  */
-#line 315 "getdate.y"
+#line 317 "getdate.y"
                               {
 	    yyRelYear += (yyvsp[-1].Number) * (yyvsp[0].Number);
 	}
-#line 1616 "getdate.c"
+#line 1618 "getdate.c"
     break;
 
   case 32: /* relunit: tSNUMBER tYEAR_UNIT  */
-#line 318 "getdate.y"
+#line 320 "getdate.y"
                               {
 	    yyRelYear += (yyvsp[-1].Number) * (yyvsp[0].Number);
 	}
-#line 1624 "getdate.c"
+#line 1626 "getdate.c"
     break;
 
   case 33: /* relunit: tYEAR_UNIT  */
-#line 321 "getdate.y"
+#line 323 "getdate.y"
                      {
 	    yyRelYear += (yyvsp[0].Number);
 	}
-#line 1632 "getdate.c"
+#line 1634 "getdate.c"
     break;
 
   case 34: /* relunit: tUNUMBER tMONTH_UNIT  */
-#line 324 "getdate.y"
+#line 326 "getdate.y"
                                {
 	    yyRelMonth += (yyvsp[-1].Number) * (yyvsp[0].Number);
 	}
-#line 1640 "getdate.c"
+#line 1642 "getdate.c"
     break;
 
   case 35: /* relunit: tSNUMBER tMONTH_UNIT  */
-#line 327 "getdate.y"
+#line 329 "getdate.y"
                                {
 	    yyRelMonth += (yyvsp[-1].Number) * (yyvsp[0].Number);
 	}
-#line 1648 "getdate.c"
+#line 1650 "getdate.c"
     break;
 
   case 36: /* relunit: tMONTH_UNIT  */
-#line 330 "getdate.y"
+#line 332 "getdate.y"
                       {
 	    yyRelMonth += (yyvsp[0].Number);
 	}
-#line 1656 "getdate.c"
+#line 1658 "getdate.c"
     break;
 
   case 37: /* relunit: tUNUMBER tDAY_UNIT  */
-#line 333 "getdate.y"
+#line 335 "getdate.y"
                              {
 	    yyRelDay += (yyvsp[-1].Number) * (yyvsp[0].Number);
 	}
-#line 1664 "getdate.c"
+#line 1666 "getdate.c"
     break;
 
   case 38: /* relunit: tSNUMBER tDAY_UNIT  */
-#line 336 "getdate.y"
+#line 338 "getdate.y"
                              {
 	    yyRelDay += (yyvsp[-1].Number) * (yyvsp[0].Number);
 	}
-#line 1672 "getdate.c"
+#line 1674 "getdate.c"
     break;
 
   case 39: /* relunit: tDAY_UNIT  */
-#line 339 "getdate.y"
+#line 341 "getdate.y"
                     {
 	    yyRelDay += (yyvsp[0].Number);
 	}
-#line 1680 "getdate.c"
+#line 1682 "getdate.c"
     break;
 
   case 40: /* relunit: tUNUMBER tHOUR_UNIT  */
-#line 342 "getdate.y"
+#line 344 "getdate.y"
                               {
 	    yyRelHour += (yyvsp[-1].Number) * (yyvsp[0].Number);
 	}
-#line 1688 "getdate.c"
+#line 1690 "getdate.c"
     break;
 
   case 41: /* relunit: tSNUMBER tHOUR_UNIT  */
-#line 345 "getdate.y"
+#line 347 "getdate.y"
                               {
 	    yyRelHour += (yyvsp[-1].Number) * (yyvsp[0].Number);
 	}
-#line 1696 "getdate.c"
+#line 1698 "getdate.c"
     break;
 
   case 42: /* relunit: tHOUR_UNIT  */
-#line 348 "getdate.y"
+#line 350 "getdate.y"
                      {
 	    yyRelHour += (yyvsp[0].Number);
 	}
-#line 1704 "getdate.c"
+#line 1706 "getdate.c"
     break;
 
   case 43: /* relunit: tUNUMBER tMINUTE_UNIT  */
-#line 351 "getdate.y"
+#line 353 "getdate.y"
                                 {
 	    yyRelMinutes += (yyvsp[-1].Number) * (yyvsp[0].Number);
 	}
-#line 1712 "getdate.c"
+#line 1714 "getdate.c"
     break;
 
   case 44: /* relunit: tSNUMBER tMINUTE_UNIT  */
-#line 354 "getdate.y"
+#line 356 "getdate.y"
                                 {
 	    yyRelMinutes += (yyvsp[-1].Number) * (yyvsp[0].Number);
 	}
-#line 1720 "getdate.c"
+#line 1722 "getdate.c"
     break;
 
   case 45: /* relunit: tMINUTE_UNIT  */
-#line 357 "getdate.y"
+#line 359 "getdate.y"
                        {
 	    yyRelMinutes += (yyvsp[0].Number);
 	}
-#line 1728 "getdate.c"
+#line 1730 "getdate.c"
     break;
 
   case 46: /* relunit: tUNUMBER tSEC_UNIT  */
-#line 360 "getdate.y"
+#line 362 "getdate.y"
                              {
 	    yyRelSeconds += (yyvsp[-1].Number) * (yyvsp[0].Number);
 	}
-#line 1736 "getdate.c"
+#line 1738 "getdate.c"
     break;
 
   case 47: /* relunit: tSNUMBER tSEC_UNIT  */
-#line 363 "getdate.y"
+#line 365 "getdate.y"
                              {
 	    yyRelSeconds += (yyvsp[-1].Number) * (yyvsp[0].Number);
 	}
-#line 1744 "getdate.c"
+#line 1746 "getdate.c"
     break;
 
   case 48: /* relunit: tSEC_UNIT  */
-#line 366 "getdate.y"
+#line 368 "getdate.y"
                     {
 	    yyRelSeconds += (yyvsp[0].Number);
 	}
-#line 1752 "getdate.c"
+#line 1754 "getdate.c"
     break;
 
   case 49: /* number: tUNUMBER  */
-#line 372 "getdate.y"
+#line 374 "getdate.y"
           {
 	    if ((yyHaveTime != 0) && (yyHaveDate != 0) && (yyHaveRel == 0))
 	      yyYear = (yyvsp[0].Number);
@@ -1783,27 +1785,27 @@ yyreduce:
 		  }
 	      }
 	  }
-#line 1787 "getdate.c"
+#line 1789 "getdate.c"
     break;
 
   case 50: /* o_merid: %empty  */
-#line 405 "getdate.y"
+#line 407 "getdate.y"
           {
 	    (yyval.Meridian) = MER24;
 	  }
-#line 1795 "getdate.c"
+#line 1797 "getdate.c"
     break;
 
   case 51: /* o_merid: tMERIDIAN  */
-#line 409 "getdate.y"
+#line 411 "getdate.y"
           {
 	    (yyval.Meridian) = (yyvsp[0].Meridian);
 	  }
-#line 1803 "getdate.c"
+#line 1805 "getdate.c"
     break;
 
 
-#line 1807 "getdate.c"
+#line 1809 "getdate.c"
 
       default: break;
     }
@@ -1996,7 +1998,7 @@ yyreturnlab:
   return yyresult;
 }
 
-#line 414 "getdate.y"
+#line 416 "getdate.y"
 
 
 /* Month and day table. */
@@ -2215,12 +2217,12 @@ static int LookupWord (char *buff)
     if (isupper (*p))
       *p = tolower (*p);
 
-  if (strcmp (buff, "am") == 0 || strcmp (buff, "a.m.") == 0)
+  if (streq(buff, "am") || streq(buff, "a.m."))
     {
       yylval.Meridian = MERam;
       return tMERIDIAN;
     }
-  if (strcmp (buff, "pm") == 0 || strcmp (buff, "p.m.") == 0)
+  if (streq(buff, "pm") || streq(buff, "p.m."))
     {
       yylval.Meridian = MERpm;
       return tMERIDIAN;
@@ -2232,7 +2234,7 @@ static int LookupWord (char *buff)
   else if (strlen (buff) == 4 && buff[3] == '.')
     {
       abbrev = true;
-      buff[3] = '\0';
+      stpcpy(&buff[3], "");
     }
   else
     abbrev = false;
@@ -2247,7 +2249,7 @@ static int LookupWord (char *buff)
 	      return tp->type;
 	    }
 	}
-      else if (strcmp (buff, tp->name) == 0)
+      else if (streq(buff, tp->name))
 	{
 	  yylval.Number = tp->value;
 	  return tp->type;
@@ -2255,17 +2257,17 @@ static int LookupWord (char *buff)
     }
 
   for (tp = TimezoneTable; tp->name; tp++)
-    if (strcmp (buff, tp->name) == 0)
+    if (streq(buff, tp->name))
       {
 	yylval.Number = tp->value;
 	return tp->type;
       }
 
-  if (strcmp (buff, "dst") == 0)
+  if (streq(buff, "dst"))
     return tDST;
 
   for (tp = UnitsTable; tp->name; tp++)
-    if (strcmp (buff, tp->name) == 0)
+    if (streq(buff, tp->name))
       {
 	yylval.Number = tp->value;
 	return tp->type;
@@ -2275,9 +2277,9 @@ static int LookupWord (char *buff)
   i = strlen (buff) - 1;
   if (buff[i] == 's')
     {
-      buff[i] = '\0';
+      stpcpy(&buff[i], "");
       for (tp = UnitsTable; tp->name; tp++)
-	if (strcmp (buff, tp->name) == 0)
+	if (streq(buff, tp->name))
 	  {
 	    yylval.Number = tp->value;
 	    return tp->type;
@@ -2286,7 +2288,7 @@ static int LookupWord (char *buff)
     }
 
   for (tp = OtherTable; tp->name; tp++)
-    if (strcmp (buff, tp->name) == 0)
+    if (streq(buff, tp->name))
       {
 	yylval.Number = tp->value;
 	return tp->type;
@@ -2296,7 +2298,7 @@ static int LookupWord (char *buff)
   if (buff[1] == '\0' && isalpha (*buff))
     {
       for (tp = MilitaryTable; tp->name; tp++)
-	if (strcmp (buff, tp->name) == 0)
+	if (streq(buff, tp->name))
 	  {
 	    yylval.Number = tp->value;
 	    return tp->type;
@@ -2309,10 +2311,10 @@ static int LookupWord (char *buff)
       *p++ = *q;
     else
       i++;
-  *p = '\0';
+  stpcpy(p, "");
   if (0 != i)
     for (tp = TimezoneTable; NULL != tp->name; tp++)
-      if (strcmp (buff, tp->name) == 0)
+      if (streq(buff, tp->name))
 	{
 	  yylval.Number = tp->value;
 	  return tp->type;
@@ -2332,8 +2334,7 @@ yylex (void)
 
   for (;;)
     {
-      while (isspace (*yyInput))
-	yyInput++;
+      yyInput = stpspn(yyInput, " \t");
 
       if (isdigit (c = *yyInput) || c == '-' || c == '+')
 	{
@@ -2358,7 +2359,7 @@ yylex (void)
 	  for (p = buff; (c = *yyInput++, isalpha (c)) || c == '.';)
 	    if (p < &buff[sizeof buff - 1])
 	      *p++ = c;
-	  *p = '\0';
+          stpcpy(p, "");
 	  yyInput--;
 	  return LookupWord (buff);
 	}
@@ -2407,7 +2408,7 @@ time_t get_date (const char *p, const time_t *now)
   time_t Start;
 
   yyInput = p;
-  Start = now ? *now : time ((time_t *) NULL);
+  Start = now ? *now : time(NULL);
   tmp = localtime (&Start);
   yyYear = tmp->tm_year + TM_YEAR_ORIGIN;
   yyMonth = tmp->tm_mon + 1;
@@ -2521,7 +2522,7 @@ main(void)
   buff[MAX_BUFF_LEN] = 0;
   while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
     {
-      d = get_date (buff, (time_t *) NULL);
+      d = get_date(buff, NULL);
       if (d == -1)
 	(void) printf ("Bad format - couldn't convert.\n");
       else
diff --git a/lib/getdate.y b/lib/getdate.y
index 8cea2cc4..9a7e1d36 100644
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -24,14 +24,16 @@
 # undef static
 #endif
 
-#include <stdio.h>
 #include <ctype.h>
+#include <stdio.h>
+#include <string.h>
 #include <time.h>
 
 #include "attr.h"
 #include "getdate.h"
+#include "string/strchr/stpspn.h"
+#include "string/strcmp/streq.h"
 
-#include <string.h>
 
 /* Some old versions of bison generate parsers that use bcopy.
    That loses on systems that don't provide the function, so we have
@@ -629,12 +631,12 @@ static int LookupWord (char *buff)
     if (isupper (*p))
       *p = tolower (*p);
 
-  if (strcmp (buff, "am") == 0 || strcmp (buff, "a.m.") == 0)
+  if (streq(buff, "am") || streq(buff, "a.m."))
     {
       yylval.Meridian = MERam;
       return tMERIDIAN;
     }
-  if (strcmp (buff, "pm") == 0 || strcmp (buff, "p.m.") == 0)
+  if (streq(buff, "pm") || streq(buff, "p.m."))
     {
       yylval.Meridian = MERpm;
       return tMERIDIAN;
@@ -646,7 +648,7 @@ static int LookupWord (char *buff)
   else if (strlen (buff) == 4 && buff[3] == '.')
     {
       abbrev = true;
-      buff[3] = '\0';
+      stpcpy(&buff[3], "");
     }
   else
     abbrev = false;
@@ -661,7 +663,7 @@ static int LookupWord (char *buff)
 	      return tp->type;
 	    }
 	}
-      else if (strcmp (buff, tp->name) == 0)
+      else if (streq(buff, tp->name))
 	{
 	  yylval.Number = tp->value;
 	  return tp->type;
@@ -669,17 +671,17 @@ static int LookupWord (char *buff)
     }
 
   for (tp = TimezoneTable; tp->name; tp++)
-    if (strcmp (buff, tp->name) == 0)
+    if (streq(buff, tp->name))
       {
 	yylval.Number = tp->value;
 	return tp->type;
       }
 
-  if (strcmp (buff, "dst") == 0)
+  if (streq(buff, "dst"))
     return tDST;
 
   for (tp = UnitsTable; tp->name; tp++)
-    if (strcmp (buff, tp->name) == 0)
+    if (streq(buff, tp->name))
       {
 	yylval.Number = tp->value;
 	return tp->type;
@@ -689,9 +691,9 @@ static int LookupWord (char *buff)
   i = strlen (buff) - 1;
   if (buff[i] == 's')
     {
-      buff[i] = '\0';
+      stpcpy(&buff[i], "");
       for (tp = UnitsTable; tp->name; tp++)
-	if (strcmp (buff, tp->name) == 0)
+	if (streq(buff, tp->name))
 	  {
 	    yylval.Number = tp->value;
 	    return tp->type;
@@ -700,7 +702,7 @@ static int LookupWord (char *buff)
     }
 
   for (tp = OtherTable; tp->name; tp++)
-    if (strcmp (buff, tp->name) == 0)
+    if (streq(buff, tp->name))
       {
 	yylval.Number = tp->value;
 	return tp->type;
@@ -710,7 +712,7 @@ static int LookupWord (char *buff)
   if (buff[1] == '\0' && isalpha (*buff))
     {
       for (tp = MilitaryTable; tp->name; tp++)
-	if (strcmp (buff, tp->name) == 0)
+	if (streq(buff, tp->name))
 	  {
 	    yylval.Number = tp->value;
 	    return tp->type;
@@ -723,10 +725,10 @@ static int LookupWord (char *buff)
       *p++ = *q;
     else
       i++;
-  *p = '\0';
+  stpcpy(p, "");
   if (0 != i)
     for (tp = TimezoneTable; NULL != tp->name; tp++)
-      if (strcmp (buff, tp->name) == 0)
+      if (streq(buff, tp->name))
 	{
 	  yylval.Number = tp->value;
 	  return tp->type;
@@ -746,8 +748,7 @@ yylex (void)
 
   for (;;)
     {
-      while (isspace (*yyInput))
-	yyInput++;
+      yyInput = stpspn(yyInput, " \t");
 
       if (isdigit (c = *yyInput) || c == '-' || c == '+')
 	{
@@ -772,7 +773,7 @@ yylex (void)
 	  for (p = buff; (c = *yyInput++, isalpha (c)) || c == '.';)
 	    if (p < &buff[sizeof buff - 1])
 	      *p++ = c;
-	  *p = '\0';
+          stpcpy(p, "");
 	  yyInput--;
 	  return LookupWord (buff);
 	}
@@ -821,7 +822,7 @@ time_t get_date (const char *p, const time_t *now)
   time_t Start;
 
   yyInput = p;
-  Start = now ? *now : time ((time_t *) NULL);
+  Start = now ? *now : time(NULL);
   tmp = localtime (&Start);
   yyYear = tmp->tm_year + TM_YEAR_ORIGIN;
   yyMonth = tmp->tm_mon + 1;
@@ -935,7 +936,7 @@ main(void)
   buff[MAX_BUFF_LEN] = 0;
   while (fgets (buff, MAX_BUFF_LEN, stdin) && buff[0])
     {
-      d = get_date (buff, (time_t *) NULL);
+      d = get_date(buff, NULL);
       if (d == -1)
 	(void) printf ("Bad format - couldn't convert.\n");
       else
diff --git a/lib/getdef.c b/lib/getdef.c
index 30f54bab..c59e8807 100644
--- a/lib/getdef.c
+++ b/lib/getdef.c
@@ -11,22 +11,29 @@
 
 #ident "$Id$"
 
-#include "prototypes.h"
-#include "defines.h"
+#include <ctype.h>
+#include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
+#include <string.h>
+
 #ifdef USE_ECONF
 #include <libeconf.h>
 #endif
 
-#include "alloc.h"
-#include "atoi/str2i.h"
+#include "atoi/a2i/a2s.h"
+#include "atoi/a2i/a2u.h"
+#include "atoi/str2i/str2u.h"
+#include "defines.h"
 #include "getdef.h"
+#include "prototypes.h"
 #include "shadowlog_internal.h"
-#include "string/sprintf.h"
+#include "string/sprintf/xasprintf.h"
+#include "string/strchr/stpspn.h"
+#include "string/strchr/strrspn.h"
+#include "string/strcmp/streq.h"
+#include "string/strtok/stpsep.h"
 
 
 /*
@@ -151,7 +158,6 @@ static struct itemdef def_table[] = {
 	{NULL, NULL}
 };
 
-#define NUMKNOWNDEFS	(sizeof(knowndef_table)/sizeof(knowndef_table[0]))
 static struct itemdef knowndef_table[] = {
 #ifdef USE_PAM
 	PAMDEFS
@@ -232,10 +238,11 @@ bool getdef_bool (const char *item)
  * values are handled.
  */
 
-int getdef_num (const char *item, int dflt)
+int
+getdef_num(const char *item, int dflt)
 {
-	struct itemdef *d;
-	long val;
+	int             val;
+	struct itemdef  *d;
 
 	if (!def_loaded) {
 		def_load ();
@@ -246,9 +253,7 @@ int getdef_num (const char *item, int dflt)
 		return dflt;
 	}
 
-	if (   (str2sl(&val, d->value) == -1)
-	    || (val > INT_MAX)
-	    || (val < -1)) {
+	if (a2si(&val, d->value, NULL, 0, -1, INT_MAX) == -1) {
 		fprintf (shadow_logfd,
 		         _("configuration error - cannot parse %s value: '%s'"),
 		         item, d->value);
@@ -267,10 +272,11 @@ int getdef_num (const char *item, int dflt)
  * values are handled.
  */
 
-unsigned int getdef_unum (const char *item, unsigned int dflt)
+unsigned int
+getdef_unum(const char *item, unsigned int dflt)
 {
-	struct itemdef *d;
-	long val;
+	unsigned int    val;
+	struct itemdef  *d;
 
 	if (!def_loaded) {
 		def_load ();
@@ -281,9 +287,7 @@ unsigned int getdef_unum (const char *item, unsigned int dflt)
 		return dflt;
 	}
 
-	if (   (str2sl(&val, d->value) == -1)
-	    || (val < 0)
-	    || (val > INT_MAX)) {
+	if (a2ui(&val, d->value, NULL, 0, 0, UINT_MAX) == -1) {
 		fprintf (shadow_logfd,
 		         _("configuration error - cannot parse %s value: '%s'"),
 		         item, d->value);
@@ -316,7 +320,7 @@ long getdef_long (const char *item, long dflt)
 		return dflt;
 	}
 
-	if (str2sl(&val, d->value) == -1 || val < -1) {
+	if (a2sl(&val, d->value, NULL, 0, -1, LONG_MAX) == -1) {
 		fprintf (shadow_logfd,
 		         _("configuration error - cannot parse %s value: '%s'"),
 		         item, d->value);
@@ -416,7 +420,7 @@ static /*@observer@*/ /*@null@*/struct itemdef *def_find (const char *name, cons
 	 */
 
 	for (ptr = def_table; NULL != ptr->name; ptr++) {
-		if (strcmp (ptr->name, name) == 0) {
+		if (streq(ptr->name, name)) {
 			return ptr;
 		}
 	}
@@ -426,7 +430,7 @@ static /*@observer@*/ /*@null@*/struct itemdef *def_find (const char *name, cons
 	 */
 
 	for (ptr = knowndef_table; NULL != ptr->name; ptr++) {
-		if (strcmp (ptr->name, name) == 0) {
+		if (streq(ptr->name, name)) {
 			goto out;
 		}
 	}
@@ -526,7 +530,6 @@ static void def_load (void)
 #else /* USE_ECONF */
 static void def_load (void)
 {
-	int i;
 	FILE *fp;
 	char buf[1024], *name, *value, *s;
 
@@ -558,28 +561,21 @@ static void def_load (void)
 		/*
 		 * Trim trailing whitespace.
 		 */
-		for (i = (ptrdiff_t) strlen (buf) - 1; i >= 0; --i) {
-			if (!isspace (buf[i])) {
-				break;
-			}
-		}
-		i++;
-		buf[i] = '\0';
+		stpcpy(strrspn(buf, " \t\n"), "");
 
 		/*
 		 * Break the line into two fields.
 		 */
-		name = buf + strspn (buf, " \t");	/* first nonwhite */
+		name = stpspn(buf, " \t");	/* first nonwhite */
 		if (*name == '\0' || *name == '#')
 			continue;	/* comment or empty */
 
-		s = name + strcspn (name, " \t");	/* end of field */
-		if (*s == '\0')
+		s = stpsep(name, " \t");  /* next field */
+		if (s == NULL)
 			continue;	/* only 1 field?? */
 
-		*s++ = '\0';
-		value = s + strspn (s, " \"\t");	/* next nonwhite */
-		*(value + strcspn (value, "\"")) = '\0';
+		value = stpspn(s, " \"\t");	/* next nonwhite */
+		stpsep(value, "\"");
 
 		/*
 		 * Store the value in def_table.
diff --git a/lib/getgr_nam_gid.c b/lib/getgr_nam_gid.c
index fd0c2171..58f38534 100644
--- a/lib/getgr_nam_gid.c
+++ b/lib/getgr_nam_gid.c
@@ -1,11 +1,10 @@
-/*
- * SPDX-FileCopyrightText: 1991 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2000 - 2006, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2007 - 2009, Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 1991-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-2000, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2000-2006, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2007-2009, Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
 
 #include <config.h>
 
@@ -14,30 +13,27 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <grp.h>
+#include <sys/types.h>
+
+#include "atoi/getnum.h"
 #include "prototypes.h"
 
+
 /*
  * getgr_nam_gid - Return a pointer to the group specified by a string.
  * The string may be a valid GID or a valid groupname.
  * If the group does not exist on the system, NULL is returned.
  */
-extern /*@only@*//*@null@*/struct group *getgr_nam_gid (/*@null@*/const char *grname)
+extern /*@only@*//*@null@*/struct group *
+getgr_nam_gid(/*@null@*/const char *grname)
 {
-	char       *end;
-	long long  gid;
+	gid_t  gid;
 
-	if (NULL == grname) {
+	if (NULL == grname)
 		return NULL;
-	}
 
-	errno = 0;
-	gid = strtoll(grname, &end, 10);
-	if (   ('\0' != *grname)
-	    && ('\0' == *end)
-	    && (0 == errno)
-	    && (/*@+longintegral@*/gid == (gid_t)gid)/*@=longintegral@*/) {
-		return xgetgrgid (gid);
-	}
-	return xgetgrnam (grname);
+	if (get_gid(grname, &gid) == 0)
+		return xgetgrgid(gid);
+	return xgetgrnam(grname);
 }
 
diff --git a/lib/getrange.c b/lib/getrange.c
index 466e9089..603152e6 100644
--- a/lib/getrange.c
+++ b/lib/getrange.c
@@ -10,7 +10,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#include "atoi/a2i.h"
+#include "atoi/a2i/a2u.h"
 #include "defines.h"
 #include "prototypes.h"
 
diff --git a/lib/gettime.c b/lib/gettime.c
index c61c88c3..69285e54 100644
--- a/lib/gettime.c
+++ b/lib/gettime.c
@@ -11,7 +11,7 @@
 #include <limits.h>
 #include <stdio.h>
 
-#include "atoi/a2i.h"
+#include "atoi/a2i/a2i.h"
 #include "defines.h"
 #include "prototypes.h"
 #include "shadowlog.h"
diff --git a/lib/groupio.c b/lib/groupio.c
index 7b9d45f2..516e3ccd 100644
--- a/lib/groupio.c
+++ b/lib/groupio.c
@@ -15,12 +15,14 @@
 #include <assert.h>
 #include <stdio.h>
 
-#include "alloc.h"
-#include "prototypes.h"
-#include "defines.h"
+#include "alloc/calloc.h"
+#include "alloc/malloc.h"
 #include "commonio.h"
+#include "defines.h"
 #include "getdef.h"
 #include "groupio.h"
+#include "prototypes.h"
+#include "string/strcmp/streq.h"
 
 
 static /*@null@*/struct commonio_entry *merge_group_entries (
@@ -262,8 +264,8 @@ static int group_open_hook (void)
 			struct group *g2 = gr2->eptr;
 			if (NULL != g1 &&
 			    NULL != g2 &&
-			    0 == strcmp (g1->gr_name, g2->gr_name) &&
-			    0 == strcmp (g1->gr_passwd, g2->gr_passwd) &&
+			    streq(g1->gr_name, g2->gr_name) &&
+			    streq(g1->gr_passwd, g2->gr_passwd) &&
 			    g1->gr_gid == g2->gr_gid) {
 				/* Both group entries refer to the same
 				 * group. It is a split group. Merge the
@@ -331,7 +333,7 @@ static /*@null@*/struct commonio_entry *merge_group_entries (
 	for (i=0; NULL != gptr2->gr_mem[i]; i++) {
 		char **pmember = gptr1->gr_mem;
 		while (NULL != *pmember) {
-			if (0 == strcmp(*pmember, gptr2->gr_mem[i])) {
+			if (streq(*pmember, gptr2->gr_mem[i])) {
 				break;
 			}
 			pmember++;
@@ -354,7 +356,7 @@ static /*@null@*/struct commonio_entry *merge_group_entries (
 	for (i=0; NULL != gptr2->gr_mem[i]; i++) {
 		char **pmember = new_members;
 		while (NULL != *pmember) {
-			if (0 == strcmp(*pmember, gptr2->gr_mem[i])) {
+			if (streq(*pmember, gptr2->gr_mem[i])) {
 				break;
 			}
 			pmember++;
diff --git a/lib/groupmem.c b/lib/groupmem.c
index 69d4435b..23d7f054 100644
--- a/lib/groupmem.c
+++ b/lib/groupmem.c
@@ -12,11 +12,13 @@
 
 #ident "$Id$"
 
-#include "alloc.h"
-#include "memzero.h"
+#include "alloc/calloc.h"
+#include "alloc/malloc.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "groupio.h"
+#include "string/memset/memzero.h"
+
 
 /*@null@*/ /*@only@*/struct group *__gr_dup (const struct group *grent)
 {
@@ -81,10 +83,9 @@ void
 gr_free(/*@only@*/struct group *grent)
 {
 	free (grent->gr_name);
-	if (NULL != grent->gr_passwd) {
-		strzero (grent->gr_passwd);
-		free (grent->gr_passwd);
-	}
+	if (NULL != grent->gr_passwd)
+		free(strzero(grent->gr_passwd));
+
 	gr_free_members(grent);
 	free (grent);
 }
diff --git a/lib/gshadow.c b/lib/gshadow.c
index 3c71bea4..16c432b6 100644
--- a/lib/gshadow.c
+++ b/lib/gshadow.c
@@ -14,45 +14,40 @@
 
 #ident "$Id$"
 
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "alloc.h"
-#include "prototypes.h"
+#include "alloc/malloc.h"
+#include "alloc/realloc.h"
+#include "alloc/x/xmalloc.h"
 #include "defines.h"
+#include "prototypes.h"
+#include "string/strchr/strchrcnt.h"
+#include "string/strcmp/streq.h"
+#include "string/strtok/stpsep.h"
+
 
 static /*@null@*/FILE *shadow;
-static /*@null@*//*@only@*/char **members = NULL;
-static size_t nmembers = 0;
-static /*@null@*//*@only@*/char **admins = NULL;
-static size_t nadmins = 0;
-static struct sgrp sgroup;
+static struct sgrp  sgroup = {};
 
 #define	FIELDS	4
 
 
-static /*@null@*/char **build_list (char *s, char **list[], size_t * nlist)
+static /*@null@*/char **
+build_list(char *s)
 {
-	char **ptr = *list;
-	size_t nelem = *nlist, size;
+	char    **l;
+	size_t  i;
 
-	while (s != NULL && *s != '\0') {
-		size = (nelem + 1) * sizeof (ptr);
-		ptr = REALLOC(*list, size, char *);
-		if (NULL != ptr) {
-			ptr[nelem] = strsep(&s, ",");
-			nelem++;
-			*list = ptr;
-			*nlist = nelem;
-		}
-	}
-	size = (nelem + 1) * sizeof (ptr);
-	ptr = REALLOC(*list, size, char *);
-	if (NULL != ptr) {
-		ptr[nelem] = NULL;
-		*list = ptr;
-	}
-	return ptr;
+	l = XMALLOC(strchrcnt(s, ',') + 2, char *);
+
+	for (i = 0; s != NULL && *s != '\0'; i++)
+		l[i] = strsep(&s, ",");
+
+	l[i] = NULL;
+
+	return l;
 }
 
 void setsgent (void)
@@ -73,7 +68,8 @@ void endsgent (void)
 	shadow = NULL;
 }
 
-/*@observer@*//*@null@*/struct sgrp *sgetsgent (const char *string)
+/*@observer@*//*@null@*/struct sgrp *
+sgetsgent(const char *string)
 {
 	static char *sgrbuf = NULL;
 	static size_t sgrbuflen = 0;
@@ -85,19 +81,15 @@ void endsgent (void)
 
 	if (len > sgrbuflen) {
 		char *buf = REALLOC(sgrbuf, len, char);
-		if (NULL == buf) {
+		if (NULL == buf)
 			return NULL;
-		}
+
 		sgrbuf = buf;
 		sgrbuflen = len;
 	}
 
 	strcpy (sgrbuf, string);
-
-	cp = strrchr (sgrbuf, '\n');
-	if (NULL != cp) {
-		*cp = '\0';
-	}
+	stpsep(sgrbuf, "\n");
 
 	/*
 	 * There should be exactly 4 colon separated fields.  Find
@@ -113,22 +105,16 @@ void endsgent (void)
 	 */
 
 	if (NULL != cp || i != FIELDS)
-		return 0;
+		return NULL;
 
 	sgroup.sg_name = fields[0];
 	sgroup.sg_passwd = fields[1];
-	if (0 != nadmins) {
-		nadmins = 0;
-		free (admins);
-		admins = NULL;
-	}
-	if (0 != nmembers) {
-		nmembers = 0;
-		free (members);
-		members = NULL;
-	}
-	sgroup.sg_adm = build_list (fields[2], &admins, &nadmins);
-	sgroup.sg_mem = build_list (fields[3], &members, &nmembers);
+
+	free(sgroup.sg_adm);
+	free(sgroup.sg_mem);
+
+	sgroup.sg_adm = build_list(fields[2]);
+	sgroup.sg_mem = build_list(fields[3]);
 
 	return &sgroup;
 }
@@ -159,32 +145,29 @@ void endsgent (void)
 		return NULL;
 	}
 
-	if (fgetsx(buf, buflen, fp) == buf) {
-		while (   ((cp = strrchr (buf, '\n')) == NULL)
-		       && (feof (fp) == 0)) {
-			size_t len;
+	if (fgetsx(buf, buflen, fp) == NULL)
+		return NULL;
 
-			cp = REALLOC(buf, buflen * 2, char);
-			if (NULL == cp) {
-				return NULL;
-			}
-			buf = cp;
-			buflen *= 2;
+	while (   (strrchr(buf, '\n') == NULL)
+	       && (feof (fp) == 0)) {
+		size_t len;
 
-			len = strlen (buf);
-			if (fgetsx (&buf[len],
-			            (int) (buflen - len),
-			            fp) != &buf[len]) {
-				return NULL;
-			}
+		cp = REALLOC(buf, buflen * 2, char);
+		if (NULL == cp) {
+			return NULL;
 		}
-		cp = strrchr (buf, '\n');
-		if (NULL != cp) {
-			*cp = '\0';
+		buf = cp;
+		buflen *= 2;
+
+		len = strlen (buf);
+		if (fgetsx (&buf[len],
+			    (int) (buflen - len),
+			    fp) != &buf[len]) {
+			return NULL;
 		}
-		return (sgetsgent (buf));
 	}
-	return NULL;
+	stpsep(buf, "\n");
+	return (sgetsgent (buf));
 }
 
 /*
@@ -210,7 +193,7 @@ void endsgent (void)
 	setsgent ();
 
 	while ((sgrp = getsgent ()) != NULL) {
-		if (strcmp (name, sgrp->sg_name) == 0) {
+		if (streq(name, sgrp->sg_name)) {
 			break;
 		}
 	}
@@ -253,53 +236,36 @@ int putsgent (const struct sgrp *sgrp, FILE * fp)
 	/*
 	 * Copy the group name and passwd.
 	 */
-
-	strcpy (cp, sgrp->sg_name);
-	cp += strlen (cp);
-	*cp++ = ':';
-
-	strcpy (cp, sgrp->sg_passwd);
-	cp += strlen (cp);
-	*cp++ = ':';
+	cp = stpcpy(stpcpy(cp, sgrp->sg_name), ":");
+	cp = stpcpy(stpcpy(cp, sgrp->sg_passwd), ":");
 
 	/*
 	 * Copy the administrators, separating each from the other
 	 * with a ",".
 	 */
-
 	for (i = 0; NULL != sgrp->sg_adm[i]; i++) {
-		if (i > 0) {
-			*cp++ = ',';
-		}
+		if (i > 0)
+			cp = stpcpy(cp, ",");
 
-		strcpy (cp, sgrp->sg_adm[i]);
-		cp += strlen (cp);
+		cp = stpcpy(cp, sgrp->sg_adm[i]);
 	}
-	*cp = ':';
-	cp++;
+	cp = stpcpy(cp, ":");
 
 	/*
 	 * Now do likewise with the group members.
 	 */
-
 	for (i = 0; NULL != sgrp->sg_mem[i]; i++) {
-		if (i > 0) {
-			*cp = ',';
-			cp++;
-		}
+		if (i > 0)
+			cp = stpcpy(cp, ",");
 
-		strcpy (cp, sgrp->sg_mem[i]);
-		cp += strlen (cp);
+		cp = stpcpy(cp, sgrp->sg_mem[i]);
 	}
-	*cp = '\n';
-	cp++;
-	*cp = '\0';
+	stpcpy(cp, "\n");
 
 	/*
 	 * Output using the function which understands the line
 	 * continuation conventions.
 	 */
-
 	if (fputsx (buf, fp) == EOF) {
 		free (buf);
 		return -1;
diff --git a/lib/gshadow_.h b/lib/gshadow_.h
index 68a0bb67..2961afcb 100644
--- a/lib/gshadow_.h
+++ b/lib/gshadow_.h
@@ -30,7 +30,6 @@ struct sgrp {
 
 #include <stdio.h>		/* for FILE */
 
-#if __STDC__
 /*@observer@*//*@null@*/struct sgrp *getsgent (void);
 /*@observer@*//*@null@*/struct sgrp *getsgnam (const char *);
 /*@observer@*//*@null@*/struct sgrp *sgetsgent (const char *);
@@ -38,15 +37,6 @@ struct sgrp {
 void setsgent (void);
 void endsgent (void);
 int putsgent (const struct sgrp *, FILE *);
-#else
-/*@observer@*//*@null@*/struct sgrp *getsgent ();
-/*@observer@*//*@null@*/struct sgrp *getsgnam ();
-/*@observer@*//*@null@*/struct sgrp *sgetsgent ();
-/*@observer@*//*@null@*/struct sgrp *fgetsgent ();
-void setsgent ();
-void endsgent ();
-int putsgent ();
-#endif
 
 #define	GSHADOW	"/etc/gshadow"
 #endif				/* ifndef _H_GSHADOW */
diff --git a/lib/hushed.c b/lib/hushed.c
index 86c224f3..526e0f29 100644
--- a/lib/hushed.c
+++ b/lib/hushed.c
@@ -12,13 +12,17 @@
 
 #ident "$Id$"
 
-#include <sys/types.h>
-#include <stdio.h>
 #include <pwd.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+
 #include "defines.h"
-#include "prototypes.h"
 #include "getdef.h"
-#include "string/sprintf.h"
+#include "prototypes.h"
+#include "string/sprintf/snprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strtok/stpsep.h"
 
 
 /*
@@ -70,9 +74,9 @@ bool hushed (const char *username)
 		return false;
 	}
 	for (found = false; !found && (fgets (buf, sizeof buf, fp) == buf);) {
-		buf[strcspn (buf, "\n")] = '\0';
-		found = (strcmp (buf, pw->pw_shell) == 0) ||
-		        (strcmp (buf, pw->pw_name) == 0);
+		stpsep(buf, "\n");
+		found = streq(buf, pw->pw_shell) ||
+		        streq(buf, pw->pw_name);
 	}
 	(void) fclose (fp);
 	return found;
diff --git a/lib/idmapping.c b/lib/idmapping.c
index 56c72eae..89c03b10 100644
--- a/lib/idmapping.c
+++ b/lib/idmapping.c
@@ -12,24 +12,26 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <strings.h>
-
-#include "alloc.h"
-#include "atoi/str2i.h"
-#include "prototypes.h"
-#include "string/stpeprintf.h"
-#include "idmapping.h"
 #if HAVE_SYS_CAPABILITY_H
 #include <sys/prctl.h>
 #include <sys/capability.h>
 #endif
+
+#include "alloc/calloc.h"
+#include "alloc/x/xmalloc.h"
+#include "atoi/a2i/a2u.h"
+#include "idmapping.h"
+#include "prototypes.h"
 #include "shadowlog.h"
 #include "sizeof.h"
+#include "string/sprintf/stpeprintf.h"
+#include "string/strcmp/streq.h"
 
 
-struct map_range *get_map_ranges(int ranges, int argc, char **argv)
+struct map_range *
+get_map_ranges(int ranges, int argc, char **argv)
 {
-	struct map_range *mappings, *mapping;
-	int idx, argidx;
+	struct map_range  *mappings, *m;
 
 	if (ranges < 0 || argc < 0) {
 		fprintf(log_get_logfd(), "%s: error calculating number of arguments\n", log_get_progname());
@@ -45,45 +47,30 @@ struct map_range *get_map_ranges(int ranges, int argc, char **argv)
 	if (!mappings) {
 		fprintf(log_get_logfd(), _( "%s: Memory allocation failure\n"),
 			log_get_progname());
-		exit(EXIT_FAILURE);
+		return NULL;
 	}
 
 	/* Gather up the ranges from the command line */
-	mapping = mappings;
-	for (idx = 0, argidx = 0; idx < ranges; idx++, argidx += 3, mapping++) {
-		if (str2ul(&mapping->upper, argv[argidx + 0]) == -1) {
+	m = mappings;
+	for (int i = 0; i < ranges * 3; i+=3, m++) {
+		if (a2ul(&m->upper, argv[i + 0], NULL, 0, 0, UINT_MAX - 1) == -1) {
+			if (errno == ERANGE)
+				fprintf(log_get_logfd(), _( "%s: subuid overflow detected.\n"), log_get_progname());
 			free(mappings);
 			return NULL;
 		}
-		if (str2ul(&mapping->lower, argv[argidx + 1]) == -1) {
+		if (a2ul(&m->lower, argv[i + 1], NULL, 0, 0, UINT_MAX - 1) == -1) {
+			if (errno == ERANGE)
+				fprintf(log_get_logfd(), _( "%s: subuid overflow detected.\n"), log_get_progname());
 			free(mappings);
 			return NULL;
 		}
-		if (str2ul(&mapping->count, argv[argidx + 2]) == -1) {
+		if (a2ul(&m->count, argv[i + 2], NULL, 0, 1, UINT_MAX - MAX(m->lower, m->upper)) == -1) {
+			if (errno == ERANGE)
+				fprintf(log_get_logfd(), _( "%s: subuid overflow detected.\n"), log_get_progname());
 			free(mappings);
 			return NULL;
 		}
-		if (ULONG_MAX - mapping->upper <= mapping->count || ULONG_MAX - mapping->lower <= mapping->count) {
-			fprintf(log_get_logfd(), _( "%s: subuid overflow detected.\n"), log_get_progname());
-			exit(EXIT_FAILURE);
-		}
-		if (mapping->upper > UINT_MAX ||
-			mapping->lower > UINT_MAX ||
-			mapping->count > UINT_MAX)  {
-			fprintf(log_get_logfd(), _( "%s: subuid overflow detected.\n"), log_get_progname());
-			exit(EXIT_FAILURE);
-		}
-		if (mapping->lower + mapping->count > UINT_MAX ||
-				mapping->upper + mapping->count > UINT_MAX) {
-			fprintf(log_get_logfd(), _( "%s: subuid overflow detected.\n"), log_get_progname());
-			exit(EXIT_FAILURE);
-		}
-		if (mapping->lower + mapping->count < mapping->lower ||
-				mapping->upper + mapping->count < mapping->upper) {
-			/* this one really shouldn't be possible given previous checks */
-			fprintf(log_get_logfd(), _( "%s: subuid overflow detected.\n"), log_get_progname());
-			exit(EXIT_FAILURE);
-		}
 	}
 	return mappings;
 }
@@ -147,9 +134,9 @@ void write_mapping(int proc_dir_fd, int ranges, const struct map_range *mappings
 	struct __user_cap_header_struct hdr = {_LINUX_CAPABILITY_VERSION_3, 0};
 	struct __user_cap_data_struct data[2] = {{0}};
 
-	if (strcmp(map_file, "uid_map") == 0) {
+	if (streq(map_file, "uid_map")) {
 		cap = CAP_SETUID;
-	} else if (strcmp(map_file, "gid_map") == 0) {
+	} else if (streq(map_file, "gid_map")) {
 		cap = CAP_SETGID;
 	} else {
 		fprintf(log_get_logfd(), _("%s: Invalid map file %s specified\n"), log_get_progname(), map_file);
@@ -158,7 +145,7 @@ void write_mapping(int proc_dir_fd, int ranges, const struct map_range *mappings
 
 	/* Align setuid- and fscaps-based new{g,u}idmap behavior. */
 	if (geteuid() == 0 && geteuid() != ruid) {
-		if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) < 0) {
+		if (prctl(PR_SET_KEEPCAPS, 1L) == -1) {
 			fprintf(log_get_logfd(), _("%s: Could not prctl(PR_SET_KEEPCAPS)\n"), log_get_progname());
 			exit(EXIT_FAILURE);
 		}
diff --git a/lib/isexpired.c b/lib/isexpired.c
index c275691f..f69938a1 100644
--- a/lib/isexpired.c
+++ b/lib/isexpired.c
@@ -21,6 +21,7 @@
 #include "adds.h"
 #include "defines.h"
 #include "prototypes.h"
+#include "string/strcmp/streq.h"
 
 #ident "$Id$"
 
@@ -67,7 +68,7 @@ int isexpired (const struct passwd *pw, /*@null@*/const struct spwd *sp)
 	 * returns sp_lstchg==0 (must change password) instead of -1!
 	 */
 	if (   (0 == sp->sp_lstchg)
-	    && (strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING) == 0)) {
+	    && streq(pw->pw_passwd, SHADOW_PASSWD_STRING)) {
 		return 1;
 	}
 
diff --git a/lib/limits.c b/lib/limits.c
index 813c0821..5a98a129 100644
--- a/lib/limits.c
+++ b/lib/limits.c
@@ -30,8 +30,15 @@
 #include "shadowlog.h"
 #include <sys/resource.h>
 
-#include "atoi/str2i.h"
-#include "memzero.h"
+#include "atoi/a2i/a2i.h"
+#include "atoi/a2i/a2s.h"
+#include "atoi/str2i/str2i.h"
+#include "atoi/str2i/str2s.h"
+#include "atoi/str2i/str2u.h"
+#include "string/memset/memzero.h"
+#include "string/strchr/stpspn.h"
+#include "string/strcmp/streq.h"
+#include "typetraits.h"
 
 
 #ifndef LIMITS_FILE
@@ -49,9 +56,7 @@ static int setrlimit_value (unsigned int resource,
                             const char *value,
                             unsigned int multiplier)
 {
-	char           *end;
-	long           l;
-	rlim_t         limit;
+	rlim_t         l, limit;
 	struct rlimit  rlim;
 
 	/* The "-" is special, not belonging to a strange negative limit.
@@ -59,18 +64,13 @@ static int setrlimit_value (unsigned int resource,
 	 */
 	if ('-' == value[0]) {
 		limit = RLIM_INFINITY;
-	}
-	else {
-		/* We cannot use str2sl() here because it fails when there
-		 * is more to the value than just this number!
-		 * Also, we are limited to base 10 here (hex numbers will not
-		 * work with the limit string parser as is anyway)
-		 */
-		errno = 0;
-		l = strtol(value, &end, 10);
 
-		if (value == end || errno != 0)
+	} else {
+		if (a2i(rlim_t, &l, value, NULL, 10, 0, type_max(rlim_t)) == -1
+		    && errno != ENOTSUP)
+		{
 			return 0;  // FIXME: We could instead throw an error, though.
+		}
 
 		if (__builtin_mul_overflow(l, multiplier, &limit)) {
 			/* FIXME: Again, silent error handling...
@@ -89,14 +89,14 @@ static int setrlimit_value (unsigned int resource,
 }
 
 
-static int set_prio (const char *value)
+static int
+set_prio(const char *value)
 {
-	long prio;
+	int  prio;
 
-	if (   (str2sl(&prio, value) == -1)
-	    || (prio != (int) prio)) {
+	if (str2si(&prio, value) == -1)
 		return 0;
-	}
+
 	if (setpriority (PRIO_PROCESS, 0, prio) != 0) {
 		return LOGIN_ERROR_RLIMIT;
 	}
@@ -104,14 +104,13 @@ static int set_prio (const char *value)
 }
 
 
-static int set_umask (const char *value)
+static int
+set_umask(const char *value)
 {
-	unsigned long  mask;
+	mode_t  mask;
 
-	if (   (str2ul(&mask, value) == -1)
-	    || (mask != (mode_t) mask)) {
+	if (str2i(mode_t, &mask, value) == -1)
 		return 0;
-	}
 
 	(void) umask (mask);
 	return 0;
@@ -124,6 +123,10 @@ static int check_logins (const char *name, const char *maxlogins)
 	unsigned long limit, count;
 
 	if (str2ul(&limit, maxlogins) == -1) {
+		if (errno == ERANGE) {
+			SYSLOG((LOG_WARN, "Invalid maxlogins value\n"));
+			return LOGIN_ERROR_LOGIN;
+		}
 		return 0;
 	}
 
@@ -184,11 +187,7 @@ static int do_user_limits (const char *buf, const char *name)
 	int retval = 0;
 	bool reported = false;
 
-	pp = buf;
-	/* Skip leading whitespace. */
-	while ((' ' == *pp) || ('\t' == *pp)) {
-		pp++;
-	}
+	pp = stpspn(buf, " \t");
 
 	/* The special limit string "-" results in no limit for all known
 	 * limits.
@@ -196,7 +195,7 @@ static int do_user_limits (const char *buf, const char *name)
 	 * being ignored if a limit type is not known to the system.
 	 * Though, there will be complaining for unknown limit types.
 	 */
-	if (strcmp (pp, "-") == 0) {
+	if (streq(pp, "-")) {
 		/* Remember to extend this, too, when adding new limits!
 		 * Oh... but "unlimited" does not make sense for umask,
 		 * or does it? (K-)
@@ -312,12 +311,7 @@ static int do_user_limits (const char *buf, const char *name)
 		 * So, let's skip all digits, "-" and our limited set of
 		 * whitespace.
 		 */
-		while (   isdigit (*pp)
-		       || ('-'  == *pp)
-		       || (' '  == *pp)
-		       || ('\t' ==*pp)) {
-			pp++;
-		}
+		pp = stpspn(pp, "0123456789- \t");
 	}
 	return retval;
 }
@@ -402,10 +396,10 @@ static int setup_user_limits (const char *uname)
 		 */
 		if (sscanf (buf, "%s%[ACDFIKLMNOPRSTUacdfiklmnoprstu0-9 \t-]",
 		            name, tempbuf) == 2) {
-			if (strcmp (name, uname) == 0) {
+			if (streq(name, uname)) {
 				strcpy (limits, tempbuf);
 				break;
-			} else if (strcmp (name, "*") == 0) {
+			} else if (streq(name, "*")) {
 				strcpy (deflimits, tempbuf);
 			} else if (name[0] == '@') {
 				/* If the user is in the group, the group
@@ -443,7 +437,7 @@ static void setup_usergroups (const struct passwd *info)
 		/* local, no need for xgetgrgid */
 		grp = getgrgid (info->pw_gid);
 		if (   (NULL != grp)
-		    && (strcmp (info->pw_name, grp->gr_name) == 0)) {
+		    && streq(info->pw_name, grp->gr_name)) {
 			mode_t tmpmask;
 			tmpmask = umask (0777);
 			tmpmask = (tmpmask & ~070) | ((tmpmask >> 3) & 070);
@@ -484,10 +478,9 @@ void setup_limits (const struct passwd *info)
 			}
 
 			if (strncmp (cp, "pri=", 4) == 0) {
-				long  inc;
+				int  inc;
 
-				if (   (str2sl(&inc, cp + 4) == 0)
-				    && (inc >= -20) && (inc <= 20)) {
+				if (a2si(&inc, cp + 4, NULL, 0, -20, 20) == 0) {
 					errno = 0;
 					if (   (nice (inc) != -1)
 					    || (0 != errno)) {
@@ -503,9 +496,9 @@ void setup_limits (const struct passwd *info)
 				continue;
 			}
 			if (strncmp (cp, "ulimit=", 7) == 0) {
-				long  blocks;
-				if (   (str2sl(&blocks, cp + 7) == -1)
-				    || (blocks != (int) blocks)
+				int  blocks;
+
+				if (   (str2si(&blocks, cp + 7) == -1)
 				    || (set_filesize_limit (blocks) != 0)) {
 					SYSLOG ((LOG_WARN,
 					         "Can't set the ulimit for user %s",
@@ -514,10 +507,9 @@ void setup_limits (const struct passwd *info)
 				continue;
 			}
 			if (strncmp (cp, "umask=", 6) == 0) {
-				unsigned long  mask;
+				mode_t  mask;
 
-				if (   (str2ul(&mask, cp + 6) == -1)
-				    || (mask != (mode_t) mask)) {
+				if (str2i(mode_t, &mask, cp + 6) == -1) {
 					SYSLOG ((LOG_WARN,
 					         "Can't set umask value for user %s",
 					         info->pw_name));
diff --git a/lib/list.c b/lib/list.c
index 9fc66089..a18c7186 100644
--- a/lib/list.c
+++ b/lib/list.c
@@ -12,9 +12,14 @@
 
 #include <assert.h>
 
-#include "alloc.h"
+#include "alloc/x/xmalloc.h"
 #include "prototypes.h"
 #include "defines.h"
+#include "string/strchr/strchrcnt.h"
+#include "string/strcmp/streq.h"
+#include "string/strdup/xstrdup.h"
+
+
 /*
  * add_list - add a member to a list of group members
  *
@@ -37,7 +42,7 @@ add_list(/*@returned@*/ /*@only@*/char **list, const char *member)
 	 */
 
 	for (i = 0; list[i] != NULL; i++) {
-		if (strcmp (list[i], member) == 0) {
+		if (streq(list[i], member)) {
 			return list;
 		}
 	}
@@ -88,7 +93,7 @@ del_list(/*@returned@*/ /*@only@*/char **list, const char *member)
 	 */
 
 	for (i = j = 0; list[i] != NULL; i++) {
-		if (strcmp (list[i], member) != 0) {
+		if (!streq(list[i], member)) {
 			j++;
 		}
 	}
@@ -111,7 +116,7 @@ del_list(/*@returned@*/ /*@only@*/char **list, const char *member)
 	 */
 
 	for (i = j = 0; list[i] != NULL; i++) {
-		if (strcmp (list[i], member) != 0) {
+		if (!streq(list[i], member)) {
 			tmp[j] = list[i];
 			j++;
 		}
@@ -163,7 +168,7 @@ bool is_on_list (char *const *list, const char *member)
 	assert (NULL != list);
 
 	while (NULL != *list) {
-		if (strcmp (*list, member) == 0) {
+		if (streq(*list, member)) {
 			return true;
 		}
 		list++;
@@ -176,7 +181,8 @@ bool is_on_list (char *const *list, const char *member)
  * comma_to_list - convert comma-separated list to (char *) array
  */
 
-/*@only@*/char **comma_to_list (const char *comma)
+/*@only@*/char **
+comma_to_list(const char *comma)
 {
 	char *members;
 	char **array;
@@ -192,30 +198,12 @@ bool is_on_list (char *const *list, const char *member)
 
 	members = xstrdup (comma);
 
-	/*
-	 * Count the number of commas in the list
-	 */
-
-	for (cp = members, i = 0;; i++) {
-		cp2 = strchr (cp, ',');
-		if (NULL != cp2) {
-			cp = cp2 + 1;
-		} else {
-			break;
-		}
-	}
-
-	/*
-	 * Add 2 - one for the ending NULL, the other for the last item
-	 */
-
-	i += 2;
-
 	/*
 	 * Allocate the array we're going to store the pointers into.
+	 * n: number of delimiters + last element + NULL
 	 */
 
-	array = XMALLOC(i, char *);
+	array = XMALLOC(strchrcnt(members, ',') + 2, char *);
 
 	/*
 	 * Empty list is special - 0 members, not 1 empty member.  --marekm
diff --git a/lib/log.c b/lib/log.c
index 9f54d454..87eab365 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -17,10 +17,10 @@
 #include <time.h>
 #include "defines.h"
 #include <lastlog.h>
-#include "memzero.h"
 #include "prototypes.h"
-#include "string/strncpy.h"
-#include "string/strtcpy.h"
+#include "string/memset/memzero.h"
+#include "string/strcpy/strncpy.h"
+#include "string/strcpy/strtcpy.h"
 
 
 /*
@@ -79,7 +79,7 @@ void dolastlog (
 	}
 
 	ll_time = newlog.ll_time;
-	(void) time (&ll_time);
+	ll_time = time(NULL);
 	newlog.ll_time = ll_time;
 	STRTCPY(newlog.ll_line, line);
 #if HAVE_LL_HOST
diff --git a/lib/loginprompt.c b/lib/loginprompt.c
index 9b2aa25c..7d3e23dc 100644
--- a/lib/loginprompt.c
+++ b/lib/loginprompt.c
@@ -15,12 +15,15 @@
 #include <stdio.h>
 #include <signal.h>
 
-#include "alloc.h"
 #include "attr.h"
-#include "memzero.h"
-#include "prototypes.h"
 #include "defines.h"
 #include "getdef.h"
+#include "prototypes.h"
+#include "string/memset/memzero.h"
+#include "string/strchr/stpspn.h"
+#include "string/strcpy/strtcpy.h"
+#include "string/strtok/stpsep.h"
+
 
 static void login_exit (MAYBE_UNUSED int sig)
 {
@@ -33,8 +36,8 @@ static void login_exit (MAYBE_UNUSED int sig)
  * login_prompt() displays the standard login prompt.  If ISSUE_FILE
  * is set in login.defs, this file is displayed before the prompt.
  */
-
-void login_prompt (char *name, int namesize)
+void
+login_prompt(char *name, int namesize)
 {
 	char buf[1024];
 
@@ -84,22 +87,16 @@ void login_prompt (char *name, int namesize)
 		exit (EXIT_FAILURE);
 	}
 
-	cp = strchr (buf, '\n');
-	if (NULL == cp) {
-		exit (EXIT_FAILURE);
-	}
-	*cp = '\0';		/* remove \n [ must be there ] */
+	if (stpsep(buf, "\n") == NULL)
+		exit(EXIT_FAILURE);
 
 	/*
 	 * Skip leading whitespace.  This makes "  username" work right.
 	 * Then copy the rest (up to the end) into the username.
 	 */
 
-	for (cp = buf; *cp == ' ' || *cp == '\t'; cp++);
-
-	for (i = 0; i < namesize - 1 && *cp != '\0'; name[i++] = *cp++);
-
-	name[i] = '\0';
+	cp = stpspn(buf, " \t");
+	strtcpy(name, cp, namesize);
 
 	/*
 	 * Set the SIGQUIT handler back to its original value
diff --git a/lib/mail.c b/lib/mail.c
index d14bdb18..b62287e6 100644
--- a/lib/mail.c
+++ b/lib/mail.c
@@ -15,9 +15,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "alloc.h"
 #include "getdef.h"
-#include "string/sprintf.h"
+#include "string/sprintf/xasprintf.h"
 
 #ident "$Id$"
 
diff --git a/lib/memzero.c b/lib/memzero.c
deleted file mode 100644
index 8979e5f8..00000000
--- a/lib/memzero.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include <stddef.h>
-
-#include "memzero.h"
-
-
-extern inline void memzero(void *ptr, size_t size);
-extern inline void strzero(char *s);
diff --git a/lib/motd.c b/lib/motd.c
index d1d5bf6e..6394dbd9 100644
--- a/lib/motd.c
+++ b/lib/motd.c
@@ -12,11 +12,14 @@
 #ident "$Id$"
 
 #include <stdio.h>
+#include <string.h>
 
-#include "alloc.h"
 #include "defines.h"
 #include "getdef.h"
 #include "prototypes.h"
+#include "string/strdup/xstrdup.h"
+
+
 /*
  * motd -- output the /etc/motd file
  *
@@ -24,7 +27,8 @@
  * it to the user's terminal at login time.  The MOTD_FILE configuration
  * option is a colon-delimited list of filenames.
  */
-void motd (void)
+void
+motd(void)
 {
 	FILE *fp;
 	char *motdlist;
@@ -39,12 +43,8 @@ void motd (void)
 
 	motdlist = xstrdup (motdfile);
 
-	for (mb = motdlist; ;mb = NULL) {
-		motdfile = strtok (mb, ":");
-		if (NULL == motdfile) {
-			break;
-		}
-
+	mb = motdlist;
+	while (NULL != (motdfile = strsep(&mb, ":"))) {
 		fp = fopen (motdfile, "r");
 		if (NULL != fp) {
 			while ((c = getc (fp)) != EOF) {
diff --git a/lib/must_be.h b/lib/must_be.h
index a7365cba..6ae6c799 100644
--- a/lib/must_be.h
+++ b/lib/must_be.h
@@ -90,10 +90,28 @@
  */
 
 
-#define is_same_type(a, b)    __builtin_types_compatible_p(a, b)
-#define is_same_typeof(a, b)  is_same_type(typeof(a), typeof(b))
-#define is_array(a)           (!is_same_typeof((a), &(a)[0]))
-#define must_be_array(a)      must_be(is_array(a))
+#define is_same_type(a, b)                                                    \
+(                                                                             \
+	__builtin_types_compatible_p(a, b)                                    \
+)
+
+
+#define is_same_typeof(a, b)                                                  \
+(                                                                             \
+	is_same_type(typeof(a), typeof(b))                                    \
+)
+
+
+#define is_array(a)                                                           \
+(                                                                             \
+	!is_same_typeof(a, &(a)[0])                                           \
+)
+
+
+#define must_be_array(a)                                                      \
+(                                                                             \
+	must_be(is_array(a))                                                  \
+)
 
 
 #endif  // include guard
diff --git a/lib/nss.c b/lib/nss.c
index dcb8160b..9373bba3 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -9,12 +9,15 @@
 #include <ctype.h>
 #include <stdatomic.h>
 
-#include "alloc.h"
+#include "alloc/malloc.h"
 #include "prototypes.h"
 #include "../libsubid/subid.h"
 #include "shadowlog_internal.h"
 #include "shadowlog.h"
-#include "string/sprintf.h"
+#include "string/sprintf/snprintf.h"
+#include "string/strchr/stpspn.h"
+#include "string/strcmp/streq.h"
+#include "string/strtok/stpsep.h"
 
 
 #define NSSWITCH "/etc/nsswitch.conf"
@@ -45,8 +48,9 @@ static void nss_exit(void) {
 }
 
 // nsswitch_path is an argument only to support testing.
-void nss_init(const char *nsswitch_path) {
-	char    *line = NULL, *p, *token, *saveptr;
+void
+nss_init(const char *nsswitch_path) {
+	char    *line = NULL, *p;
 	char    libname[64];
 	FILE    *nssfp = NULL;
 	FILE    *shadow_logfd = log_get_logfd();
@@ -82,8 +86,7 @@ void nss_init(const char *nsswitch_path) {
 		if (strncasecmp(line, "subid:", 6) != 0)
 			continue;
 		p = &line[6];
-		while (isspace(*p))
-			p++;
+		p = stpspn(p, " \t\n");
 		if (*p != '\0')
 			break;
 		p = NULL;
@@ -91,21 +94,20 @@ void nss_init(const char *nsswitch_path) {
 	if (p == NULL) {
 		goto null_subid;
 	}
-	token = strtok_r(p, " \n\t", &saveptr);
-	if (token == NULL) {
+	if (stpsep(p, " \t\n") == NULL) {
 		fprintf(shadow_logfd, "No usable subid NSS module found, using files\n");
 		// subid_nss has to be null here, but to ease reviews:
 		goto null_subid;
 	}
-	if (strcmp(token, "files") == 0) {
+	if (streq(p, "files")) {
 		goto null_subid;
 	}
-	if (strlen(token) > 50) {
-		fprintf(shadow_logfd, "Subid NSS module name too long (longer than 50 characters): %s\n", token);
+	if (strlen(p) > 50) {
+		fprintf(shadow_logfd, "Subid NSS module name too long (longer than 50 characters): %s\n", p);
 		fprintf(shadow_logfd, "Using files\n");
 		goto null_subid;
 	}
-	SNPRINTF(libname, "libsubid_%s.so", token);
+	SNPRINTF(libname, "libsubid_%s.so", p);
 	h = dlopen(libname, RTLD_LAZY);
 	if (!h) {
 		fprintf(shadow_logfd, "Error opening %s: %s\n", libname, dlerror());
diff --git a/lib/obscure.c b/lib/obscure.c
index 549c2a8d..66b2361c 100644
--- a/lib/obscure.c
+++ b/lib/obscure.c
@@ -15,12 +15,15 @@
 #include <ctype.h>
 #include <stdio.h>
 
-#include "alloc.h"
 #include "attr.h"
-#include "memzero.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "getdef.h"
+#include "string/memset/memzero.h"
+#include "string/sprintf/xasprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strdup/xstrdup.h"
+
 
 #if WITH_LIBBSD == 0
 #include "freezero.h"
@@ -93,31 +96,26 @@ static /*@observer@*//*@null@*/const char *password_check (
 	const char *msg = NULL;
 	char *oldmono, *newmono, *wrapped;
 
-	if (strcmp (new, old) == 0) {
+	if (streq(new, old)) {
 		return _("no change");
 	}
 
 	newmono = str_lower (xstrdup (new));
 	oldmono = str_lower (xstrdup (old));
-	wrapped = XMALLOC(strlen(oldmono) * 2 + 1, char);
-	strcpy (wrapped, oldmono);
-	strcat (wrapped, oldmono);
+	xasprintf(&wrapped, "%s%s", oldmono, oldmono);
 
 	if (palindrome (oldmono, newmono)) {
 		msg = _("a palindrome");
-	} else if (strcmp (oldmono, newmono) == 0) {
+	} else if (streq(oldmono, newmono)) {
 		msg = _("case changes only");
 	} else if (similar (oldmono, newmono)) {
 		msg = _("too similar");
 	} else if (strstr (wrapped, newmono) != NULL) {
 		msg = _("rotated");
 	}
-	strzero (newmono);
-	strzero (oldmono);
-	strzero (wrapped);
-	free (newmono);
-	free (oldmono);
-	free (wrapped);
+	free(strzero(newmono));
+	free(strzero(oldmono));
+	free(strzero(wrapped));
 
 	return msg;
 }
@@ -165,16 +163,16 @@ static /*@observer@*//*@null@*/const char *obscure_msg (
 
 	} else {
 
-		if (   (strcmp (result, "MD5")    == 0)
+		if (   streq(result, "MD5")
 #ifdef USE_SHA_CRYPT
-		    || (strcmp (result, "SHA256") == 0)
-		    || (strcmp (result, "SHA512") == 0)
+		    || streq(result, "SHA256")
+		    || streq(result, "SHA512")
 #endif
 #ifdef USE_BCRYPT
-		    || (strcmp (result, "BCRYPT") == 0)
+		    || streq(result, "BCRYPT")
 #endif
 #ifdef USE_YESCRYPT
-		    || (strcmp (result, "YESCRYPT") == 0)
+		    || streq(result, "YESCRYPT")
 #endif
 		    ) {
 			return NULL;
@@ -189,12 +187,10 @@ static /*@observer@*//*@null@*/const char *obscure_msg (
 
 	new1 = xstrdup (new);
 	old1 = xstrdup (old);
-	if (newlen > maxlen) {
-		new1[maxlen] = '\0';
-	}
-	if (oldlen > maxlen) {
-		old1[maxlen] = '\0';
-	}
+	if (newlen > maxlen)
+		stpcpy(&new1[maxlen], "");
+	if (oldlen > maxlen)
+		stpcpy(&old1[maxlen], "");
 
 	msg = password_check (old1, new1, pwdp);
 
diff --git a/lib/pam_pass_non_interactive.c b/lib/pam_pass_non_interactive.c
index 3d10908b..aa5c29be 100644
--- a/lib/pam_pass_non_interactive.c
+++ b/lib/pam_pass_non_interactive.c
@@ -17,11 +17,11 @@
 
 #include <security/pam_appl.h>
 
-#include "alloc.h"
+#include "alloc/calloc.h"
 #include "attr.h"
-#include "memzero.h"
 #include "prototypes.h"
 #include "shadowlog.h"
+#include "string/memset/memzero.h"
 
 /*@null@*/ /*@only@*/static const char *non_interactive_password = NULL;
 static int ni_conv (int num_msg,
@@ -98,8 +98,7 @@ static int ni_conv (int num_msg,
 failed_conversation:
 	for (count=0; count < num_msg; count++) {
 		if (NULL != responses[count].resp) {
-			strzero(responses[count].resp);
-			free(responses[count].resp);
+			free(strzero(responses[count].resp));
 			responses[count].resp = NULL;
 		}
 	}
diff --git a/lib/port.c b/lib/port.c
index 60ff8989..52ed67e8 100644
--- a/lib/port.c
+++ b/lib/port.c
@@ -11,12 +11,17 @@
 
 #ident "$Id$"
 
-#include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "defines.h"
-#include "prototypes.h"
 #include "port.h"
+#include "prototypes.h"
+#include "string/strcmp/streq.h"
+#include "string/strtok/stpsep.h"
+
 
 static FILE *ports;
 
@@ -42,9 +47,8 @@ static int portcmp (const char *pattern, const char *port)
 	if (('\0' == *pattern) && ('\0' == *port)) {
 		return 0;
 	}
-	if (('S' == orig[0]) && ('U' == orig[1]) && ('\0' == orig[2])) {
+	if (streq(orig, "SU"))
 		return 1;
-	}
 
 	return (*pattern == '*') ? 0 : 1;
 }
@@ -91,17 +95,21 @@ static void endportent (void)
  *	set to EINVAL on error to distinguish the two conditions.
  */
 
-static struct port *getportent (void)
+static struct port *
+getportent(void)
 {
-	static struct port port;	/* static struct to point to         */
-	static char buf[BUFSIZ];	/* some space for stuff              */
-	static char *ttys[PORT_TTY + 1];	/* some pointers to tty names     */
-	static char *users[PORT_IDS + 1];	/* some pointers to user ids     */
-	static struct pt_time ptimes[PORT_TIMES + 1];	/* time ranges         */
-	char *cp;		/* pointer into line                 */
-	int dtime;		/* scratch time of day               */
-	int i, j;
-	int saveerr = errno;	/* errno value on entry              */
+	int   dtime;
+	int   i, j;
+	int   saveerr;
+	char  *cp, *field;
+
+	static char            buf[BUFSIZ];
+	static char            *ttys[PORT_TTY + 1];
+	static char            *users[PORT_IDS + 1];
+	static struct port     port;
+	static struct pt_time  ptimes[PORT_TIMES + 1];
+
+	saveerr = errno;
 
 	/*
 	 * If the ports file is not open, open the file.  Do not rewind
@@ -114,7 +122,7 @@ static struct port *getportent (void)
 
 	if (NULL == ports) {
 		errno = saveerr;
-		return 0;
+		return NULL;
 	}
 
 	/*
@@ -127,20 +135,17 @@ static struct port *getportent (void)
 	 *      - parse off a list of days and times
 	 */
 
-again:
-
-	/*
-	 * Get the next line and remove optional trailing '\n'.
-	 * Lines which begin with '#' are all ignored.
-	 */
-
-	if (fgets (buf, sizeof buf, ports) == 0) {
+next:
+	if (fgets(buf, sizeof(buf), ports) == NULL) {
 		errno = saveerr;
-		return 0;
-	}
-	if ('#' == buf[0]) {
-		goto again;
+		return NULL;
 	}
+	if ('#' == buf[0])
+		goto next;
+
+	stpsep(buf, "\n");
+
+	field = buf;
 
 	/*
 	 * Get the name of the TTY device.  It is the first colon
@@ -149,26 +154,19 @@ again:
 	 * TTY devices.
 	 */
 
-	buf[strcspn (buf, "\n")] = 0;
+	cp = strsep(&field, ":");
+	if (field == NULL)
+		goto next;
 
 	port.pt_names = ttys;
-	for (cp = buf, j = 0; j < PORT_TTY; j++) {
-		port.pt_names[j] = cp;
-		cp = strpbrk(cp, ":,");
+	for (j = 0; j < PORT_TTY; j++) {
+		port.pt_names[j] = strsep(&cp, ",");
 		if (cp == NULL)
-			goto again;	/* line format error */
-
-		if (':' == *cp) {	/* end of tty name list */
 			break;
-		}
-
-		if (',' == *cp) {	/* end of current tty name */
-			*cp++ = '\0';
-		}
 	}
-	*cp = '\0';
-	cp++;
 	port.pt_names[j] = NULL;
+	if (cp != NULL)
+		goto next;
 
 	/*
 	 * Get the list of user names.  It is the second colon
@@ -177,29 +175,19 @@ again:
 	 * The last entry in the list is a NULL pointer.
 	 */
 
-	if (':' != *cp) {
-		port.pt_users = users;
-		port.pt_users[0] = cp;
+	cp = strsep(&field, ":");
+	if (field == NULL)
+		goto next;
 
-		for (j = 1; ':' != *cp; cp++) {
-			if ((',' == *cp) && (j < PORT_IDS)) {
-				*cp = '\0';
-				cp++;
-				port.pt_users[j] = cp;
-				j++;
-			}
-		}
-		port.pt_users[j] = 0;
-	} else {
-		port.pt_users = 0;
+	port.pt_users = users;
+	for (j = 0; j < PORT_IDS; j++) {
+		port.pt_users[j] = strsep(&cp, ",");
+		if (cp == NULL)
+			break;
 	}
-
-	if (':' != *cp) {
-		goto again;
-	}
-
-	*cp = '\0';
-	cp++;
+	port.pt_users[j] = NULL;
+	if (cp != NULL)
+		goto next;
 
 	/*
 	 * Get the list of valid times.  The times field is the third
@@ -214,8 +202,10 @@ again:
 	 * the starting time.  Days are presumed to wrap at 0000.
 	 */
 
+	cp = field;
+
 	if ('\0' == *cp) {
-		port.pt_times = 0;
+		port.pt_times = NULL;
 		return &port;
 	}
 
@@ -270,7 +260,7 @@ again:
 				break;
 			default:
 				errno = EINVAL;
-				return 0;
+				return NULL;
 			}
 		}
 
@@ -293,7 +283,7 @@ again:
 		}
 
 		if (('-' != cp[i]) || (dtime > 2400) || ((dtime % 100) > 59)) {
-			goto again;
+			goto next;
 		}
 		port.pt_times[j].t_start = dtime;
 		cp = cp + i + 1;
@@ -305,7 +295,7 @@ again:
 		if (   ((',' != cp[i]) && ('\0' != cp[i]))
 		    || (dtime > 2400)
 		    || ((dtime % 100) > 59)) {
-			goto again;
+			goto next;
 		}
 
 		port.pt_times[j].t_end = dtime;
@@ -331,41 +321,33 @@ again:
  *	entries are treated as an ordered list.
  */
 
-static struct port *getttyuser (const char *tty, const char *user)
+static struct port *
+getttyuser(const char *tty, const char *user)
 {
-	int i, j;
-	struct port *port;
+	struct port  *port;
 
-	setportent ();
+	setportent();
 
-	while ((port = getportent ()) != NULL) {
-		if (   (0 == port->pt_names)
-		    || (0 == port->pt_users)) {
-			continue;
-		}
+	while ((port = getportent()) != NULL) {
+		char  **ptn;
+		char  **ptu;
 
-		for (i = 0; NULL != port->pt_names[i]; i++) {
-			if (portcmp (port->pt_names[i], tty) == 0) {
+		for (ptn = port->pt_names; *ptn != NULL; ptn++) {
+			if (portcmp(*ptn, tty) == 0)
 				break;
-			}
 		}
-
-		if (port->pt_names[i] == 0) {
+		if (*ptn == NULL)
 			continue;
-		}
 
-		for (j = 0; NULL != port->pt_users[j]; j++) {
-			if (   (strcmp (user, port->pt_users[j]) == 0)
-			    || (strcmp (port->pt_users[j], "*") == 0)) {
-				break;
-			}
-		}
-
-		if (port->pt_users[j] != 0) {
-			break;
+		for (ptu = port->pt_users; *ptu != NULL; ptu++) {
+			if (streq(*ptu, user))
+				goto end;
+			if (streq(*ptu, "*"))
+				goto end;
 		}
 	}
-	endportent ();
+end:
+	endportent();
 	return port;
 }
 
@@ -399,7 +381,7 @@ bool isttytime (const char *id, const char *port, time_t when)
 	 * ever let them login.
 	 */
 
-	if (0 == pp->pt_times) {
+	if (NULL == pp->pt_times) {
 		return false;
 	}
 
diff --git a/lib/prefix_flag.c b/lib/prefix_flag.c
index bba7102b..ea0a0d72 100644
--- a/lib/prefix_flag.c
+++ b/lib/prefix_flag.c
@@ -12,8 +12,8 @@
 #include <stdio.h>
 #include <assert.h>
 
+#include "atoi/getnum.h"
 #include "defines.h"
-#include "alloc.h"
 #include "prototypes.h"
 /*@-exitarg@*/
 #include "exitcodes.h"
@@ -28,7 +28,8 @@
 #endif				/* ENABLE_SUBIDS */
 #include "getdef.h"
 #include "shadowlog.h"
-#include "string/sprintf.h"
+#include "string/sprintf/xasprintf.h"
+#include "string/strcmp/streq.h"
 
 
 static char *passwd_db_file = NULL;
@@ -60,10 +61,11 @@ extern const char* process_prefix_flag (const char* short_opt, int argc, char **
 
 	for (i = 0; i < argc; i++) {
 		val = NULL;
-		if (   (strcmp (argv[i], "--prefix") == 0)
+		if (   streq(argv[i], "--prefix")
 		    || ((strncmp (argv[i], "--prefix=", 9) == 0)
 			&& (val = argv[i] + 9))
-		    || (strcmp (argv[i], short_opt) == 0)) {
+		    || streq(argv[i], short_opt))
+		{
 			if (NULL != prefix) {
 				fprintf (log_get_logfd(),
 				         _("%s: multiple --prefix options\n"),
@@ -96,7 +98,7 @@ extern const char* process_prefix_flag (const char* short_opt, int argc, char **
 			exit (EXIT_FAILURE);
 		}
 
-		if ( prefix[0] == '\0' || !strcmp(prefix, "/"))
+		if (prefix[0] == '\0' || streq(prefix, "/"))
 			return ""; /* if prefix is "/" then we ignore the flag option */
 		/* should we prevent symbolic link from being used as a prefix? */
 
@@ -153,7 +155,7 @@ extern struct group *prefix_getgrnam(const char *name)
 		if (!fg)
 			return NULL;
 		while ((grp = fgetgrent(fg)) != NULL) {
-			if (!strcmp(name, grp->gr_name))
+			if (streq(name, grp->gr_name))
 				break;
 		}
 		fclose(fg);
@@ -213,7 +215,7 @@ extern struct passwd *prefix_getpwnam(const char* name)
 		if (!fg)
 			return NULL;
 		while ((pwd = fgetpwent(fg)) != NULL) {
-			if (!strcmp(name, pwd->pw_name))
+			if (streq(name, pwd->pw_name))
 				break;
 		}
 		fclose(fg);
@@ -235,7 +237,7 @@ extern int prefix_getpwnam_r(const char* name, struct passwd* pwd,
 		if (!fg)
 			return errno;
 		while ((ret = fgetpwent_r(fg, pwd, buf, buflen, result)) == 0) {
-			if (!strcmp(name, pwd->pw_name))
+			if (streq(name, pwd->pw_name))
 				break;
 		}
 		fclose(fg);
@@ -256,7 +258,7 @@ extern struct spwd *prefix_getspnam(const char* name)
 		if (!fg)
 			return NULL;
 		while ((sp = fgetspent(fg)) != NULL) {
-			if (!strcmp(name, sp->sp_namp))
+			if (streq(name, sp->sp_namp))
 				break;
 		}
 		fclose(fg);
@@ -334,8 +336,7 @@ extern void prefix_endgrent(void)
 
 extern struct group *prefix_getgr_nam_gid(const char *grname)
 {
-	char          *end;
-	long long     gid;
+	gid_t         gid;
 	struct group  *g;
 
 	if (NULL == grname) {
@@ -345,15 +346,8 @@ extern struct group *prefix_getgr_nam_gid(const char *grname)
 	if (!group_db_file)
 		return getgr_nam_gid(grname);
 
-	errno = 0;
-	gid = strtoll(grname, &end, 10);
-	if (   ('\0' != *grname)
-	    && ('\0' == *end)
-	    && (0 == errno)
-	    && (gid == (gid_t)gid))
-	{
+	if (get_gid(grname, &gid) == 0)
 		return prefix_getgrgid(gid);
-	}
 
 	g = prefix_getgrnam(grname);
 	return g ? __gr_dup(g) : NULL;
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 91ff368b..6b978a97 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -142,15 +142,10 @@ extern int find_new_sub_gids (gid_t *range_start, unsigned long *range_count);
 extern int find_new_sub_uids (uid_t *range_start, unsigned long *range_count);
 #endif				/* ENABLE_SUBIDS */
 
-
-/* get_gid.c */
-extern int get_gid (const char *gidstr, gid_t *gid);
-
 /* getgr_nam_gid.c */
 extern /*@only@*//*@null@*/struct group *getgr_nam_gid (/*@null@*/const char *grname);
 
 /* get_pid.c */
-extern int get_pid (const char *pidstr, pid_t *pid);
 extern int get_pidfd_from_fd(const char *pidfdstr);
 extern int open_pidfd(const char *pidstr);
 
@@ -162,9 +157,6 @@ extern int getrange (const char *range,
 /* gettime.c */
 extern time_t gettime (void);
 
-/* get_uid.c */
-extern int get_uid (const char *uidstr, uid_t *uid);
-
 /* fputsx.c */
 ATTR_ACCESS(write_only, 1, 2)
 extern /*@null@*/char *fgetsx(/*@returned@*/char *restrict, int, FILE *restrict);
diff --git a/lib/pwauth.c b/lib/pwauth.c
index 0cd3412b..0434dd08 100644
--- a/lib/pwauth.c
+++ b/lib/pwauth.c
@@ -21,11 +21,11 @@
 
 #include "agetpass.h"
 #include "defines.h"
-#include "memzero.h"
 #include "prototypes.h"
 #include "pwauth.h"
 #include "getdef.h"
-#include "string/sprintf.h"
+#include "string/memset/memzero.h"
+#include "string/sprintf/snprintf.h"
 
 #ifdef SKEY
 #include <skey.h>
diff --git a/lib/pwmem.c b/lib/pwmem.c
index 9c6e58d7..0f4e621c 100644
--- a/lib/pwmem.c
+++ b/lib/pwmem.c
@@ -14,11 +14,12 @@
 
 #include <stdio.h>
 
-#include "alloc.h"
+#include "alloc/calloc.h"
 #include "defines.h"
-#include "memzero.h"
 #include "prototypes.h"
 #include "pwio.h"
+#include "string/memset/memzero.h"
+
 
 /*@null@*/ /*@only@*/struct passwd *__pw_dup (const struct passwd *pwent)
 {
@@ -75,10 +76,9 @@ pw_free(/*@only@*/struct passwd *pwent)
 {
 	if (pwent != NULL) {
 		free (pwent->pw_name);
-		if (pwent->pw_passwd) {
-			strzero (pwent->pw_passwd);
-			free (pwent->pw_passwd);
-		}
+		if (pwent->pw_passwd)
+			free(strzero(pwent->pw_passwd));
+
 		free (pwent->pw_gecos);
 		free (pwent->pw_dir);
 		free (pwent->pw_shell);
diff --git a/lib/readpassphrase.c b/lib/readpassphrase.c
index 5ff060cc..e23960f0 100644
--- a/lib/readpassphrase.c
+++ b/lib/readpassphrase.c
@@ -141,7 +141,7 @@ restart:
 			*p++ = ch;
 		}
 	}
-	*p = '\0';
+	stpcpy(p, "");
 	save_errno = errno;
 	if (!(term.c_lflag & ECHO))
 		(void)write(output, "\n", 1);
diff --git a/lib/remove_tree.c b/lib/remove_tree.c
index 3d76b95e..ce07b40c 100644
--- a/lib/remove_tree.c
+++ b/lib/remove_tree.c
@@ -19,8 +19,11 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include <unistd.h>
-#include "prototypes.h"
+
 #include "defines.h"
+#include "prototypes.h"
+#include "string/strcmp/streq.h"
+
 
 static int remove_tree_at (int at_fd, const char *path, bool remove_root)
 {
@@ -48,8 +51,8 @@ static int remove_tree_at (int at_fd, const char *path, bool remove_root)
 		/*
 		 * Skip the "." and ".." entries
 		 */
-		if (strcmp (ent->d_name, ".") == 0 ||
-		    strcmp (ent->d_name, "..") == 0) {
+		if (streq(ent->d_name, ".") ||
+		    streq(ent->d_name, "..")) {
 			continue;
 		}
 
diff --git a/lib/root_flag.c b/lib/root_flag.c
index 5572831a..f63aa649 100644
--- a/lib/root_flag.c
+++ b/lib/root_flag.c
@@ -10,12 +10,16 @@
 #ident "$Id$"
 
 #include <stdio.h>
-#include <assert.h>
+
 #include "defines.h"
-#include "prototypes.h"
 /*@-exitarg@*/
 #include "exitcodes.h"
+#include "prototypes.h"
 #include "shadowlog.h"
+#include "string/strcmp/streq.h"
+
+#include <assert.h>
+
 
 static void change_root (const char* newroot);
 
@@ -38,10 +42,10 @@ extern void process_root_flag (const char* short_opt, int argc, char **argv)
 
 	for (i = 0; i < argc; i++) {
 		val = NULL;
-		if (   (strcmp (argv[i], "--root") == 0)
+		if (   streq(argv[i], "--root")
 		    || ((strncmp (argv[i], "--root=", 7) == 0)
 			&& (val = argv[i] + 7))
-		    || (strcmp (argv[i], short_opt) == 0)) {
+		    || streq(argv[i], short_opt)) {
 			if (NULL != newroot) {
 				fprintf (log_get_logfd(),
 				         _("%s: multiple --root options\n"),
diff --git a/lib/run_part.c b/lib/run_part.c
index 670d8150..840d9511 100644
--- a/lib/run_part.c
+++ b/lib/run_part.c
@@ -11,48 +11,47 @@
 #include <unistd.h>
 #include <lib/prototypes.h>
 
-#include "alloc.h"
 #include "run_part.h"
 #include "shadowlog_internal.h"
 
 
-int run_part (char *script_path, const char *name, const char *action)
+static int run_part(char *script_path, const char *name, const char *action)
 {
-	int pid;
+	pid_t pid;
 	int wait_status;
-	int pid_status;
+	pid_t pid_status;
 	char *args[] = { script_path, NULL };
 
 	pid=fork();
 	if (pid==-1) {
-		perror ("Could not fork");
+		fprintf(shadow_logfd, "fork: %s\n", strerror(errno));
 		return 1;
 	}
 	if (pid==0) {
-		setenv ("ACTION",action,1);
-		setenv ("SUBJECT",name,1);
-		execv (script_path,args);
-		perror ("execv");
+		setenv("ACTION",action,1);
+		setenv("SUBJECT",name,1);
+		execv(script_path,args);
+		fprintf(shadow_logfd, "execv: %s\n", strerror(errno));
 		exit(1);
 	}
 
-	pid_status = wait (&wait_status);
+	pid_status = wait(&wait_status);
 	if (pid_status == pid) {
 		return (wait_status);
 	}
 
-	perror ("waitpid");
+	fprintf(shadow_logfd, "waitpid: %s\n", strerror(errno));
 	return (1);
 }
 
-int run_parts (const char *directory, const char *name, const char *action)
+int run_parts(const char *directory, const char *name, const char *action)
 {
 	struct dirent **namelist;
 	int scanlist;
 	int n;
 	int execute_result = 0;
 
-	scanlist = scandir (directory, &namelist, 0, alphasort);
+	scanlist = scandir(directory, &namelist, NULL, alphasort);
 	if (scanlist<=0) {
 		return (0);
 	}
@@ -62,7 +61,7 @@ int run_parts (const char *directory, const char *name, const char *action)
 		struct stat  sb;
 
 		if (asprintf(&s, "%s/%s", directory, namelist[n]->d_name) == -1) {
-			fprintf(stderr, "could not allocate memory\n");
+			fprintf(shadow_logfd, "asprintf: %s\n", strerror(errno));
 			for (; n<scanlist; n++) {
 				free(namelist[n]);
 			}
@@ -71,35 +70,35 @@ int run_parts (const char *directory, const char *name, const char *action)
 		}
 
 		execute_result = 0;
-		if (stat (s, &sb) == -1) {
-			perror ("stat");
+		if (stat(s, &sb) == -1) {
+			fprintf(shadow_logfd, "stat: %s\n", strerror(errno));
 			free(s);
 			for (; n<scanlist; n++) {
-				free (namelist[n]);
+				free(namelist[n]);
 			}
-			free (namelist);
+			free(namelist);
 			return (1);
 		}
 
-		if (S_ISREG (sb.st_mode) || S_ISLNK (sb.st_mode)) {
-			execute_result = run_part (s, name, action);
+		if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode)) {
+			execute_result = run_part(s, name, action);
 		}
 
 		free(s);
 
 		if (execute_result!=0) {
-			fprintf (shadow_logfd,
+			fprintf(shadow_logfd,
 				"%s: did not exit cleanly.\n",
 			    namelist[n]->d_name);
 			for (; n<scanlist; n++) {
-				free (namelist[n]);
+				free(namelist[n]);
 			}
 			break;
 		}
 
-		free (namelist[n]);
+		free(namelist[n]);
 	}
-	free (namelist);
+	free(namelist);
 
 	return (execute_result);
 }
diff --git a/lib/run_part.h b/lib/run_part.h
index 6422134c..889d281c 100644
--- a/lib/run_part.h
+++ b/lib/run_part.h
@@ -1,7 +1,6 @@
 #ifndef _RUN_PART_H
 #define _RUN_PART_H
 
-int run_part (char *script_path, const char *name, const char *action);
 int run_parts (const char *directory, const char *name, const char *action);
 
 #endif /* _RUN_PART_H */
diff --git a/lib/salt.c b/lib/salt.c
index 529d59ca..f2432512 100644
--- a/lib/salt.c
+++ b/lib/salt.c
@@ -22,10 +22,12 @@
 #include <string.h>
 #include <strings.h>
 
-#include "prototypes.h"
 #include "defines.h"
 #include "getdef.h"
+#include "prototypes.h"
 #include "shadowlog.h"
+#include "string/strcmp/streq.h"
+
 
 #if (defined CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY && \
      CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY)
@@ -291,6 +293,7 @@ static /*@observer@*/unsigned long YESCRYPT_get_salt_cost (/*@null@*/const int *
 static /*@observer@*/void YESCRYPT_salt_cost_to_buf (char *buf, unsigned long cost)
 {
 	const size_t buf_begin = strlen (buf);
+	char  *p;
 
 	/*
 	 * Check if the result buffer is long enough.
@@ -302,17 +305,17 @@ static /*@observer@*/void YESCRYPT_salt_cost_to_buf (char *buf, unsigned long co
 	 */
 	assert (GENSALT_SETTING_SIZE > buf_begin + 4);
 
-	buf[buf_begin + 0] = 'j';
+	p = &buf[buf_begin];
+	p = stpcpy(p, "j");
 	if (cost < 3) {
-		buf[buf_begin + 1] = 0x36 + cost;
+		*p++ = 0x36 + cost;
 	} else if (cost < 6) {
-		buf[buf_begin + 1] = 0x34 + cost;
+		*p++ = 0x34 + cost;
 	} else {
-		buf[buf_begin + 1] = 0x3b + cost;
+		*p++ = 0x3b + cost;
 	}
-	buf[buf_begin + 2] = cost >= 3 ? 'T' : '5';
-	buf[buf_begin + 3] = '$';
-	buf[buf_begin + 4] = '\0';
+	p = stpcpy(p, (cost >= 3) ? "T" : "5");
+	stpcpy(p, "$");
 }
 #endif /* USE_YESCRYPT */
 
@@ -330,7 +333,7 @@ static /*@observer@*/const char *gensalt (size_t salt_size)
 		strcat (salt, l64a (csrand ()));
 	} while (strlen (salt) < salt_size);
 
-	salt[salt_size] = '\0';
+	stpcpy(&salt[salt_size], "");
 
 	return salt;
 }
@@ -371,37 +374,37 @@ static /*@observer@*/const char *gensalt (size_t salt_size)
 		}
 	}
 
-	if (0 == strcmp (method, "MD5")) {
+	if (streq(method, "MD5")) {
 		MAGNUM(result, '1');
 		salt_len = MD5_CRYPT_SALT_SIZE;
 		rounds = 0;
 #ifdef USE_BCRYPT
-	} else if (0 == strcmp (method, "BCRYPT")) {
+	} else if (streq(method, "BCRYPT")) {
 		BCRYPTMAGNUM(result);
 		salt_len = BCRYPT_SALT_SIZE;
 		rounds = BCRYPT_get_salt_rounds (arg);
 		BCRYPT_salt_rounds_to_buf (result, rounds);
 #endif /* USE_BCRYPT */
 #ifdef USE_YESCRYPT
-	} else if (0 == strcmp (method, "YESCRYPT")) {
+	} else if (streq(method, "YESCRYPT")) {
 		MAGNUM(result, 'y');
 		salt_len = YESCRYPT_SALT_SIZE;
 		rounds = YESCRYPT_get_salt_cost (arg);
 		YESCRYPT_salt_cost_to_buf (result, rounds);
 #endif /* USE_YESCRYPT */
 #ifdef USE_SHA_CRYPT
-	} else if (0 == strcmp (method, "SHA256")) {
+	} else if (streq(method, "SHA256")) {
 		MAGNUM(result, '5');
 		salt_len = SHA_CRYPT_SALT_SIZE;
 		rounds = SHA_get_salt_rounds (arg);
 		SHA_salt_rounds_to_buf (result, rounds);
-	} else if (0 == strcmp (method, "SHA512")) {
+	} else if (streq(method, "SHA512")) {
 		MAGNUM(result, '6');
 		salt_len = SHA_CRYPT_SALT_SIZE;
 		rounds = SHA_get_salt_rounds (arg);
 		SHA_salt_rounds_to_buf (result, rounds);
 #endif /* USE_SHA_CRYPT */
-	} else if (0 != strcmp (method, "DES")) {
+	} else if (!streq(method, "DES")) {
 		fprintf (log_get_logfd(),
 			 _("Invalid ENCRYPT_METHOD value: '%s'.\n"
 			   "Defaulting to DES.\n"),
@@ -421,7 +424,7 @@ static /*@observer@*/const char *gensalt (size_t salt_size)
 		salt_len = GENSALT_SETTING_SIZE - 1;
 		rounds = 0;
 		memset(result, '.', salt_len);
-		result[salt_len] = '\0';
+		stpcpy(&result[salt_len], "");
 	}
 
 	char *retval = crypt_gensalt (result, rounds, NULL, 0);
diff --git a/lib/setupenv.c b/lib/setupenv.c
index c9b7f26f..f49c6ade 100644
--- a/lib/setupenv.c
+++ b/lib/setupenv.c
@@ -21,13 +21,15 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#include "alloc.h"
 #include "prototypes.h"
 #include "defines.h"
 #include <pwd.h>
 #include "getdef.h"
 #include "shadowlog.h"
-#include "string/sprintf.h"
+#include "string/sprintf/xasprintf.h"
+#include "string/strchr/stpspn.h"
+#include "string/strdup/xstrdup.h"
+#include "string/strtok/stpsep.h"
 
 
 #ifndef USE_PAM
@@ -52,17 +54,12 @@ static void read_env_file (const char *filename)
 		return;
 	}
 	while (fgets (buf, (int)(sizeof buf), fp) == buf) {
-		cp = strrchr (buf, '\n');
-		if (NULL == cp) {
+		if (stpsep(buf, "\n") == NULL)
 			break;
-		}
-		*cp = '\0';
 
 		cp = buf;
 		/* ignore whitespace and comments */
-		while (isspace (*cp)) {
-			cp++;
-		}
+		cp = stpspn(cp, " \t");
 		if (('\0' == *cp) || ('#' == *cp)) {
 			continue;
 		}
@@ -71,16 +68,11 @@ static void read_env_file (const char *filename)
 		 * (for example, the "export NAME" shell commands)
 		 */
 		name = cp;
-		while (('\0' != *cp) && !isspace (*cp) && ('=' != *cp)) {
-			cp++;
-		}
-		if ('=' != *cp) {
+		val = stpsep(cp, "=");
+		if (val == NULL)
+			continue;
+		if (strpbrk(name, " \t") != NULL)
 			continue;
-		}
-		/* NUL-terminate the name */
-		*cp = '\0';
-		cp++;
-		val = cp;
 #if 0				/* XXX untested, and needs rewrite with fewer goto's :-) */
 /*
  (state, char_type) -> (state, action)
@@ -112,7 +104,7 @@ static void read_env_file (const char *filename)
 			goto finished;
 		} else if (isspace (*cp)) {
 			/* unescaped whitespace - end of string */
-			*cp = '\0';
+			stpcpy(cp, "");
 			goto finished;
 		} else {
 			cp++;
diff --git a/lib/sgetgrent.c b/lib/sgetgrent.c
index 6cde15c3..b1202967 100644
--- a/lib/sgetgrent.c
+++ b/lib/sgetgrent.c
@@ -16,9 +16,13 @@
 #include <grp.h>
 #include <string.h>
 
-#include "alloc.h"
+#include "alloc/malloc.h"
+#include "alloc/reallocf.h"
+#include "atoi/getnum.h"
 #include "defines.h"
 #include "prototypes.h"
+#include "string/strtok/stpsep.h"
+
 
 #define	NFIELDS	4
 
@@ -80,11 +84,7 @@ struct group *sgetgrent (const char *buf)
 		}
 	}
 	strcpy (grpbuf, buf);
-
-	cp = strrchr (grpbuf, '\n');
-	if (NULL != cp) {
-		*cp = '\0';
-	}
+	stpsep(grpbuf, "\n");
 
 	for (cp = grpbuf, i = 0; (i < NFIELDS) && (NULL != cp); i++)
 		grpfields[i] = strsep(&cp, ":");
diff --git a/lib/sgetpwent.c b/lib/sgetpwent.c
index 75c91770..5704d19a 100644
--- a/lib/sgetpwent.c
+++ b/lib/sgetpwent.c
@@ -16,10 +16,12 @@
 #include <pwd.h>
 #include <string.h>
 
+#include "atoi/getnum.h"
 #include "defines.h"
 #include "prototypes.h"
 #include "shadowlog_internal.h"
 
+
 #define	NFIELDS	7
 
 /*
@@ -52,7 +54,7 @@ sgetpwent(const char *buf)
 		fprintf (shadow_logfd,
 		         "%s: Too long passwd entry encountered, file corruption?\n",
 		         shadow_progname);
-		return 0;	/* fail if too long */
+		return NULL;	/* fail if too long */
 	}
 	strcpy (pwdbuf, buf);
 
@@ -78,7 +80,7 @@ sgetpwent(const char *buf)
 		return NULL;
 
 	/*
-	 * Each of the fields is converted the appropriate data type
+	 * Each of the fields is converted to the appropriate data type
 	 * and the result assigned to the password structure.  If the
 	 * UID or GID does not convert to an integer value, a NULL
 	 * pointer is returned.
diff --git a/lib/sgetspent.c b/lib/sgetspent.c
index bd2ef8b8..97f64edd 100644
--- a/lib/sgetspent.c
+++ b/lib/sgetspent.c
@@ -19,10 +19,12 @@
 #include <sys/types.h>
 #include <string.h>
 
-#include "atoi/str2i.h"
+#include "atoi/a2i/a2s.h"
+#include "atoi/str2i/str2u.h"
+#include "defines.h"
 #include "prototypes.h"
 #include "shadowlog_internal.h"
-#include "defines.h"
+#include "string/strtok/stpsep.h"
 
 
 #define	FIELDS	9
@@ -53,34 +55,21 @@ sgetspent(const char *string)
 		return NULL;	/* fail if too long */
 	}
 	strcpy (spwbuf, string);
-
-	cp = strrchr (spwbuf, '\n');
-	if (NULL != cp) {
-		*cp = '\0';
-	}
+	stpsep(spwbuf, "\n");
 
 	/*
 	 * Tokenize the string into colon separated fields.  Allow up to
 	 * FIELDS different fields.
 	 */
 
-	for (cp = spwbuf, i = 0; ('\0' != *cp) && (i < FIELDS); i++) {
-		fields[i] = cp;
-		cp = strchrnul(cp, ':');
-
-		if ('\0' != *cp) {
-			*cp = '\0';
-			cp++;
-		}
-	}
+	for (cp = spwbuf, i = 0; cp != NULL && i < FIELDS; i++)
+		fields[i] = strsep(&cp, ":");
 
 	if (i == (FIELDS - 1))
 		fields[i++] = "";
 
-	if ( ((NULL != cp) && ('\0' != *cp)) ||
-	     ((i != FIELDS) && (i != OFIELDS)) ) {
+	if (cp != NULL || (i != FIELDS && i != OFIELDS))
 		return NULL;
-	}
 
 	/*
 	 * Start populating the structure.  The fields are all in
@@ -96,34 +85,28 @@ sgetspent(const char *string)
 	 * incorrectly formatted number.
 	 */
 
-	if (fields[2][0] == '\0') {
+	if (fields[2][0] == '\0')
 		spwd.sp_lstchg = -1;
-	} else if (   (str2sl(&spwd.sp_lstchg, fields[2]) == -1)
-	           || (spwd.sp_lstchg < 0)) {
+	else if (a2sl(&spwd.sp_lstchg, fields[2], NULL, 0, 0, LONG_MAX) == -1)
 		return NULL;
-	}
 
 	/*
 	 * Get the minimum period between password changes.
 	 */
 
-	if (fields[3][0] == '\0') {
+	if (fields[3][0] == '\0')
 		spwd.sp_min = -1;
-	} else if (   (str2sl(&spwd.sp_min, fields[3]) == -1)
-	           || (spwd.sp_min < 0)) {
+	else if (a2sl(&spwd.sp_min, fields[3], NULL, 0, 0, LONG_MAX) == -1)
 		return NULL;
-	}
 
 	/*
 	 * Get the maximum number of days a password is valid.
 	 */
 
-	if (fields[4][0] == '\0') {
+	if (fields[4][0] == '\0')
 		spwd.sp_max = -1;
-	} else if (   (str2sl(&spwd.sp_max, fields[4]) == -1)
-	           || (spwd.sp_max < 0)) {
+	else if (a2sl(&spwd.sp_max, fields[4], NULL, 0, 0, LONG_MAX) == -1)
 		return NULL;
-	}
 
 	/*
 	 * If there are only OFIELDS fields (this is a SVR3.2 /etc/shadow
@@ -143,47 +126,40 @@ sgetspent(const char *string)
 	 * Get the number of days of password expiry warning.
 	 */
 
-	if (fields[5][0] == '\0') {
+	if (fields[5][0] == '\0')
 		spwd.sp_warn = -1;
-	} else if (   (str2sl(&spwd.sp_warn, fields[5]) == -1)
-	           || (spwd.sp_warn < 0)) {
+	else if (a2sl(&spwd.sp_warn, fields[5], NULL, 0, 0, LONG_MAX) == -1)
 		return NULL;
-	}
 
 	/*
 	 * Get the number of days of inactivity before an account is
 	 * disabled.
 	 */
 
-	if (fields[6][0] == '\0') {
+	if (fields[6][0] == '\0')
 		spwd.sp_inact = -1;
-	} else if (   (str2sl(&spwd.sp_inact, fields[6]) == -1)
-	           || (spwd.sp_inact < 0)) {
+	else if (a2sl(&spwd.sp_inact, fields[6], NULL, 0, 0, LONG_MAX) == -1)
 		return NULL;
-	}
 
 	/*
 	 * Get the number of days after the epoch before the account is
 	 * set to expire.
 	 */
 
-	if (fields[7][0] == '\0') {
+	if (fields[7][0] == '\0')
 		spwd.sp_expire = -1;
-	} else if (   (str2sl(&spwd.sp_expire, fields[7]) == -1)
-	           || (spwd.sp_expire < 0)) {
+	else if (a2sl(&spwd.sp_expire, fields[7], NULL, 0, 0, LONG_MAX) == -1)
 		return NULL;
-	}
 
 	/*
 	 * This field is reserved for future use.  But it isn't supposed
 	 * to have anything other than a valid integer in it.
 	 */
 
-	if (fields[8][0] == '\0') {
+	if (fields[8][0] == '\0')
 		spwd.sp_flag = SHADOW_SP_FLAG_UNSET;
-	} else if (str2ul(&spwd.sp_flag, fields[8]) == -1) {
+	else if (str2ul(&spwd.sp_flag, fields[8]) == -1)
 		return NULL;
-	}
 
 	return (&spwd);
 }
diff --git a/lib/sgroupio.c b/lib/sgroupio.c
index 0297df4a..acb140d8 100644
--- a/lib/sgroupio.c
+++ b/lib/sgroupio.c
@@ -14,13 +14,15 @@
 
 #ident "$Id$"
 
-#include "alloc.h"
+#include "alloc/calloc.h"
+#include "alloc/malloc.h"
 #include "prototypes.h"
 #include "defines.h"
 #include "commonio.h"
 #include "getdef.h"
-#include "memzero.h"
 #include "sgroupio.h"
+#include "string/memset/memzero.h"
+
 
 /*@null@*/ /*@only@*/struct sgrp *__sgr_dup (const struct sgrp *sgent)
 {
@@ -130,10 +132,9 @@ sgr_free(/*@only@*/struct sgrp *sgent)
 {
 	size_t i;
 	free (sgent->sg_name);
-	if (NULL != sgent->sg_passwd) {
-		strzero (sgent->sg_passwd);
-		free (sgent->sg_passwd);
-	}
+	if (NULL != sgent->sg_passwd)
+		free(strzero(sgent->sg_passwd));
+
 	for (i = 0; NULL != sgent->sg_adm[i]; i++) {
 		free (sgent->sg_adm[i]);
 	}
diff --git a/lib/shadow.c b/lib/shadow.c
index f17d09ee..3bacd204 100644
--- a/lib/shadow.c
+++ b/lib/shadow.c
@@ -14,12 +14,16 @@
 
 #ident "$Id$"
 
-#include <sys/types.h>
-#include "prototypes.h"
-#include "defines.h"
 #include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
 
-#include "atoi/str2i.h"
+#include "atoi/a2i/a2s.h"
+#include "atoi/str2i/str2u.h"
+#include "defines.h"
+#include "prototypes.h"
+#include "string/strcmp/streq.h"
+#include "string/strtok/stpsep.h"
 
 
 static FILE *shadow;
@@ -54,182 +58,13 @@ void endspent (void)
 	shadow = NULL;
 }
 
-/*
- * my_sgetspent - convert string in shadow file format to (struct spwd *)
- */
-
-static struct spwd *my_sgetspent (const char *string)
-{
-	static char spwbuf[BUFSIZ];
-	static struct spwd spwd;
-	char *fields[FIELDS];
-	char *cp;
-	int i;
-
-	/*
-	 * Copy string to local buffer.  It has to be tokenized and we
-	 * have to do that to our private copy.
-	 */
-
-	if (strlen (string) >= sizeof spwbuf)
-		return 0;
-	strcpy (spwbuf, string);
-
-	cp = strrchr (spwbuf, '\n');
-	if (NULL != cp)
-		*cp = '\0';
-
-	/*
-	 * Tokenize the string into colon separated fields.  Allow up to
-	 * FIELDS different fields.
-	 */
-
-	for (cp = spwbuf, i = 0; *cp && i < FIELDS; i++) {
-		fields[i] = cp;
-		while (*cp && *cp != ':')
-			cp++;
-
-		if (*cp)
-			*cp++ = '\0';
-	}
-
-	if (i == (FIELDS - 1))
-		fields[i++] = cp;
-
-	if ((cp && *cp) || (i != FIELDS && i != OFIELDS))
-		return 0;
-
-	/*
-	 * Start populating the structure.  The fields are all in
-	 * static storage, as is the structure we pass back.  If we
-	 * ever see a name with '+' as the first character, we try
-	 * to turn on NIS processing.
-	 */
-
-	spwd.sp_namp = fields[0];
-	spwd.sp_pwdp = fields[1];
-
-	/*
-	 * Get the last changed date.  For all of the integer fields,
-	 * we check for proper format.  It is an error to have an
-	 * incorrectly formatted number, unless we are using NIS.
-	 */
-
-	if (fields[2][0] == '\0') {
-		spwd.sp_lstchg = -1;
-	} else {
-		if (str2sl(&spwd.sp_lstchg, fields[2]) == -1)
-			return 0;
-		if (spwd.sp_lstchg < 0)
-			return 0;
-	}
-
-	/*
-	 * Get the minimum period between password changes.
-	 */
-
-	if (fields[3][0] == '\0') {
-		spwd.sp_min = -1;
-	} else {
-		if (str2sl(&spwd.sp_min, fields[3]) == -1)
-			return 0;
-		if (spwd.sp_min < 0)
-			return 0;
-	}
-
-	/*
-	 * Get the maximum number of days a password is valid.
-	 */
-
-	if (fields[4][0] == '\0') {
-		spwd.sp_max = -1;
-	} else {
-		if (str2sl(&spwd.sp_max, fields[4]) == -1)
-			return 0;
-		if (spwd.sp_max < 0)
-			return 0;
-	}
-
-	/*
-	 * If there are only OFIELDS fields (this is a SVR3.2 /etc/shadow
-	 * formatted file), initialize the other field members to -1.
-	 */
-
-	if (i == OFIELDS) {
-		spwd.sp_warn   = -1;
-		spwd.sp_inact  = -1;
-		spwd.sp_expire = -1;
-		spwd.sp_flag   = SHADOW_SP_FLAG_UNSET;
-
-		return &spwd;
-	}
-
-	/*
-	 * Get the number of days of password expiry warning.
-	 */
-
-	if (fields[5][0] == '\0') {
-		spwd.sp_warn = -1;
-	} else {
-		if (str2sl(&spwd.sp_warn, fields[5]) == -1)
-			return 0;
-		if (spwd.sp_warn < 0)
-			return 0;
-	}
-
-	/*
-	 * Get the number of days of inactivity before an account is
-	 * disabled.
-	 */
-
-	if (fields[6][0] == '\0') {
-		spwd.sp_inact = -1;
-	} else {
-		if (str2sl(&spwd.sp_inact, fields[6]) == -1)
-			return 0;
-		if (spwd.sp_inact < 0)
-			return 0;
-	}
-
-	/*
-	 * Get the number of days after the epoch before the account is
-	 * set to expire.
-	 */
-
-	if (fields[7][0] == '\0') {
-		spwd.sp_expire = -1;
-	} else {
-		if (str2sl(&spwd.sp_expire, fields[7]) == -1)
-			return 0;
-		if (spwd.sp_expire < 0)
-			return 0;
-	}
-
-	/*
-	 * This field is reserved for future use.  But it isn't supposed
-	 * to have anything other than a valid integer in it.
-	 */
-
-	if (fields[8][0] == '\0') {
-		spwd.sp_flag = SHADOW_SP_FLAG_UNSET;
-	} else {
-		if (str2ul(&spwd.sp_flag, fields[8]) == -1)
-			return 0;
-		if (spwd.sp_flag < 0)
-			return 0;
-	}
-
-	return (&spwd);
-}
-
 /*
  * fgetspent - get an entry from a /etc/shadow formatted stream
  */
 
 struct spwd *fgetspent (FILE * fp)
 {
-	char buf[BUFSIZ];
-	char *cp;
+	char  buf[BUFSIZ];
 
 	if (NULL == fp) {
 		return (0);
@@ -237,11 +72,8 @@ struct spwd *fgetspent (FILE * fp)
 
 	if (fgets (buf, sizeof buf, fp) != NULL)
 	{
-		cp = strchr (buf, '\n');
-		if (NULL != cp) {
-			*cp = '\0';
-		}
-		return my_sgetspent (buf);
+		stpsep(buf, "\n");
+		return sgetspent(buf);
 	}
 	return 0;
 }
@@ -269,7 +101,7 @@ struct spwd *getspnam (const char *name)
 	setspent ();
 
 	while ((sp = getspent ()) != NULL) {
-		if (strcmp (name, sp->sp_namp) == 0) {
+		if (streq(name, sp->sp_namp)) {
 			break;
 		}
 	}
diff --git a/lib/shadowlog_internal.h b/lib/shadowlog_internal.h
index f972a3c4..2ed7932b 100644
--- a/lib/shadowlog_internal.h
+++ b/lib/shadowlog_internal.h
@@ -1,7 +1,7 @@
 #ifndef _SHADOWLOG_INTERNAL_H
 #define _SHADOWLOG_INTERNAL_H
 
-extern const char *shadow_progname; /* Program name showed in error messages */
+extern const char *shadow_progname; /* Program name shown in error messages */
 extern FILE *shadow_logfd;  /* file descriptor to which error messages are printed */
 
 #endif /* _SHADOWLOG_INTERNAL_H */
diff --git a/lib/shadowmem.c b/lib/shadowmem.c
index 9d8f193b..99f1b121 100644
--- a/lib/shadowmem.c
+++ b/lib/shadowmem.c
@@ -17,9 +17,10 @@
 #include <shadow.h>
 #include <stdio.h>
 
-#include "alloc.h"
-#include "memzero.h"
+#include "alloc/calloc.h"
 #include "shadowio.h"
+#include "string/memset/memzero.h"
+
 
 /*@null@*/ /*@only@*/struct spwd *__spw_dup (const struct spwd *spent)
 {
@@ -61,10 +62,9 @@ spw_free(/*@only@*/struct spwd *spent)
 {
 	if (spent != NULL) {
 		free (spent->sp_namp);
-		if (NULL != spent->sp_pwdp) {
-			strzero (spent->sp_pwdp);
-			free (spent->sp_pwdp);
-		}
+		if (NULL != spent->sp_pwdp)
+			free(strzero(spent->sp_pwdp));
+
 		free (spent);
 	}
 }
diff --git a/lib/shell.c b/lib/shell.c
index 25ef3e30..b4db966a 100644
--- a/lib/shell.c
+++ b/lib/shell.c
@@ -15,7 +15,7 @@
 #include <errno.h>
 #include "prototypes.h"
 #include "defines.h"
-#include "string/sprintf.h"
+#include "string/sprintf/snprintf.h"
 
 
 extern char **newenvp;
diff --git a/lib/sssd.c b/lib/sssd.c
index fadb378d..09f539f4 100644
--- a/lib/sssd.c
+++ b/lib/sssd.c
@@ -8,7 +8,7 @@
 #include <sys/wait.h>
 #include <sys/types.h>
 
-#include "alloc.h"
+#include "alloc/malloc.h"
 #include "exitcodes.h"
 #include "defines.h"
 #include "prototypes.h"
@@ -16,17 +16,20 @@
 
 #include "shadowlog_internal.h"
 
+
 #define MSG_SSSD_FLUSH_CACHE_FAILED "%s: Failed to flush the sssd cache."
 
-int sssd_flush_cache (int dbflags)
+
+int
+sssd_flush_cache(int dbflags)
 {
-	int status, code, rv;
-	const char *cmd = "/usr/sbin/sss_cache";
-	struct stat sb;
-	char *sss_cache_args = NULL;
-	const char *spawnedArgs[] = {"sss_cache", NULL, NULL};
-	const char *spawnedEnv[] = {NULL};
-	int i = 0;
+	int          status, code, rv;
+	char         *p;
+	char         *sss_cache_args = NULL;
+	const char   *cmd = "/usr/sbin/sss_cache";
+	const char   *spawnedArgs[] = {"sss_cache", NULL, NULL};
+	const char   *spawnedEnv[] = {NULL};
+	struct stat  sb;
 
 	rv = stat(cmd, &sb);
 	if (rv == -1 && errno == ENOENT)
@@ -37,15 +40,13 @@ int sssd_flush_cache (int dbflags)
 	    return -1;
 	}
 
-	sss_cache_args[i++] = '-';
-	if (dbflags & SSSD_DB_PASSWD) {
-		sss_cache_args[i++] = 'U';
-	}
-	if (dbflags & SSSD_DB_GROUP) {
-		sss_cache_args[i++] = 'G';
-	}
-	sss_cache_args[i++] = '\0';
-	if (i == 2) {
+	p = stpcpy(sss_cache_args, "-");
+	if (dbflags & SSSD_DB_PASSWD)
+		stpcpy(p, "U");
+	if (dbflags & SSSD_DB_GROUP)
+		stpcpy(p, "G");
+
+	if (*p == '\0') {
 		/* Neither passwd nor group, nothing to do */
 		free(sss_cache_args);
 		return 0;
diff --git a/lib/string/memset/memzero.c b/lib/string/memset/memzero.c
new file mode 100644
index 00000000..0725bd93
--- /dev/null
+++ b/lib/string/memset/memzero.c
@@ -0,0 +1,13 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include <stddef.h>
+
+#include "string/memset/memzero.h"
+
+
+extern inline void *memzero(void *ptr, size_t size);
+extern inline char *strzero(char *s);
diff --git a/lib/memzero.h b/lib/string/memset/memzero.h
similarity index 52%
rename from lib/memzero.h
rename to lib/string/memset/memzero.h
index 1137e830..d20967b1 100644
--- a/lib/memzero.h
+++ b/lib/string/memset/memzero.h
@@ -1,12 +1,10 @@
-/*
- * SPDX-FileCopyrightText: 2022-2023, Christian Göttsche <cgzones@googlemail.com>
- * SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
- * SPDX-License-Identifier: BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 2022-2023, Christian Göttsche <cgzones@googlemail.com>
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIBMISC_MEMZERO_H_
-#define SHADOW_INCLUDE_LIBMISC_MEMZERO_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_MEMSET_MEMZERO_H_
+#define SHADOW_INCLUDE_LIB_STRING_MEMSET_MEMZERO_H_
 
 
 #include <config.h>
@@ -21,11 +19,11 @@
 #define MEMZERO(arr)  memzero(arr, SIZEOF_ARRAY(arr))
 
 
-inline void memzero(void *ptr, size_t size);
-inline void strzero(char *s);
+inline void *memzero(void *ptr, size_t size);
+inline char *strzero(char *s);
 
 
-inline void
+inline void *
 memzero(void *ptr, size_t size)
 {
 #if defined(HAVE_MEMSET_EXPLICIT)
@@ -36,13 +34,14 @@ memzero(void *ptr, size_t size)
 	bzero(ptr, size);
 	__asm__ __volatile__ ("" : : "r"(ptr) : "memory");
 #endif
+	return ptr;
 }
 
 
-inline void
+inline char *
 strzero(char *s)
 {
-	memzero(s, strlen(s));
+	return memzero(s, strlen(s));
 }
 
 
diff --git a/lib/string/sprintf.c b/lib/string/sprintf.c
deleted file mode 100644
index cf3c210b..00000000
--- a/lib/string/sprintf.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include "string/sprintf.h"
-
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdio.h>
-
-
-extern inline int xasprintf(char **restrict s, const char *restrict fmt, ...);
-extern inline int xvasprintf(char **restrict s, const char *restrict fmt,
-    va_list ap);
-
-extern inline int snprintf_(char *restrict s, size_t size,
-    const char *restrict fmt, ...);
-extern inline int vsnprintf_(char *restrict s, size_t size,
-    const char *restrict fmt, va_list ap);
diff --git a/lib/string/sprintf/snprintf.c b/lib/string/sprintf/snprintf.c
new file mode 100644
index 00000000..3a71a697
--- /dev/null
+++ b/lib/string/sprintf/snprintf.c
@@ -0,0 +1,16 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/sprintf/snprintf.h"
+
+#include <stdarg.h>
+#include <stddef.h>
+
+
+extern inline int snprintf_(char *restrict s, size_t size,
+    const char *restrict fmt, ...);
+extern inline int vsnprintf_(char *restrict s, size_t size,
+    const char *restrict fmt, va_list ap);
diff --git a/lib/string/sprintf.h b/lib/string/sprintf/snprintf.h
similarity index 51%
rename from lib/string/sprintf.h
rename to lib/string/sprintf/snprintf.h
index 74853694..d181c661 100644
--- a/lib/string/sprintf.h
+++ b/lib/string/sprintf/snprintf.h
@@ -1,11 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
- * SPDX-License-Identifier: BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_SPRINTF_H_
-#define SHADOW_INCLUDE_LIB_SPRINTF_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_SPRINTF_SNPRINTF_H_
+#define SHADOW_INCLUDE_LIB_STRING_SPRINTF_SNPRINTF_H_
 
 
 #include <config.h>
@@ -15,19 +13,15 @@
 #include <stdio.h>
 
 #include "attr.h"
-#include "defines.h"
 #include "sizeof.h"
 
 
 #define SNPRINTF(s, fmt, ...)                                                 \
-	snprintf_(s, NITEMS(s), fmt __VA_OPT__(,) __VA_ARGS__)
+(                                                                             \
+	snprintf_(s, NITEMS(s), fmt __VA_OPT__(,) __VA_ARGS__)                \
+)
 
 
-format_attr(printf, 2, 3)
-inline int xasprintf(char **restrict s, const char *restrict fmt, ...);
-format_attr(printf, 2, 0)
-inline int xvasprintf(char **restrict s, const char *restrict fmt, va_list ap);
-
 format_attr(printf, 3, 4)
 inline int snprintf_(char *restrict s, size_t size, const char *restrict fmt,
     ...);
@@ -36,35 +30,6 @@ inline int vsnprintf_(char *restrict s, size_t size, const char *restrict fmt,
     va_list ap);
 
 
-inline int
-xasprintf(char **restrict s, const char *restrict fmt, ...)
-{
-	int      len;
-	va_list  ap;
-
-	va_start(ap, fmt);
-	len = xvasprintf(s, fmt, ap);
-	va_end(ap);
-
-	return len;
-}
-
-
-inline int
-xvasprintf(char **restrict s, const char *restrict fmt, va_list ap)
-{
-	int  len;
-
-	len = vasprintf(s, fmt, ap);
-	if (len == -1) {
-		perror("asprintf");
-		exit(EXIT_FAILURE);
-	}
-
-	return len;
-}
-
-
 inline int
 snprintf_(char *restrict s, size_t size, const char *restrict fmt, ...)
 {
diff --git a/lib/string/stpeprintf.c b/lib/string/sprintf/stpeprintf.c
similarity index 56%
rename from lib/string/stpeprintf.c
rename to lib/string/sprintf/stpeprintf.c
index cecd95d7..15148df5 100644
--- a/lib/string/stpeprintf.c
+++ b/lib/string/sprintf/stpeprintf.c
@@ -1,25 +1,17 @@
-/*
- * SPDX-FileCopyrightText:  2022 - 2023, Alejandro Colomar <alx@kernel.org>
- *
- * SPDX-License-Identifier:  BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
 
 
 #include <config.h>
 
-#if !defined(HAVE_STPEPRINTF)
-
-#ident "$Id$"
-
-#include "string/stpeprintf.h"
+#include "string/sprintf/stpeprintf.h"
 
 #include <stdarg.h>
 
 
+#if !defined(HAVE_STPEPRINTF)
 extern inline char *stpeprintf(char *dst, char *end, const char *restrict fmt,
     ...);
 extern inline char *vstpeprintf(char *dst, char *end, const char *restrict fmt,
     va_list ap);
-
-
-#endif  // !HAVE_STPEPRINTF
+#endif
diff --git a/lib/string/stpeprintf.h b/lib/string/sprintf/stpeprintf.h
similarity index 88%
rename from lib/string/stpeprintf.h
rename to lib/string/sprintf/stpeprintf.h
index 14ee7b6e..ccd844bc 100644
--- a/lib/string/stpeprintf.h
+++ b/lib/string/sprintf/stpeprintf.h
@@ -1,32 +1,27 @@
-/*
- * SPDX-FileCopyrightText:  2022 - 2023, Alejandro Colomar <alx@kernel.org>
- *
- * SPDX-License-Identifier:  BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_STPEPRINTF_H_
-#define SHADOW_INCLUDE_LIB_STPEPRINTF_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_SPRINTF_STPEPRINTF_H_
+#define SHADOW_INCLUDE_LIB_STRING_SPRINTF_STPEPRINTF_H_
 
 
 #include <config.h>
 
-#if !defined(HAVE_STPEPRINTF)
-
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
 
 #include "attr.h"
-#include "defines.h"
 
 
+#if !defined(HAVE_STPEPRINTF)
 format_attr(printf, 3, 4)
 inline char *stpeprintf(char *dst, char *end, const char *restrict fmt, ...);
-
 format_attr(printf, 3, 0)
 inline char *vstpeprintf(char *dst, char *end, const char *restrict fmt,
     va_list ap);
+#endif
 
 
 /*
@@ -79,6 +74,7 @@ inline char *vstpeprintf(char *dst, char *end, const char *restrict fmt,
  */
 
 
+#if !defined(HAVE_STPEPRINTF)
 inline char *
 stpeprintf(char *dst, char *end, const char *restrict fmt, ...)
 {
@@ -91,8 +87,10 @@ stpeprintf(char *dst, char *end, const char *restrict fmt, ...)
 
 	return p;
 }
+#endif
 
 
+#if !defined(HAVE_STPEPRINTF)
 inline char *
 vstpeprintf(char *dst, char *end, const char *restrict fmt, va_list ap)
 {
@@ -114,7 +112,7 @@ vstpeprintf(char *dst, char *end, const char *restrict fmt, va_list ap)
 
 	return dst + len;
 }
+#endif
 
 
-#endif  // !HAVE_STPEPRINTF
 #endif  // include guard
diff --git a/lib/string/sprintf/xasprintf.c b/lib/string/sprintf/xasprintf.c
new file mode 100644
index 00000000..2c740565
--- /dev/null
+++ b/lib/string/sprintf/xasprintf.c
@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/sprintf/xasprintf.h"
+
+#include <stdarg.h>
+
+
+extern inline int xasprintf(char **restrict s, const char *restrict fmt, ...);
+extern inline int xvasprintf(char **restrict s, const char *restrict fmt,
+    va_list ap);
diff --git a/lib/string/sprintf/xasprintf.h b/lib/string/sprintf/xasprintf.h
new file mode 100644
index 00000000..073cb903
--- /dev/null
+++ b/lib/string/sprintf/xasprintf.h
@@ -0,0 +1,54 @@
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_SPRINTF_XASPRINTF_H_
+#define SHADOW_INCLUDE_LIB_STRING_SPRINTF_XASPRINTF_H_
+
+
+#include <config.h>
+
+#include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "attr.h"
+
+
+format_attr(printf, 2, 3)
+inline int xasprintf(char **restrict s, const char *restrict fmt, ...);
+format_attr(printf, 2, 0)
+inline int xvasprintf(char **restrict s, const char *restrict fmt, va_list ap);
+
+
+inline int
+xasprintf(char **restrict s, const char *restrict fmt, ...)
+{
+	int      len;
+	va_list  ap;
+
+	va_start(ap, fmt);
+	len = xvasprintf(s, fmt, ap);
+	va_end(ap);
+
+	return len;
+}
+
+
+inline int
+xvasprintf(char **restrict s, const char *restrict fmt, va_list ap)
+{
+	int  len;
+
+	len = vasprintf(s, fmt, ap);
+	if (len == -1) {
+		perror("asprintf");
+		exit(EXIT_FAILURE);
+	}
+
+	return len;
+}
+
+
+#endif  // include guard
diff --git a/lib/string/stpecpy.c b/lib/string/stpecpy.c
deleted file mode 100644
index 97593884..00000000
--- a/lib/string/stpecpy.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * SPDX-FileCopyrightText:  2022 - 2023, Alejandro Colomar <alx@kernel.org>
- *
- * SPDX-License-Identifier:  BSD-3-Clause
- */
-
-
-#include <config.h>
-
-#if !defined(HAVE_STPECPY)
-
-#ident "$Id$"
-
-#include "string/stpecpy.h"
-
-
-extern inline char *stpecpy(char *dst, char *end, const char *restrict src);
-
-
-#endif  // !HAVE_STPECPY
diff --git a/lib/string/strchr/stpspn.c b/lib/string/strchr/stpspn.c
new file mode 100644
index 00000000..b94ffe15
--- /dev/null
+++ b/lib/string/strchr/stpspn.c
@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strchr/stpspn.h"
diff --git a/lib/string/strchr/stpspn.h b/lib/string/strchr/stpspn.h
new file mode 100644
index 00000000..97edfdf9
--- /dev/null
+++ b/lib/string/strchr/stpspn.h
@@ -0,0 +1,26 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRCHR_STPSPN_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRCHR_STPSPN_H_
+
+
+#include <config.h>
+
+#include <string.h>
+
+#include "attr.h"
+
+
+// Similar to strspn(3), but return a pointer instead of an offset.
+// Similar to strchrnul(3), but search for any bytes not in 'accept'.
+#define stpspn(s, accept)                                                     \
+({                                                                            \
+	__auto_type  s_ = s;                                                  \
+                                                                              \
+	s_ + strspn(s_, accept);                                              \
+})
+
+
+#endif  // include guard
diff --git a/lib/string/strchr/strchrcnt.c b/lib/string/strchr/strchrcnt.c
new file mode 100644
index 00000000..793b2add
--- /dev/null
+++ b/lib/string/strchr/strchrcnt.c
@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strchr/strchrcnt.h"
+
+#include <stddef.h>
+
+
+extern inline size_t strchrcnt(const char *s, char c);
diff --git a/lib/string/strchr/strchrcnt.h b/lib/string/strchr/strchrcnt.h
new file mode 100644
index 00000000..1a1923ea
--- /dev/null
+++ b/lib/string/strchr/strchrcnt.h
@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRCHR_STRCHRCNT_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRCHR_STRCHRCNT_H_
+
+
+#include <config.h>
+
+#include <stddef.h>
+
+#include "attr.h"
+#include "string/strcmp/streq.h"
+
+
+ATTR_STRING(1)
+inline size_t strchrcnt(const char *s, char c);
+
+
+inline size_t
+strchrcnt(const char *s, char c)
+{
+	size_t  n = 0;
+
+	for (; !streq(s, ""); s++) {
+		if (*s == c)
+			n++;
+	}
+
+	return n;
+}
+
+
+#endif  // include guard
diff --git a/lib/string/strchr/strnul.c b/lib/string/strchr/strnul.c
new file mode 100644
index 00000000..93b3ab7c
--- /dev/null
+++ b/lib/string/strchr/strnul.c
@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strchr/strnul.h"
diff --git a/lib/string/strchr/strnul.h b/lib/string/strchr/strnul.h
new file mode 100644
index 00000000..5754ad05
--- /dev/null
+++ b/lib/string/strchr/strnul.h
@@ -0,0 +1,25 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRCHR_STRNUL_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRCHR_STRNUL_H_
+
+
+#include <config.h>
+
+#include <string.h>
+
+#include "attr.h"
+
+
+// Similar to strlen(3), but return a pointer instead of an offset.
+#define strnul(s)                                                             \
+({                                                                            \
+	__auto_type  s_ = s;                                                  \
+                                                                              \
+	s_ + strlen(s_);                                                      \
+})
+
+
+#endif  // include guard
diff --git a/lib/string/strchr/strrspn.c b/lib/string/strchr/strrspn.c
new file mode 100644
index 00000000..7ba25479
--- /dev/null
+++ b/lib/string/strchr/strrspn.c
@@ -0,0 +1,10 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strchr/strrspn.h"
+
+
+extern inline char *strrspn(char *restrict s, const char *restrict accept);
diff --git a/lib/string/strchr/strrspn.h b/lib/string/strchr/strrspn.h
new file mode 100644
index 00000000..c05dc56d
--- /dev/null
+++ b/lib/string/strchr/strrspn.h
@@ -0,0 +1,38 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRCHR_STRRSPN_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRCHR_STRRSPN_H_
+
+
+#include <config.h>
+
+#include <string.h>
+
+#include "attr.h"
+#include "string/strchr/strnul.h"
+
+
+ATTR_STRING(2)
+inline char *strrspn(char *restrict s, const char *restrict accept);
+
+
+// Available in Oracle Solaris: strrspn(3GEN).
+// <https://docs.oracle.com/cd/E36784_01/html/E36877/strrspn-3gen.html>
+inline char *
+strrspn(char *restrict s, const char *restrict accept)
+{
+	char  *p;
+
+	p = strnul(s);
+	while (p > s) {
+		p--;
+		if (strchr(accept, *p) == NULL)
+			return p + 1;
+	}
+	return s;
+}
+
+
+#endif  // include guard
diff --git a/lib/string/strcmp/streq.c b/lib/string/strcmp/streq.c
new file mode 100644
index 00000000..52057ed8
--- /dev/null
+++ b/lib/string/strcmp/streq.c
@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include <stdbool.h>
+
+#include "string/strcmp/streq.h"
+
+
+extern inline bool streq(const char *s1, const char *s2);
diff --git a/lib/string/strcmp/streq.h b/lib/string/strcmp/streq.h
new file mode 100644
index 00000000..267045c5
--- /dev/null
+++ b/lib/string/strcmp/streq.h
@@ -0,0 +1,30 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRCMP_STREQ_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRCMP_STREQ_H_
+
+
+#include <config.h>
+
+#include <stdbool.h>
+#include <string.h>
+
+#include "attr.h"
+
+
+ATTR_STRING(1)
+ATTR_STRING(2)
+inline bool streq(const char *s1, const char *s2);
+
+
+/* Return true if s1 and s2 compare equal.  */
+inline bool
+streq(const char *s1, const char *s2)
+{
+	return strcmp(s1, s2) == 0;
+}
+
+
+#endif  // include guard
diff --git a/lib/string/strcpy/stpecpy.c b/lib/string/strcpy/stpecpy.c
new file mode 100644
index 00000000..3268663b
--- /dev/null
+++ b/lib/string/strcpy/stpecpy.c
@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strcpy/stpecpy.h"
+
+
+#if !defined(HAVE_STPECPY)
+extern inline char *stpecpy(char *dst, char *end, const char *restrict src);
+#endif
diff --git a/lib/string/stpecpy.h b/lib/string/strcpy/stpecpy.h
similarity index 87%
rename from lib/string/stpecpy.h
rename to lib/string/strcpy/stpecpy.h
index 2324baa5..e9debe4e 100644
--- a/lib/string/stpecpy.h
+++ b/lib/string/strcpy/stpecpy.h
@@ -1,18 +1,13 @@
-/*
- * SPDX-FileCopyrightText:  2022 - 2023, Alejandro Colomar <alx@kernel.org>
- *
- * SPDX-License-Identifier:  BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_STPECPY_H_
-#define SHADOW_INCLUDE_LIB_STPECPY_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRCPY_STPECPY_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRCPY_STPECPY_H_
 
 
 #include <config.h>
 
-#if !defined(HAVE_STPECPY)
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
@@ -20,8 +15,10 @@
 #include "attr.h"
 
 
+#if !defined(HAVE_STPECPY)
 ATTR_STRING(3)
 inline char *stpecpy(char *dst, char *end, const char *restrict src);
+#endif
 
 
 /*
@@ -66,6 +63,7 @@ inline char *stpecpy(char *dst, char *end, const char *restrict src);
  */
 
 
+#if !defined(HAVE_STPECPY)
 inline char *
 stpecpy(char *dst, char *end, const char *restrict src)
 {
@@ -84,7 +82,7 @@ stpecpy(char *dst, char *end, const char *restrict src)
 
 	return stpcpy(mempcpy(dst, src, dlen), "") + trunc;
 }
+#endif
 
 
-#endif  // !HAVE_STPECPY
 #endif  // include guard
diff --git a/lib/string/strcpy/strncat.c b/lib/string/strcpy/strncat.c
new file mode 100644
index 00000000..d55f1729
--- /dev/null
+++ b/lib/string/strcpy/strncat.c
@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strcpy/strncat.h"
diff --git a/lib/string/strcpy/strncat.h b/lib/string/strcpy/strncat.h
new file mode 100644
index 00000000..6bb9907b
--- /dev/null
+++ b/lib/string/strcpy/strncat.h
@@ -0,0 +1,19 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRCPY_STRNCAT_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRCPY_STRNCAT_H_
+
+
+#include <config.h>
+
+#include <string.h>
+
+#include "sizeof.h"
+
+
+#define STRNCAT(dst, src)  strncat(dst, src, NITEMS(src))
+
+
+#endif  // include guard
diff --git a/lib/string/strcpy/strncpy.c b/lib/string/strcpy/strncpy.c
new file mode 100644
index 00000000..5544feda
--- /dev/null
+++ b/lib/string/strcpy/strncpy.c
@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strcpy/strncpy.h"
diff --git a/lib/string/strcpy/strncpy.h b/lib/string/strcpy/strncpy.h
new file mode 100644
index 00000000..fcb8720e
--- /dev/null
+++ b/lib/string/strcpy/strncpy.h
@@ -0,0 +1,19 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRCPY_STRNCPY_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRCPY_STRNCPY_H_
+
+
+#include <config.h>
+
+#include <string.h>
+
+#include "sizeof.h"
+
+
+#define STRNCPY(dst, src)  strncpy(dst, src, NITEMS(dst))
+
+
+#endif  // include guard
diff --git a/lib/string/strtcpy.c b/lib/string/strcpy/strtcpy.c
similarity index 52%
rename from lib/string/strtcpy.c
rename to lib/string/strcpy/strtcpy.c
index 74de4fc4..28e3d056 100644
--- a/lib/string/strtcpy.c
+++ b/lib/string/strcpy/strtcpy.c
@@ -1,7 +1,5 @@
-/*
- * SPDX-FileCopyrightText: 2022-2023, Alejandro Colomar <alx@kernel.org>
- * SPDX-License-Identifier: BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
 
 
 #include <config.h>
@@ -9,9 +7,7 @@
 #include <stddef.h>
 #include <sys/types.h>
 
-#ident "$Id$"
-
-#include "string/strtcpy.h"
+#include "string/strcpy/strtcpy.h"
 
 
 extern inline ssize_t strtcpy(char *restrict dst, const char *restrict src,
diff --git a/lib/string/strtcpy.h b/lib/string/strcpy/strtcpy.h
similarity index 85%
rename from lib/string/strtcpy.h
rename to lib/string/strcpy/strtcpy.h
index 4ff6e111..4d35e1b8 100644
--- a/lib/string/strtcpy.h
+++ b/lib/string/strcpy/strtcpy.h
@@ -1,11 +1,9 @@
-/*
- * SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
- * SPDX-License-Identifier: BSD-3-Clause
- */
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
 
 
-#ifndef SHADOW_INCLUDE_LIB_STRTCPY_H_
-#define SHADOW_INCLUDE_LIB_STRTCPY_H_
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRCPY_STRTCPY_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRCPY_STRTCPY_H_
 
 
 #include <config.h>
@@ -16,7 +14,6 @@
 #include <sys/types.h>
 
 #include "attr.h"
-#include "defines.h"
 #include "sizeof.h"
 
 
diff --git a/lib/string/strdup/strndupa.c b/lib/string/strdup/strndupa.c
new file mode 100644
index 00000000..aa67fa27
--- /dev/null
+++ b/lib/string/strdup/strndupa.c
@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strdup/strndupa.h"
diff --git a/lib/string/strdup/strndupa.h b/lib/string/strdup/strndupa.h
new file mode 100644
index 00000000..cefc2982
--- /dev/null
+++ b/lib/string/strdup/strndupa.h
@@ -0,0 +1,25 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRDUP_STRNDUPA_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRDUP_STRNDUPA_H_
+
+
+#include <config.h>
+
+#include <alloca.h>
+#include <string.h>
+
+#include "sizeof.h"
+#include "string/strcpy/strncat.h"
+
+
+// Similar to strndupa(3), but ensure that 's' is an array.
+#define STRNDUPA(s)                                                           \
+(                                                                             \
+	STRNCAT(strcpy(alloca(strnlen(s, NITEMS(s)) + 1), ""), s)             \
+)
+
+
+#endif  // include guard
diff --git a/lib/string/strdup/xstrdup.c b/lib/string/strdup/xstrdup.c
new file mode 100644
index 00000000..00ec9db3
--- /dev/null
+++ b/lib/string/strdup/xstrdup.c
@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008     , Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strdup/xstrdup.h"
+
+
+extern inline char *xstrdup(const char *str);
diff --git a/lib/string/strdup/xstrdup.h b/lib/string/strdup/xstrdup.h
new file mode 100644
index 00000000..ba3e2556
--- /dev/null
+++ b/lib/string/strdup/xstrdup.h
@@ -0,0 +1,32 @@
+// SPDX-FileCopyrightText: 1990-1994, Julianne Frances Haugh
+// SPDX-FileCopyrightText: 1996-1998, Marek Michałkiewicz
+// SPDX-FileCopyrightText: 2003-2006, Tomasz Kłoczko
+// SPDX-FileCopyrightText: 2008     , Nicolas François
+// SPDX-FileCopyrightText: 2023-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRDUP_XSTRDUP_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRDUP_XSTRDUP_H_
+
+
+#include <config.h>
+
+#include <string.h>
+
+#include "alloc/x/xmalloc.h"
+#include "attr.h"
+
+
+ATTR_MALLOC(free)
+inline char *xstrdup(const char *str);
+
+
+inline char *
+xstrdup(const char *str)
+{
+	return strcpy(XMALLOC(strlen(str) + 1, char), str);
+}
+
+
+#endif  // include guard
diff --git a/lib/string/strdup/xstrndup.c b/lib/string/strdup/xstrndup.c
new file mode 100644
index 00000000..e659073f
--- /dev/null
+++ b/lib/string/strdup/xstrndup.c
@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strdup/xstrndup.h"
diff --git a/lib/string/strdup/xstrndup.h b/lib/string/strdup/xstrndup.h
new file mode 100644
index 00000000..88263c30
--- /dev/null
+++ b/lib/string/strdup/xstrndup.h
@@ -0,0 +1,25 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRDUP_XSTRNDUP_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRDUP_XSTRNDUP_H_
+
+
+#include <config.h>
+
+#include <string.h>
+
+#include "alloc/x/xmalloc.h"
+#include "sizeof.h"
+#include "string/strcpy/strncat.h"
+
+
+// Similar to strndup(3), but ensure that 's' is an array, and exit on ENOMEM.
+#define XSTRNDUP(s)                                                           \
+(                                                                             \
+	STRNCAT(strcpy(XMALLOC(strnlen(s, NITEMS(s)) + 1, char), ""), s)      \
+)
+
+
+#endif  // include guard
diff --git a/lib/string/strftime.h b/lib/string/strftime.h
index bebb31a4..578e5f67 100644
--- a/lib/string/strftime.h
+++ b/lib/string/strftime.h
@@ -13,7 +13,7 @@
 #include "sizeof.h"
 
 
-#define STRFTIME(dst, fmt, ...)  strftime(dst, NITEMS(dst), fmt, __VA_ARGS__)
+#define STRFTIME(dst, fmt, tm)  strftime(dst, NITEMS(dst), fmt, tm)
 
 
 #endif  // include guard
diff --git a/lib/string/strncpy.h b/lib/string/strncpy.h
deleted file mode 100644
index fc6fcc96..00000000
--- a/lib/string/strncpy.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-
-#ifndef SHADOW_INCLUDE_LIB_STRNCPY_H_
-#define SHADOW_INCLUDE_LIB_STRNCPY_H_
-
-
-#include <config.h>
-
-#include <string.h>
-
-#include "sizeof.h"
-
-
-#define STRNCPY(dst, src)  strncpy(dst, src, NITEMS(dst))
-
-
-#endif  // include guard
diff --git a/lib/string/strtok/stpsep.c b/lib/string/strtok/stpsep.c
new file mode 100644
index 00000000..d7813d1b
--- /dev/null
+++ b/lib/string/strtok/stpsep.c
@@ -0,0 +1,10 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strtok/stpsep.h"
+
+
+extern inline char *stpsep(char *s, const char *delim);
diff --git a/lib/string/strtok/stpsep.h b/lib/string/strtok/stpsep.h
new file mode 100644
index 00000000..f084bc46
--- /dev/null
+++ b/lib/string/strtok/stpsep.h
@@ -0,0 +1,33 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRTOK_STPSEP_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRTOK_STPSEP_H_
+
+
+#include <config.h>
+
+#include <string.h>
+
+#include "attr.h"
+
+
+ATTR_STRING(1) ATTR_STRING(2)
+inline char *stpsep(char *s, const char *delim);
+
+
+// Similar to strsep(3),
+// but return the next token, and don't update the input pointer.
+// Similar to strtok(3),
+// but don't store a state, and don't skip empty fields.
+inline char *
+stpsep(char *s, const char *delim)
+{
+	strsep(&s, delim);
+
+	return s;
+}
+
+
+#endif  // include guard
diff --git a/lib/string/zustr2stp.h b/lib/string/zustr2stp.h
deleted file mode 100644
index 152102b7..00000000
--- a/lib/string/zustr2stp.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#ifndef SHADOW_INCLUDE_LIB_STRING_ZUSTR2STP_H_
-#define SHADOW_INCLUDE_LIB_STRING_ZUSTR2STP_H_
-
-
-#include <config.h>
-
-#include <assert.h>
-#include <string.h>
-
-#include "must_be.h"
-#include "sizeof.h"
-
-
-/*
- * SYNOPSIS
- *	char *ZUSTR2STP(char *restrict dst, const char src[restrict]);
- *
- * ARGUMENTS
- *	dst	Destination buffer.
- *	src	Source null-padded character sequence.
- *
- * DESCRIPTION
- *	This macro copies at most NITEMS(src) non-null bytes from the
- *	array pointed to by src, followed by a null character, to the
- *	buffer pointed to by dst.
- *
- * RETURN VALUE
- *	dst + strlen(dst)
- *		This function returns a pointer to the terminating NUL
- *		byte.
- *
- * CAVEATS
- *	This function doesn't know the size of the destination buffer.
- *	It assumes it will always be large enough.  Since the size of
- *	the source buffer is known to the caller, it should make sure to
- *	allocate a destination buffer of at least `NITEMS(src) + 1`.
- *
- * EXAMPLES
- *	char  hostname[NITEMS(utmp->ut_host) + 1];
- *
- *	len = ZUSTR2STP(hostname, utmp->ut_host) - hostname;
- *	puts(hostname);
- */
-
-
-#define ZUSTR2STP(dst, src)                                                   \
-({                                                                            \
-	static_assert(!is_array(dst) || sizeof(dst) > SIZEOF_ARRAY(src), ""); \
-                                                                              \
-	stpcpy(mempcpy(dst, src, strnlen(src, NITEMS(src))), "");             \
-})
-
-
-#endif  // include guard
diff --git a/lib/strtoday.c b/lib/strtoday.c
index dabd5b52..db086609 100644
--- a/lib/strtoday.c
+++ b/lib/strtoday.c
@@ -13,9 +13,10 @@
 
 #ident "$Id$"
 
-#include "atoi/str2i.h"
-#include "prototypes.h"
+#include "atoi/str2i/str2s.h"
 #include "getdate.h"
+#include "prototypes.h"
+#include "string/strchr/stpspn.h"
 
 
 /*
@@ -53,9 +54,7 @@ long strtoday (const char *str)
 	if ('-' == *s) {
 		s++;
 	}
-	while (' ' == *s) {
-		s++;
-	}
+	s = stpspn(s, " ");
 	while (isnum && ('\0' != *s)) {
 		if (!isdigit (*s)) {
 			isnum = false;
diff --git a/lib/subordinateio.c b/lib/subordinateio.c
index 732d1a62..9329c455 100644
--- a/lib/subordinateio.c
+++ b/lib/subordinateio.c
@@ -18,9 +18,12 @@
 #include <fcntl.h>
 #include <string.h>
 
-#include "alloc.h"
-#include "atoi/str2i.h"
-#include "string/sprintf.h"
+#include "alloc/malloc.h"
+#include "alloc/realloc.h"
+#include "alloc/reallocf.h"
+#include "atoi/str2i/str2u.h"
+#include "string/sprintf/snprintf.h"
+#include "string/strcmp/streq.h"
 
 
 #define ID_SIZE 31
@@ -159,7 +162,7 @@ static bool range_exists(struct commonio_db *db, const char *owner)
 	const struct subordinate_range *range;
 	commonio_rewind(db);
 	while ((range = commonio_next(db)) != NULL) {
-		if (0 == strcmp(range->owner, owner))
+		if (streq(range->owner, owner))
 			return true;
 	}
 	return false;
@@ -194,7 +197,7 @@ static const struct subordinate_range *find_range(struct commonio_db *db,
 		unsigned long first = range->start;
 		unsigned long last = first + range->count - 1;
 
-		if (0 != strcmp(range->owner, owner))
+		if (!streq(range->owner, owner))
 			continue;
 
 		if ((val >= first) && (val <= last))
@@ -205,7 +208,7 @@ static const struct subordinate_range *find_range(struct commonio_db *db,
         /*
          * We only do special handling for these two files
          */
-        if ((0 != strcmp(db->filename, SUBUID_FILE)) && (0 != strcmp(db->filename, SUBGID_FILE)))
+        if (!streq(db->filename, SUBUID_FILE) && !streq(db->filename, SUBGID_FILE))
                 return NULL;
 
         /*
@@ -244,7 +247,7 @@ static const struct subordinate_range *find_range(struct commonio_db *db,
                  * Range matches. Check if range owner is specified
                  * as numeric UID and if it matches.
                  */
-                if (0 == strcmp(range->owner, owner_uid_string)) {
+                if (streq(range->owner, owner_uid_string)) {
                         return range;
                 }
 
@@ -274,40 +277,8 @@ static const struct subordinate_range *find_range(struct commonio_db *db,
 	return NULL;
 }
 
-/*
- * have_range: check whether @owner is authorized to use the range
- *             (@start .. @start+@count-1).
- * @db: database to check
- * @owner: owning uid being queried
- * @start: start of range
- * @count: number of uids in range
- *
- * Returns true if @owner is authorized to use the range, false otherwise.
- */
 static bool have_range(struct commonio_db *db,
-		       const char *owner, unsigned long start, unsigned long count)
-{
-	const struct subordinate_range *range;
-	unsigned long end;
-
-	if (count == 0)
-		return false;
-
-	end = start + count - 1;
-	range = find_range (db, owner, start);
-	while (range) {
-		unsigned long last;
-
-		last = range->start + range->count - 1;
-		if (last >= (start + count - 1))
-			return true;
-
-		count = end - last;
-		start = last + 1;
-		range = find_range(db, owner, start);
-	}
-	return false;
-}
+		       const char *owner, unsigned long start, unsigned long count);
 
 static bool append_range(struct subid_range **ranges, const struct subordinate_range *new, int n)
 {
@@ -494,7 +465,7 @@ static int remove_range (struct commonio_db *db,
 		last = first + range->count - 1;
 
 		/* Skip entries with a different owner */
-		if (0 != strcmp (range->owner, owner)) {
+		if (!streq(range->owner, owner)) {
 			continue;
 		}
 
@@ -574,6 +545,64 @@ static struct commonio_db subordinate_uid_db = {
 	false			/* setname */
 };
 
+/*
+ * have_range: check whether @owner is authorized to use the range
+ *             (@start .. @start+@count-1).
+ * @db: database to check
+ * @owner: owning uid being queried
+ * @start: start of range
+ * @count: number of uids in range
+ *
+ * Returns true if @owner is authorized to use the range, false otherwise.
+ */
+static bool have_range(struct commonio_db *db,
+		       const char *owner, unsigned long start, unsigned long count)
+{
+	const struct subordinate_range *range;
+	unsigned long end;
+	bool doclose = false;
+	bool ret = false;
+	int rc;
+
+	if (count == 0)
+		return false;
+
+	if (!db->isopen) {
+		doclose = true;
+		if (db == &subordinate_uid_db)
+			rc = sub_uid_open(O_RDONLY);
+		else
+			rc = sub_gid_open(O_RDONLY);
+		if (rc < 0)
+			return false;
+	}
+
+	end = start + count - 1;
+	range = find_range (db, owner, start);
+	while (range) {
+		unsigned long last;
+
+		last = range->start + range->count - 1;
+		if (last >= (start + count - 1)) {
+			ret = true;
+			break;
+		}
+
+		count = end - last;
+		start = last + 1;
+		range = find_range(db, owner, start);
+	}
+
+	if (doclose) {
+		if (db == &subordinate_uid_db)
+			sub_uid_close();
+		else
+			sub_gid_close();
+	}
+
+	return ret;
+}
+
 int sub_uid_setdbname (const char *filename)
 {
 	return commonio_setname (&subordinate_uid_db, filename);
@@ -861,7 +890,7 @@ int list_owner_ranges(const char *owner, enum subid_type id_type, struct subid_r
 
 	commonio_rewind(db);
 	while ((range = commonio_next(db)) != NULL) {
-		if (0 == strcmp(range->owner, owner)) {
+		if (streq(range->owner, owner)) {
 			if (!append_range(&ranges, range, count++)) {
 				free(ranges);
 				ranges = NULL;
@@ -871,7 +900,7 @@ int list_owner_ranges(const char *owner, enum subid_type id_type, struct subid_r
 		}
 
 		// Let's also compare with the ID
-		if (have_owner_id == true && 0 == strcmp(range->owner, id)) {
+		if (have_owner_id == true && streq(range->owner, id)) {
 			if (!append_range(&ranges, range, count++)) {
 				free(ranges);
 				ranges = NULL;
@@ -903,9 +932,8 @@ static bool all_digits(const char *str)
 
 static int append_uids(uid_t **uids, const char *owner, int n)
 {
-	uid_t owner_uid;
-	uid_t *ret;
-	int i;
+	int    i;
+	uid_t  owner_uid;
 
 	if (all_digits(owner)) {
 		i = sscanf(owner, "%d", &owner_uid);
@@ -931,13 +959,11 @@ static int append_uids(uid_t **uids, const char *owner, int n)
 			return n;
 	}
 
-	ret = REALLOC(*uids, n + 1, uid_t);
-	if (!ret) {
-		free(*uids);
+	*uids = REALLOCF(*uids, n + 1, uid_t);
+	if (!*uids)
 		return -1;
-	}
-	ret[n] = owner_uid;
-	*uids = ret;
+
+	(*uids)[n] = owner_uid;
 	return n+1;
 }
 
@@ -1036,7 +1062,7 @@ bool new_subid_range(struct subordinate_range *range, enum subid_type id_type, b
 	if (reuse) {
 		while ((r = commonio_next(db)) != NULL) {
 			// TODO account for username vs uid_t
-			if (0 != strcmp(r->owner, range->owner))
+			if (!streq(r->owner, range->owner))
 				continue;
 			if (r->count >= range->count) {
 				range->count = r->count;
diff --git a/lib/sulog.c b/lib/sulog.c
index 2ef22b2e..82f3ab77 100644
--- a/lib/sulog.c
+++ b/lib/sulog.c
@@ -68,7 +68,7 @@ void sulog (const char *tty, bool success, const char *oldname, const char *name
 		return;		/* can't open or create logfile */
 	}
 
-	(void) time (&now);
+	now = time(NULL);
 	tm = localtime (&now);
 
 	fprintf (fp, "SU %.02d/%.02d %.02d:%.02d %c %s %s-%s\n",
diff --git a/lib/tcbfuncs.c b/lib/tcbfuncs.c
index b5915fcd..6e48db4e 100644
--- a/lib/tcbfuncs.c
+++ b/lib/tcbfuncs.c
@@ -5,6 +5,8 @@
 
 #define _GNU_SOURCE
 
+#include <config.h>
+
 #include <errno.h>
 #include <fcntl.h>
 #include <grp.h>
@@ -15,15 +17,15 @@
 #include <tcb.h>
 #include <unistd.h>
 
-#include "config.h"
-
 #include "defines.h"
-#include "prototypes.h"
+#include "fs/readlink/readlinknul.h"
 #include "getdef.h"
-#include "shadowio.h"
+#include "prototypes.h"
 #include "tcbfuncs.h"
-
+#include "shadowio.h"
 #include "shadowlog_internal.h"
+#include "string/strcmp/streq.h"
+
 
 #define SHADOWTCB_HASH_BY 1000
 #define SHADOWTCB_LOCK_SUFFIX ".lock"
@@ -96,7 +98,6 @@ static /*@null@*/ char *shadowtcb_path_rel_existing (const char *name)
 	char *path, *rval;
 	struct stat st;
 	char link[8192];
-	ssize_t ret;
 
 	if (asprintf (&path, TCB_DIR "/%s", name) == -1) {
 		OUT_OF_MEMORY;
@@ -125,8 +126,7 @@ static /*@null@*/ char *shadowtcb_path_rel_existing (const char *name)
 		free (path);
 		return NULL;
 	}
-	ret = readlink (path, link, sizeof (link) - 1);
-	if (-1 == ret) {
+	if (READLINKNUL(path, link) == -1) {
 		fprintf (shadow_logfd,
 		         _("%s: Cannot read symbolic link %s: %s\n"),
 		         shadow_progname, path, strerror (errno));
@@ -134,14 +134,6 @@ static /*@null@*/ char *shadowtcb_path_rel_existing (const char *name)
 		return NULL;
 	}
 	free (path);
-	if ((size_t)ret >= sizeof(link) - 1) {
-		link[sizeof(link) - 1] = '\0';
-		fprintf (shadow_logfd,
-		         _("%s: Suspiciously long symlink: %s\n"),
-		         shadow_progname, link);
-		return NULL;
-	}
-	link[ret] = '\0';
 	rval = strdup (link);
 	if (NULL == rval) {
 		OUT_OF_MEMORY;
@@ -200,7 +192,7 @@ static shadowtcb_status mkdir_leading (const char *name, uid_t uid)
 		goto out_free_path;
 	}
 	while ((ind = strchr (ptr, '/'))) {
-		*ind = '\0';
+		stpcpy(ind, "");
 		if (asprintf (&dir, TCB_DIR "/%s", path) == -1) {
 			OUT_OF_MEMORY;
 			return SHADOWTCB_FAILURE;
@@ -266,7 +258,7 @@ static shadowtcb_status rmdir_leading (char *path)
 	char *ind, *dir;
 	shadowtcb_status ret = SHADOWTCB_SUCCESS;
 	while ((ind = strrchr (path, '/'))) {
-		*ind = '\0';
+		stpcpy(ind, "");
 		if (asprintf (&dir, TCB_DIR "/%s", path) == -1) {
 			OUT_OF_MEMORY;
 			return SHADOWTCB_FAILURE;
@@ -317,7 +309,7 @@ static shadowtcb_status move_dir (const char *user_newname, uid_t user_newid)
 	if (NULL == real_new_dir) {
 		goto out_free;
 	}
-	if (strcmp (real_old_dir, real_new_dir) == 0) {
+	if (streq(real_old_dir, real_new_dir)) {
 		ret = SHADOWTCB_SUCCESS;
 		goto out_free;
 	}
@@ -350,7 +342,7 @@ static shadowtcb_status move_dir (const char *user_newname, uid_t user_newid)
 	if (NULL == real_new_dir_rel) {
 		goto out_free;
 	}
-	if (   (strcmp (real_new_dir, newdir) != 0)
+	if (   !streq(real_new_dir, newdir)
 	    && (symlink (real_new_dir_rel, newdir) != 0)) {
 		fprintf (shadow_logfd,
 		         _("%s: Cannot create symbolic link %s: %s\n"),
diff --git a/lib/time/day_to_str.h b/lib/time/day_to_str.h
index 96cec6e1..b70e9897 100644
--- a/lib/time/day_to_str.h
+++ b/lib/time/day_to_str.h
@@ -13,7 +13,7 @@
 
 #include "defines.h"
 #include "sizeof.h"
-#include "string/strtcpy.h"
+#include "string/strcpy/strtcpy.h"
 
 
 #define DAY_TO_STR(str, day)   day_to_str(NITEMS(str), str, day)
@@ -38,12 +38,12 @@ day_to_str(size_t size, char buf[size], long day)
 		return;
 	}
 
-	if (gmtime_r(&date, &tm) == NULL) {
+	if (localtime_r(&date, &tm) == NULL) {
 		strtcpy(buf, "future", size);
 		return;
 	}
 
-	if (strftime(buf, size, "%Y-%m-%d", &tm) == 0)
+	if (strftime(buf, size, "%F", &tm) == 0)
 		strtcpy(buf, "future", size);
 }
 
diff --git a/lib/ttytype.c b/lib/ttytype.c
index a9fb0e86..fbe71ee0 100644
--- a/lib/ttytype.c
+++ b/lib/ttytype.c
@@ -12,9 +12,15 @@
 #ident "$Id$"
 
 #include <stdio.h>
-#include "prototypes.h"
+#include <string.h>
+
 #include "defines.h"
 #include "getdef.h"
+#include "prototypes.h"
+#include "string/strcmp/streq.h"
+#include "string/strtok/stpsep.h"
+
+
 /*
  * ttytype - set ttytype from port to terminal type mapping database
  */
@@ -23,7 +29,6 @@ void ttytype (const char *line)
 	FILE *fp;
 	char buf[BUFSIZ];
 	const char *typefile;
-	char *cp;
 	char type[1024] = "";
 	char port[1024];
 
@@ -46,13 +51,10 @@ void ttytype (const char *line)
 			continue;
 		}
 
-		cp = strchr (buf, '\n');
-		if (NULL != cp) {
-			*cp = '\0';
-		}
+		stpsep(buf, "\n");
 
 		if (   (sscanf (buf, "%1023s %1023s", type, port) == 2)
-		    && (strcmp (line, port) == 0)) {
+		    && streq(line, port)) {
 			break;
 		}
 	}
diff --git a/lib/typetraits.h b/lib/typetraits.h
new file mode 100644
index 00000000..47bd30d9
--- /dev/null
+++ b/lib/typetraits.h
@@ -0,0 +1,46 @@
+// SPDX-FileCopyrightText: 2022-2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_TYPETRAITS_H_
+#define SHADOW_INCLUDE_LIB_TYPETRAITS_H_
+
+
+#include <config.h>
+
+#include "sizeof.h"
+
+
+#define is_unsigned(x)                                                        \
+(                                                                             \
+	(typeof(x)) -1 > 1                                                    \
+)
+
+#define is_signed(x)                                                          \
+(                                                                             \
+	(typeof(x)) -1 < 1                                                    \
+)
+
+
+#define stype_max(T)                                                          \
+(                                                                             \
+	(T) (((((T) 1 << (WIDTHOF(T) - 2)) - 1) << 1) + 1)                    \
+)
+
+#define utype_max(T)                                                          \
+(                                                                             \
+	(T) -1                                                                \
+)
+
+#define type_max(T)                                                           \
+(                                                                             \
+	(T) (is_signed(T) ? stype_max(T) : utype_max(T))                      \
+)
+
+#define type_min(T)                                                           \
+(                                                                             \
+	(T) ~type_max(T)                                                      \
+)
+
+
+#endif  // include guard
diff --git a/lib/tz.c b/lib/tz.c
index 83b295c7..b854a593 100644
--- a/lib/tz.c
+++ b/lib/tz.c
@@ -16,9 +16,12 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include "defines.h"
-#include "prototypes.h"
 #include "getdef.h"
+#include "prototypes.h"
+#include "string/strtok/stpsep.h"
+
 
 /*
  * tz - return local timezone name
@@ -29,28 +32,23 @@
 /*@observer@*/const char *tz (const char *fname)
 {
 	FILE *fp = NULL;
+	const char *result;
 	static char tzbuf[BUFSIZ];
-	const char *def_tz = "TZ=CST6CDT";
 
 	fp = fopen (fname, "r");
 	if (   (NULL == fp)
 	    || (fgets (tzbuf, sizeof (tzbuf), fp) == NULL)) {
-		def_tz = getdef_str ("ENV_TZ");
-		if ((NULL == def_tz) || ('/' == def_tz[0])) {
-			def_tz = "TZ=CST6CDT";
-		}
-
-		strcpy (tzbuf, def_tz);
+		result = "TZ=CST6CDT";
 	} else {
-		/* Remove optional trailing '\n'. */
-		tzbuf[strcspn (tzbuf, "\n")] = '\0';
+		stpsep(tzbuf, "\n");
+		result = tzbuf;
 	}
 
 	if (NULL != fp) {
 		(void) fclose (fp);
 	}
 
-	return tzbuf;
+	return result;
 }
 #else				/* !USE_PAM */
 extern int ISO_C_forbids_an_empty_translation_unit;
diff --git a/lib/user_busy.c b/lib/user_busy.c
index a622376a..73c380bc 100644
--- a/lib/user_busy.c
+++ b/lib/user_busy.c
@@ -17,13 +17,18 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <utmpx.h>
+
+#include "atoi/getnum.h"
 #include "defines.h"
+#include "fs/readlink/readlinknul.h"
 #include "prototypes.h"
 #ifdef ENABLE_SUBIDS
 #include "subordinateio.h"
 #endif				/* ENABLE_SUBIDS */
 #include "shadowlog.h"
-#include "string/sprintf.h"
+#include "string/sprintf/snprintf.h"
+#include "string/strcmp/streq.h"
 
 
 #ifdef __linux__
@@ -90,17 +95,16 @@ static int different_namespace (const char *sname)
 	/* 41: /proc/xxxxxxxxxx/task/xxxxxxxxxx/ns/user + \0 */
 	char     path[41];
 	char     buf[512], buf2[512];
-	ssize_t  llen1, llen2;
 
 	SNPRINTF(path, "/proc/%s/ns/user", sname);
 
-	if ((llen1 = readlink (path, buf, sizeof(buf))) == -1)
+	if (READLINKNUL(path, buf) == -1)
 		return 0;
 
-	if ((llen2 = readlink ("/proc/self/ns/user", buf2, sizeof(buf2))) == -1)
+	if (READLINKNUL("/proc/self/ns/user", buf2) == -1)
 		return 0;
 
-	if (llen1 == llen2 && memcmp (buf, buf2, llen1) == 0)
+	if (streq(buf, buf2))
 		return 0; /* same namespace */
 
 	return 1;
@@ -196,8 +200,8 @@ static int user_busy_processes (const char *name, uid_t uid)
 		 * This patch is applied by default in some RedHat
 		 * kernels.
 		 */
-		if (   (strcmp (tmp_d_name, ".") == 0)
-		    || (strcmp (tmp_d_name, "..") == 0)) {
+		if (   streq(tmp_d_name, ".")
+		    || streq(tmp_d_name, "..")) {
 			continue;
 		}
 		if (*tmp_d_name == '.') {
diff --git a/lib/utmp.c b/lib/utmp.c
index 08e9b625..37a1bbda 100644
--- a/lib/utmp.c
+++ b/lib/utmp.c
@@ -20,13 +20,17 @@
 #include <sys/socket.h>
 #include <netdb.h>
 #include <stdio.h>
+#include <string.h>
 #include <fcntl.h>
 
-#include "alloc.h"
+#include "alloc/x/xcalloc.h"
+#include "alloc/x/xmalloc.h"
 #include "sizeof.h"
-#include "string/strncpy.h"
-#include "string/strtcpy.h"
-#include "string/zustr2stp.h"
+#include "string/strcmp/streq.h"
+#include "string/strcpy/strncpy.h"
+#include "string/strcpy/strtcpy.h"
+#include "string/strdup/xstrdup.h"
+#include "string/strdup/xstrndup.h"
 
 #ident "$Id$"
 
@@ -44,7 +48,7 @@ is_my_tty(const char tty[UTX_LINESIZE])
 	/* tmptty shall be bigger than full_tty */
 	static char  tmptty[sizeof(full_tty) + 1];
 
-	full_tty[0] = '\0';
+	stpcpy(full_tty, "");
 	if (tty[0] != '/')
 		strcpy (full_tty, "/dev/");
 	strncat(full_tty, tty, UTX_LINESIZE);
@@ -60,7 +64,7 @@ is_my_tty(const char tty[UTX_LINESIZE])
 		exit (EXIT_FAILURE);
 	}
 
-	return strcmp (full_tty, tmptty) == 0;
+	return streq(full_tty, tmptty);
 }
 
 
@@ -185,11 +189,7 @@ get_session_host(char **out)
 
 #if defined(HAVE_STRUCT_UTMPX_UT_HOST)
 	if ((ut != NULL) && (ut->ut_host[0] != '\0')) {
-		char  *hostname;
-
-		hostname = XMALLOC(sizeof(ut->ut_host) + 1, char);
-		ZUSTR2STP(hostname, ut->ut_host);
-		*out = hostname;
+		*out = XSTRNDUP(ut->ut_host);
 		free (ut);
 	} else {
 		*out = NULL;
@@ -254,17 +254,12 @@ prepare_utmp(const char *name, const char *line, const char *host,
 
 
 
-	if (   (NULL != host)
-	    && ('\0' != host[0])) {
-		hostname = XMALLOC(strlen(host) + 1, char);
-		strcpy (hostname, host);
+	if (NULL != host && '\0' != host[0])
+		hostname = xstrdup(host);
 #if defined(HAVE_STRUCT_UTMPX_UT_HOST)
-	} else if (   (NULL != ut)
-	           && ('\0' != ut->ut_host[0])) {
-		hostname = XMALLOC(NITEMS(ut->ut_host) + 1, char);
-		ZUSTR2STP(hostname, ut->ut_host);
+	else if (NULL != ut && '\0' != ut->ut_host[0])
+		hostname = XSTRNDUP(ut->ut_host);
 #endif
-	}
 
 	if (strncmp(line, "/dev/", 5) == 0) {
 		line += 5;
diff --git a/lib/valid.c b/lib/valid.c
index 326635ff..d21afc5f 100644
--- a/lib/valid.c
+++ b/lib/valid.c
@@ -11,11 +11,15 @@
 
 #ident "$Id$"
 
-#include <sys/types.h>
-#include <stdio.h>
-#include "prototypes.h"
-#include "defines.h"
 #include <pwd.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+#include "defines.h"
+#include "prototypes.h"
+#include "string/strcmp/streq.h"
+
+
 /*
  * valid - compare encrypted passwords
  *
@@ -73,7 +77,7 @@ bool valid (const char *password, const struct passwd *ent)
 
 	if (   (NULL != ent->pw_name)
 	    && (NULL != encrypted)
-	    && (strcmp (encrypted, ent->pw_passwd) == 0)) {
+	    && streq(encrypted, ent->pw_passwd)) {
 		return true;
 	} else {
 		return false;
diff --git a/lib/xgetXXbyYY.c b/lib/xgetXXbyYY.c
index 7d5e914e..01976fe7 100644
--- a/lib/xgetXXbyYY.c
+++ b/lib/xgetXXbyYY.c
@@ -31,7 +31,8 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include "alloc.h"
+#include "alloc/malloc.h"
+#include "alloc/x/xrealloc.h"
 #include "prototypes.h"
 #include "shadowlog.h"
 
diff --git a/libsubid/api.c b/libsubid/api.c
index 76a9eec4..feed2f7c 100644
--- a/libsubid/api.c
+++ b/libsubid/api.c
@@ -12,11 +12,13 @@
 #include <string.h>
 #include <pwd.h>
 #include <stdbool.h>
+
 #include "subordinateio.h"
 #include "idmapping.h"
 #include "subid.h"
 #include "shadowlog.h"
 
+
 bool subid_init(const char *progname, FILE * logfd)
 {
 	FILE *shadow_logfd;
diff --git a/man/Makefile.am b/man/Makefile.am
index 83b1d688..14055097 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -21,7 +21,6 @@ man_MANS = \
 	man8/groupdel.8 \
 	man8/groupmems.8 \
 	man8/groupmod.8 \
-	man1/groups.1 \
 	man8/grpck.8 \
 	man8/grpconv.8 \
 	man8/grpunconv.8 \
@@ -90,7 +89,6 @@ man_XMANS = \
 	groupdel.8.xml \
 	groupmems.8.xml \
 	groupmod.8.xml \
-	groups.1.xml \
 	grpck.8.xml \
 	gshadow.5.xml \
 	limits.5.xml \
@@ -200,8 +198,6 @@ EXTRA_DIST = \
 	$(man_XMANS) \
 	config.xml \
 	$(addprefix login.defs.d/,$(login_defs_v)) \
-	man1/id.1 \
-	id.1.xml \
 	man8/sulogin.8 \
 	sulogin.8.xml \
 	generate_mans.mak \
@@ -227,7 +223,7 @@ if ENABLE_REGENERATE_MAN
 
 include generate_mans.mak
 
-CLEANFILES = $(man_MANS) man1/id.1 man8/sulogin.8
+CLEANFILES = $(man_MANS) man8/sulogin.8
 
 else
 $(man_MANS):
diff --git a/man/Makefile.in b/man/Makefile.in
index 41773ad7..26d7767f 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -413,14 +413,14 @@ top_srcdir = @top_srcdir@
 man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
 	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
-	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
-	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man1/login.1 \
-	man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 man8/newusers.8 \
-	man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
-	man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man3/shadow.3 \
-	man5/shadow.5 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
-	man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1) \
-	$(am__append_2) $(am__append_3) $(am__append_4)
+	man8/groupmems.8 man8/groupmod.8 man8/grpck.8 man8/grpconv.8 \
+	man8/grpunconv.8 man5/gshadow.5 man1/login.1 man5/login.defs.5 \
+	man8/logoutd.8 man1/newgrp.1 man8/newusers.8 man8/nologin.8 \
+	man1/passwd.1 man5/passwd.5 man8/pwck.8 man8/pwconv.8 \
+	man8/pwunconv.8 man1/sg.1 man3/shadow.3 man5/shadow.5 \
+	man5/suauth.5 man8/useradd.8 man8/userdel.8 man8/usermod.8 \
+	man8/vigr.8 man8/vipw.8 $(am__append_1) $(am__append_2) \
+	$(am__append_3) $(am__append_4)
 man_nopam = \
 	man5/limits.5 \
 	man5/login.access.5 \
@@ -436,14 +436,14 @@ man_subids = \
 man_XMANS = chage.1.xml chfn.1.xml chgpasswd.8.xml chpasswd.8.xml \
 	chsh.1.xml expiry.1.xml faillog.5.xml faillog.8.xml \
 	getsubids.1.xml gpasswd.1.xml groupadd.8.xml groupdel.8.xml \
-	groupmems.8.xml groupmod.8.xml groups.1.xml grpck.8.xml \
-	gshadow.5.xml limits.5.xml login.1.xml login.access.5.xml \
-	login.defs.5.xml logoutd.8.xml newgidmap.1.xml newgrp.1.xml \
-	newuidmap.1.xml newusers.8.xml nologin.8.xml passwd.1.xml \
-	passwd.5.xml porttime.5.xml pwck.8.xml pwconv.8.xml \
-	shadow.3.xml shadow.5.xml sg.1.xml su.1.xml suauth.5.xml \
-	subgid.5.xml subuid.5.xml useradd.8.xml userdel.8.xml \
-	usermod.8.xml vipw.8.xml $(am__append_5)
+	groupmems.8.xml groupmod.8.xml grpck.8.xml gshadow.5.xml \
+	limits.5.xml login.1.xml login.access.5.xml login.defs.5.xml \
+	logoutd.8.xml newgidmap.1.xml newgrp.1.xml newuidmap.1.xml \
+	newusers.8.xml nologin.8.xml passwd.1.xml passwd.5.xml \
+	porttime.5.xml pwck.8.xml pwconv.8.xml shadow.3.xml \
+	shadow.5.xml sg.1.xml su.1.xml suauth.5.xml subgid.5.xml \
+	subuid.5.xml useradd.8.xml userdel.8.xml usermod.8.xml \
+	vipw.8.xml $(am__append_5)
 login_defs_v = \
 	BCRYPT_MIN_ROUNDS.xml \
 	CHFN_AUTH.xml \
@@ -516,10 +516,9 @@ login_defs_v = \
 	YESCRYPT_COST_FACTOR.xml
 
 EXTRA_DIST = $(man_MANS) $(man_XMANS) config.xml $(addprefix \
-	login.defs.d/,$(login_defs_v)) man1/id.1 id.1.xml \
-	man8/sulogin.8 sulogin.8.xml generate_mans.mak \
-	generate_translations.mak its.rules shadow-man.xsl \
-	$(am__append_6) $(am__append_7)
+	login.defs.d/,$(login_defs_v)) man8/sulogin.8 sulogin.8.xml \
+	generate_mans.mak generate_translations.mak its.rules \
+	shadow-man.xsl $(am__append_6) $(am__append_7)
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_FALSE@VENDORDIR_COND = without_vendordir
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_TRUE@VENDORDIR_COND = with_vendordir
 @ENABLE_REGENERATE_MAN_TRUE@@USE_PAM_FALSE@PAM_COND = no_pam
@@ -539,7 +538,7 @@ EXTRA_DIST = $(man_MANS) $(man_XMANS) config.xml $(addprefix \
 @ENABLE_LASTLOG_FALSE@@ENABLE_REGENERATE_MAN_TRUE@LASTLOG_COND = no_lastlog
 @ENABLE_LASTLOG_TRUE@@ENABLE_REGENERATE_MAN_TRUE@@USE_PAM_FALSE@LASTLOG_COND = lastlog
 @ENABLE_LASTLOG_TRUE@@ENABLE_REGENERATE_MAN_TRUE@@USE_PAM_TRUE@LASTLOG_COND = no_lastlog
-@ENABLE_REGENERATE_MAN_TRUE@CLEANFILES = $(man_MANS) man1/id.1 man8/sulogin.8
+@ENABLE_REGENERATE_MAN_TRUE@CLEANFILES = $(man_MANS) man8/sulogin.8
 all: all-recursive
 
 .SUFFIXES:
diff --git a/man/config.xml b/man/config.xml
index 1a42af34..8dc5a104 100644
--- a/man/config.xml
+++ b/man/config.xml
@@ -1,2 +1,2 @@
 <!ENTITY GROUP_NAME_MAX_LENGTH '32'>
-<!ENTITY SHADOW_UTILS_VERSION '4.16.0'>
+<!ENTITY SHADOW_UTILS_VERSION '4.17.0-rc1'>
diff --git a/man/cs/Makefile.am b/man/cs/Makefile.am
index 84407d71..45aec38f 100644
--- a/man/cs/Makefile.am
+++ b/man/cs/Makefile.am
@@ -9,7 +9,6 @@ man_MANS = \
 	man8/groupadd.8 \
 	man8/groupdel.8 \
 	man8/groupmod.8 \
-	man1/groups.1 \
 	man8/grpck.8 \
 	man5/gshadow.5 \
 	man8/nologin.8 \
@@ -23,7 +22,6 @@ man_MANS += man8/lastlog.8
 endif
 
 EXTRA_DIST = $(man_MANS) \
-	man1/id.1 \
 	man8/groupmems.8 \
 	man8/logoutd.8
 
diff --git a/man/cs/Makefile.in b/man/cs/Makefile.in
index a4a88c88..b853329e 100644
--- a/man/cs/Makefile.in
+++ b/man/cs/Makefile.in
@@ -340,11 +340,10 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 man_MANS = man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \
-	man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/groups.1 \
-	man8/grpck.8 man5/gshadow.5 man8/nologin.8 man5/passwd.5 \
-	man5/shadow.5 man1/su.1 man8/vipw.8 $(am__append_1)
+	man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man8/grpck.8 \
+	man5/gshadow.5 man8/nologin.8 man5/passwd.5 man5/shadow.5 \
+	man1/su.1 man8/vipw.8 $(am__append_1)
 EXTRA_DIST = $(man_MANS) \
-	man1/id.1 \
 	man8/groupmems.8 \
 	man8/logoutd.8
 
diff --git a/man/cs/man1/groups.1 b/man/cs/man1/groups.1
deleted file mode 100644
index 6deab53f..00000000
--- a/man/cs/man1/groups.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH GROUPS 1 "GNU Shell Utilities" "FSF" \" \-*\- nroff \-*\-
-.do hla cs
-.do hpf hyphen.cs
-.SH JMÉNO
-groups \- vypíše skupiny, jichž je uživatel členem
-.SH POUŽITÍ
-\fBgroups\fR [\fIuživatel...\fR]
-.SH POPIS
-Tato dokumentace není dále udržována a může být nepřesná nebo neúplná.
-Autoritativním zdrojem je Texinfo dokumentace.
-.PP
-Tato manuálová stránka popisuje GNU verzi příkazu
-.BR groups .
-Příkaz
-.B groups
-vypíše jména všech skupin, v nichž je zadaný \fIuživatel\fR nebo aktuální proces,
-pokud uživatel není zadán, členem. Pokud jsou zadána jména uživatelů, potom bude
-jméno každého z uživatelů vypsáno před seznam skupin, jichž je členem.
-.PP
-Seznam skupin je ekvivalentní s výstupem příkazu `id \-Gn'.
-.SH VOLBY
-Když je GNU příkaz \fBgroups\fR vyvolán právě s jedním parametrem,
-jsou rozpoznávány následující volby:
-.TP
-.I "\-\-help"
-Vypíše návod k použití na standardní výstup a bezchybně skončí.
-.TP
-.I "\-\-version"
-Vypíše číslo verze na standardní výstup a bezchybně skončí.
diff --git a/man/cs/man1/id.1 b/man/cs/man1/id.1
deleted file mode 100644
index 9eafaf1f..00000000
--- a/man/cs/man1/id.1
+++ /dev/null
@@ -1,62 +0,0 @@
-.TH ID 1 "GNU Shell Utilities" "FSF" \" \-*\- nroff \-*\-
-.do hla cs
-.do hpf hyphen.cs
-.SH JMÉNO
-id \- vypíše reálný a efektivní UID a GID
-.SH POUŽITÍ
-.B id
-[\-gnruG] [\-\-group] [\-\-name] [\-\-real] [\-\-user] [\-\-groups]
-[\-\-help] [\-\-version] [uživatel]
-.SH POPIS
-Tato dokumentace není dále udržována a může být nepřesná nebo neúplná.
-Autoritativním zdrojem je Texinfo dokumentace.
-.PP
-Tato manuálová stránka popisuje GNU verzi příkazu
-.BR id .
-Příkaz
-.B id
-vypíše informace o zadaném uživateli nebo (pokud není jméno uživatele
-zadáno) o uživateli, který program
-.B id
-spustil. Implicitně vypisuje reálné user ID, reálné group ID,
-efektivní user ID, pokud se liší od reálného user ID, efektivní
-group ID, pokud se liší od reálného group ID, a group ID skupin,
-v nichž je uživatel členem. Před každou z hodnot je vypsán řetězec
-určující o jakou hodnotu se jedná a za každou jsou odpovídající
-jména skupin a uživatelů v závorkách.
-.PP
-Volby způsobí, že program
-.B id
-vypisuje pouze některé z těchto informací.
-.SS VOLBY
-.TP
-.I "\-g, \-\-group"
-Vypíše pouze group ID.
-.TP
-.I "\-G, \-\-groups"
-Vypíše pouze skupiny, v nichž je uživatel členem.
-.TP
-.I "\-\-help"
-Vypíše návod k použití na standardní výstup a bezchybně skončí.
-.TP
-.I "\-n, \-\-name"
-Vypíše jméno uživatele nebo skupiny místo čísla ID.
-Vyžaduje
-.IR \-u ,
-.IR \-g ,
-nebo
-.IR \-G .
-.TP
-.I "\-r, \-\-real"
-Vypíše reálné místo efektivních user a group ID.
-Vyžaduje
-.IR \-u ,
-.IR \-g ,
-nebo
-.IR \-G .
-.TP
-.I "\-u, \-\-user"
-Vypíše pouze user ID.
-.TP
-.I "\-\-version"
-Vypíše číslo verze na standardní výstup a bezchybně skončí.
diff --git a/man/da/Makefile.am b/man/da/Makefile.am
index a3b09224..c61b787d 100644
--- a/man/da/Makefile.am
+++ b/man/da/Makefile.am
@@ -5,7 +5,6 @@ mandir = @mandir@/da
 man_MANS = \
 	man1/chfn.1 \
 	man8/groupdel.8 \
-	man1/groups.1 \
 	man5/gshadow.5 \
 	man8/logoutd.8 \
 	man1/newgrp.1 \
@@ -21,8 +20,7 @@ man_MANS += $(man_nopam)
 endif
 
 EXTRA_DIST = \
-	$(man_MANS) \
-	man1/id.1
+	$(man_MANS)
 
 if USE_PAM
 EXTRA_DIST += $(man_nopam)
diff --git a/man/da/Makefile.in b/man/da/Makefile.in
index e042b371..8863d620 100644
--- a/man/da/Makefile.in
+++ b/man/da/Makefile.in
@@ -343,11 +343,11 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
 # 2012.01.28 - activate manpages with more than 50% translated messages
-man_MANS = man1/chfn.1 man8/groupdel.8 man1/groups.1 man5/gshadow.5 \
-	man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \
-	man8/vigr.8 man8/vipw.8 $(am__append_1)
+man_MANS = man1/chfn.1 man8/groupdel.8 man5/gshadow.5 man8/logoutd.8 \
+	man1/newgrp.1 man8/nologin.8 man1/sg.1 man8/vigr.8 man8/vipw.8 \
+	$(am__append_1)
 man_nopam = 
-EXTRA_DIST = $(man_MANS) man1/id.1 $(am__append_2)
+EXTRA_DIST = $(man_MANS) $(am__append_2)
 LANG = $(notdir $(CURDIR))
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_FALSE@VENDORDIR_COND = without_vendordir
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_TRUE@VENDORDIR_COND = with_vendordir
diff --git a/man/da/man1/chfn.1 b/man/da/man1/chfn.1
index ec8ba653..e9447b20 100644
--- a/man/da/man1/chfn.1
+++ b/man/da/man1/chfn.1
@@ -2,12 +2,12 @@
 .\"     Title: chfn
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Danish
 .\"
-.TH "CHFN" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHFN" "1" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/da/man1/groups.1 b/man/da/man1/groups.1
deleted file mode 100644
index f2ad0788..00000000
--- a/man/da/man1/groups.1
+++ /dev/null
@@ -1,65 +0,0 @@
-'\" t
-.\"     Title: groups
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: Danish
-.\"
-.TH "GROUPS" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAVN"
-groups \- vis aktuelle gruppenavne
-.SH "SYNOPSIS"
-.HP \w'\fBgroups\fR\ 'u
-\fBgroups\fR [\fIuser\fR]
-.SH "BESKRIVELSE"
-.PP
-The
-\fBgroups\fR
-command displays the current group names or ID values\&. If the value does not have a corresponding entry in
-/etc/group, the value will be displayed as the numerical group value\&. The optional
-\fIuser\fR
-parameter will display the groups for the named user\&.
-.SH "NOTE"
-.PP
-Systems which do not support supplementary groups (see
-\fBinitgroups\fR(3)) will have the information from
-/etc/group
-reported\&. The user must use
-\fBnewgrp\fR
-or
-\fBsg\fR
-to change his current real and effective group ID\&.
-.SH "FILER"
-.PP
-/etc/group
-.RS 4
-Information om gruppekonto\&.
-.RE
-.SH "SE OGS\(oA"
-.PP
-\fBnewgrp\fR(1),
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)\&.
diff --git a/man/da/man1/id.1 b/man/da/man1/id.1
deleted file mode 100644
index d860ed0f..00000000
--- a/man/da/man1/id.1
+++ /dev/null
@@ -1,62 +0,0 @@
-'\" t
-.\"     Title: id
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: Danish
-.\"
-.TH "ID" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAVN"
-id \- display current user and group ID names
-.SH "SYNOPSIS"
-.HP \w'\fBid\fR\ 'u
-\fBid\fR [\-a]
-.SH "BESKRIVELSE"
-.PP
-The
-\fBid\fR
-command displays the current real and effective user and group ID names or values\&. If the value does not have a corresponding entry in
-/etc/passwd
-or
-/etc/group, the value will be displayed without the corresponding name\&. The optional
-\fB\-a\fR
-flag will display the group set on systems which support supplementary groups (see
-\fBinitgroups\fR(3))\&.
-.SH "FILER"
-.PP
-/etc/group
-.RS 4
-Information om gruppekonto\&.
-.RE
-.PP
-/etc/passwd
-.RS 4
-Information om brugerkonto\&.
-.RE
-.SH "SE OGS\(oA"
-.PP
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)
diff --git a/man/da/man1/newgrp.1 b/man/da/man1/newgrp.1
index 9ac6546e..9cfb88af 100644
--- a/man/da/man1/newgrp.1
+++ b/man/da/man1/newgrp.1
@@ -2,12 +2,12 @@
 .\"     Title: newgrp
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Danish
 .\"
-.TH "NEWGRP" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "NEWGRP" "1" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/da/man1/sg.1 b/man/da/man1/sg.1
index ad5725b0..60950a7c 100644
--- a/man/da/man1/sg.1
+++ b/man/da/man1/sg.1
@@ -2,12 +2,12 @@
 .\"     Title: sg
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Danish
 .\"
-.TH "SG" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "SG" "1" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/da/man5/gshadow.5 b/man/da/man5/gshadow.5
index 55a065df..1c5a45f8 100644
--- a/man/da/man5/gshadow.5
+++ b/man/da/man5/gshadow.5
@@ -2,12 +2,12 @@
 .\"     Title: gshadow
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Danish
 .\"
-.TH "GSHADOW" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "GSHADOW" "5" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ Each line of this file contains the following colon\-separated fields:
 .PP
 \fBgroup name\fR
 .RS 4
-Det skal v\(aere et gyldigt gruppenavn, som findes p\(oa systemet\&.
+It must be a valid group name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/da/man8/groupdel.8 b/man/da/man8/groupdel.8
index f73ba6e4..6ad24422 100644
--- a/man/da/man8/groupdel.8
+++ b/man/da/man8/groupdel.8
@@ -2,12 +2,12 @@
 .\"     Title: groupdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Danish
 .\"
-.TH "GROUPDEL" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPDEL" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/da/man8/logoutd.8 b/man/da/man8/logoutd.8
index d321b46f..35a74c40 100644
--- a/man/da/man8/logoutd.8
+++ b/man/da/man8/logoutd.8
@@ -2,12 +2,12 @@
 .\"     Title: logoutd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Danish
 .\"
-.TH "LOGOUTD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LOGOUTD" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/da/man8/nologin.8 b/man/da/man8/nologin.8
index eaf96dff..6e42b866 100644
--- a/man/da/man8/nologin.8
+++ b/man/da/man8/nologin.8
@@ -2,12 +2,12 @@
 .\"     Title: nologin
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Danish
 .\"
-.TH "NOLOGIN" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "NOLOGIN" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/da/man8/vipw.8 b/man/da/man8/vipw.8
index 6cb2986d..bdd91af6 100644
--- a/man/da/man8/vipw.8
+++ b/man/da/man8/vipw.8
@@ -2,12 +2,12 @@
 .\"     Title: vipw
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Danish
 .\"
-.TH "VIPW" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "VIPW" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/Makefile.am b/man/de/Makefile.am
index 671432d3..d3a6d6c1 100644
--- a/man/de/Makefile.am
+++ b/man/de/Makefile.am
@@ -16,7 +16,6 @@ man_MANS = \
 	man8/groupdel.8 \
 	man8/groupmems.8 \
 	man8/groupmod.8 \
-	man1/groups.1 \
 	man8/grpck.8 \
 	man8/grpconv.8 \
 	man8/grpunconv.8 \
@@ -58,7 +57,6 @@ endif
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	man1/id.1 \
 	man8/sulogin.8
 
 if USE_PAM
diff --git a/man/de/Makefile.in b/man/de/Makefile.in
index 49dc69e1..af294cc2 100644
--- a/man/de/Makefile.in
+++ b/man/de/Makefile.in
@@ -346,20 +346,20 @@ top_srcdir = @top_srcdir@
 man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
 	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
-	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
-	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man1/login.1 \
-	man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 man8/newusers.8 \
-	man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
-	man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man3/shadow.3 \
-	man5/shadow.5 man1/su.1 man5/suauth.5 man8/useradd.8 \
-	man8/userdel.8 man8/usermod.8 man8/vigr.8 man8/vipw.8 \
-	$(am__append_1) $(am__append_2)
+	man8/groupmems.8 man8/groupmod.8 man8/grpck.8 man8/grpconv.8 \
+	man8/grpunconv.8 man5/gshadow.5 man1/login.1 man5/login.defs.5 \
+	man8/logoutd.8 man1/newgrp.1 man8/newusers.8 man8/nologin.8 \
+	man1/passwd.1 man5/passwd.5 man8/pwck.8 man8/pwconv.8 \
+	man8/pwunconv.8 man1/sg.1 man3/shadow.3 man5/shadow.5 \
+	man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
+	man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1) \
+	$(am__append_2)
 man_nopam = \
 	man5/limits.5 \
 	man5/login.access.5 \
 	man5/porttime.5
 
-EXTRA_DIST = $(man_MANS) man1/id.1 man8/sulogin.8 $(am__append_3)
+EXTRA_DIST = $(man_MANS) man8/sulogin.8 $(am__append_3)
 LANG = $(notdir $(CURDIR))
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_FALSE@VENDORDIR_COND = without_vendordir
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_TRUE@VENDORDIR_COND = with_vendordir
diff --git a/man/de/man1/chage.1 b/man/de/man1/chage.1
index 282b6989..67c59886 100644
--- a/man/de/man1/chage.1
+++ b/man/de/man1/chage.1
@@ -2,12 +2,12 @@
 .\"     Title: chage
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "CHAGE" "1" "18.06.2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHAGE" "1" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man1/chfn.1 b/man/de/man1/chfn.1
index 685d3f09..3e0d5173 100644
--- a/man/de/man1/chfn.1
+++ b/man/de/man1/chfn.1
@@ -2,12 +2,12 @@
 .\"     Title: chfn
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "CHFN" "1" "18.06.2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHFN" "1" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man1/chsh.1 b/man/de/man1/chsh.1
index fd7c4851..d691bdb4 100644
--- a/man/de/man1/chsh.1
+++ b/man/de/man1/chsh.1
@@ -2,12 +2,12 @@
 .\"     Title: chsh
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "CHSH" "1" "18.06.2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHSH" "1" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man1/expiry.1 b/man/de/man1/expiry.1
index aae40001..6a078a7b 100644
--- a/man/de/man1/expiry.1
+++ b/man/de/man1/expiry.1
@@ -2,12 +2,12 @@
 .\"     Title: expiry
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "EXPIRY" "1" "18.06.2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "EXPIRY" "1" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man1/gpasswd.1 b/man/de/man1/gpasswd.1
index 37707c2d..e0094aac 100644
--- a/man/de/man1/gpasswd.1
+++ b/man/de/man1/gpasswd.1
@@ -2,12 +2,12 @@
 .\"     Title: gpasswd
 .\"    Author: Rafal Maszkowski
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "GPASSWD" "1" "18.06.2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "GPASSWD" "1" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man1/groups.1 b/man/de/man1/groups.1
deleted file mode 100644
index d0449c92..00000000
--- a/man/de/man1/groups.1
+++ /dev/null
@@ -1,65 +0,0 @@
-'\" t
-.\"     Title: groups
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: German
-.\"
-.TH "GROUPS" "1" "18.06.2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-groups \- gibt die aktuellen Gruppenzugeh\(:origkeiten des Benutzers aus
-.SH "\(:UBERSICHT"
-.HP \w'\fBgroups\fR\ 'u
-\fBgroups\fR [\fIuser\fR]
-.SH "BESCHREIBUNG"
-.PP
-The
-\fBgroups\fR
-command displays the current group names or ID values\&. If the value does not have a corresponding entry in
-/etc/group, the value will be displayed as the numerical group value\&. The optional
-\fIuser\fR
-parameter will display the groups for the named user\&.
-.SH "ANMERKUNGEN"
-.PP
-Systems which do not support supplementary groups (see
-\fBinitgroups\fR(3)) will have the information from
-/etc/group
-reported\&. The user must use
-\fBnewgrp\fR
-or
-\fBsg\fR
-to change his current real and effective group ID\&.
-.SH "DATEIEN"
-.PP
-/etc/group
-.RS 4
-Informationen zu den Gruppenkonten
-.RE
-.SH "SIEHE AUCH"
-.PP
-\fBnewgrp\fR(1),
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)\&.
diff --git a/man/de/man1/id.1 b/man/de/man1/id.1
deleted file mode 100644
index 0da0780b..00000000
--- a/man/de/man1/id.1
+++ /dev/null
@@ -1,62 +0,0 @@
-'\" t
-.\"     Title: id
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: German
-.\"
-.TH "ID" "1" "18.06.2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-id \- display current user and group ID names
-.SH "\(:UBERSICHT"
-.HP \w'\fBid\fR\ 'u
-\fBid\fR [\-a]
-.SH "BESCHREIBUNG"
-.PP
-The
-\fBid\fR
-command displays the current real and effective user and group ID names or values\&. If the value does not have a corresponding entry in
-/etc/passwd
-or
-/etc/group, the value will be displayed without the corresponding name\&. The optional
-\fB\-a\fR
-flag will display the group set on systems which support supplementary groups (see
-\fBinitgroups\fR(3))\&.
-.SH "DATEIEN"
-.PP
-/etc/group
-.RS 4
-Informationen zu den Gruppenkonten
-.RE
-.PP
-/etc/passwd
-.RS 4
-Informationen zu den Benutzerkonten
-.RE
-.SH "SIEHE AUCH"
-.PP
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)
diff --git a/man/de/man1/login.1 b/man/de/man1/login.1
index 8a6c5236..f9be4224 100644
--- a/man/de/man1/login.1
+++ b/man/de/man1/login.1
@@ -2,12 +2,12 @@
 .\"     Title: login
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "LOGIN" "1" "18.06.2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "LOGIN" "1" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man1/newgrp.1 b/man/de/man1/newgrp.1
index 4fd56406..247ab47d 100644
--- a/man/de/man1/newgrp.1
+++ b/man/de/man1/newgrp.1
@@ -2,12 +2,12 @@
 .\"     Title: newgrp
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "NEWGRP" "1" "18.06.2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "NEWGRP" "1" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man1/passwd.1 b/man/de/man1/passwd.1
index fae0c5cf..efcae852 100644
--- a/man/de/man1/passwd.1
+++ b/man/de/man1/passwd.1
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "PASSWD" "1" "18.06.2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "PASSWD" "1" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -110,7 +110,7 @@ sperrt das Passwort des bezeichneten Kontos\&. Die Option schaltet ein Passwort
 .sp
 Note that this does not disable the account\&. The user may still be able to login using another authentication token (e\&.g\&. an SSH key)\&. To disable the account, administrators should use
 \fBusermod \-\-expiredate 1\fR
-(this set the account\*(Aqs expire date to Jan 2, 1970)\&.
+(this sets the account\*(Aqs expire date to Jan 2, 1970)\&.
 .sp
 Benutzer mit einem gesperrten Passwort k\(:onnen dieses nicht \(:andern\&.
 .RE
diff --git a/man/de/man1/sg.1 b/man/de/man1/sg.1
index 5a91f855..4899931b 100644
--- a/man/de/man1/sg.1
+++ b/man/de/man1/sg.1
@@ -2,12 +2,12 @@
 .\"     Title: sg
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "SG" "1" "18.06.2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "SG" "1" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man1/su.1 b/man/de/man1/su.1
index a751b378..471f9afa 100644
--- a/man/de/man1/su.1
+++ b/man/de/man1/su.1
@@ -2,12 +2,12 @@
 .\"     Title: su
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "SU" "1" "18.06.2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "SU" "1" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man3/shadow.3 b/man/de/man3/shadow.3
index f5edf109..f0f307d6 100644
--- a/man/de/man3/shadow.3
+++ b/man/de/man3/shadow.3
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: Library Calls
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "SHADOW" "3" "18.06.2024" "shadow\-utils 4\&.16\&.0" "Library Calls"
+.TH "SHADOW" "3" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "Library Calls"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man5/faillog.5 b/man/de/man5/faillog.5
index 74c5ae96..9d2470db 100644
--- a/man/de/man5/faillog.5
+++ b/man/de/man5/faillog.5
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual:  File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "FAILLOG" "5" "18.06.2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuratio"
+.TH "FAILLOG" "5" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuratio"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man5/gshadow.5 b/man/de/man5/gshadow.5
index 2b084aa5..69a324cf 100644
--- a/man/de/man5/gshadow.5
+++ b/man/de/man5/gshadow.5
@@ -2,12 +2,12 @@
 .\"     Title: gshadow
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "GSHADOW" "5" "18.06.2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "GSHADOW" "5" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ Jede Zeile dieser Datei setzt sich aus folgenden, durch Doppelpunkt getrennte Fe
 .PP
 \fBgroup name\fR
 .RS 4
-Es muss sich um einen g\(:ultigen, auf dem System vorhandenen Gruppennamen handeln\&.
+It must be a valid group name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/de/man5/limits.5 b/man/de/man5/limits.5
index 89543de7..3daa0f06 100644
--- a/man/de/man5/limits.5
+++ b/man/de/man5/limits.5
@@ -2,12 +2,12 @@
 .\"     Title: limits
 .\"    Author: Luca Berra
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "LIMITS" "5" "18.06.2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LIMITS" "5" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man5/login.access.5 b/man/de/man5/login.access.5
index acc013f9..c642f1b4 100644
--- a/man/de/man5/login.access.5
+++ b/man/de/man5/login.access.5
@@ -2,12 +2,12 @@
 .\"     Title: login.access
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "LOGIN\&.ACCESS" "5" "18.06.2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LOGIN\&.ACCESS" "5" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man5/login.defs.5 b/man/de/man5/login.defs.5
index b707537d..fb6339f6 100644
--- a/man/de/man5/login.defs.5
+++ b/man/de/man5/login.defs.5
@@ -2,12 +2,12 @@
 .\"     Title: login.defs
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "LOGIN\&.DEFS" "5" "18.06.2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LOGIN\&.DEFS" "5" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man5/passwd.5 b/man/de/man5/passwd.5
index f16f4d2f..696d73d4 100644
--- a/man/de/man5/passwd.5
+++ b/man/de/man5/passwd.5
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "PASSWD" "5" "18.06.2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "PASSWD" "5" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man5/porttime.5 b/man/de/man5/porttime.5
index da70a10f..366708e9 100644
--- a/man/de/man5/porttime.5
+++ b/man/de/man5/porttime.5
@@ -2,12 +2,12 @@
 .\"     Title: porttime
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "PORTTIME" "5" "18.06.2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "PORTTIME" "5" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man5/shadow.5 b/man/de/man5/shadow.5
index 938beca1..d6f4541d 100644
--- a/man/de/man5/shadow.5
+++ b/man/de/man5/shadow.5
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "SHADOW" "5" "18.06.2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SHADOW" "5" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ Each line of this file contains 9 fields, separated by colons (\(Bq:\(lq), in th
 .PP
 \fBlogin name\fR
 .RS 4
-Dabei muss es sich um einen g\(:ultigen Kontonamen handeln, der auf dem System existiert\&.
+It must be a valid account name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/de/man5/suauth.5 b/man/de/man5/suauth.5
index af28a581..18b9676f 100644
--- a/man/de/man5/suauth.5
+++ b/man/de/man5/suauth.5
@@ -2,12 +2,12 @@
 .\"     Title: suauth
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "SUAUTH" "5" "18.06.2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SUAUTH" "5" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/chgpasswd.8 b/man/de/man8/chgpasswd.8
index 15327476..03ae5c47 100644
--- a/man/de/man8/chgpasswd.8
+++ b/man/de/man8/chgpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: chgpasswd
 .\"    Author: Thomas K\(/loczko <kloczek@pld.org.pl>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "CHGPASSWD" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "CHGPASSWD" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/chpasswd.8 b/man/de/man8/chpasswd.8
index 84dba5b7..89ea64b0 100644
--- a/man/de/man8/chpasswd.8
+++ b/man/de/man8/chpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: chpasswd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "CHPASSWD" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "CHPASSWD" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/faillog.8 b/man/de/man8/faillog.8
index d5849171..be8b18a1 100644
--- a/man/de/man8/faillog.8
+++ b/man/de/man8/faillog.8
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "FAILLOG" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "FAILLOG" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/groupadd.8 b/man/de/man8/groupadd.8
index 2e1ec488..9396e3cb 100644
--- a/man/de/man8/groupadd.8
+++ b/man/de/man8/groupadd.8
@@ -2,12 +2,12 @@
 .\"     Title: groupadd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "GROUPADD" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPADD" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -146,7 +146,7 @@ Apply changes to configuration files under the root filesystem found under the d
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
 \fB\-g\fR,
diff --git a/man/de/man8/groupdel.8 b/man/de/man8/groupdel.8
index 8bde5e77..1b23a157 100644
--- a/man/de/man8/groupdel.8
+++ b/man/de/man8/groupdel.8
@@ -2,12 +2,12 @@
 .\"     Title: groupdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "GROUPDEL" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPDEL" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/groupmems.8 b/man/de/man8/groupmems.8
index f735aec5..291110ee 100644
--- a/man/de/man8/groupmems.8
+++ b/man/de/man8/groupmems.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmems
 .\"    Author: George Kraft, IV
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "GROUPMEMS" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPMEMS" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/groupmod.8 b/man/de/man8/groupmod.8
index 98867464..c50286a3 100644
--- a/man/de/man8/groupmod.8
+++ b/man/de/man8/groupmod.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "GROUPMOD" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPMOD" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@ The options which apply to the
 \fBgroupmod\fR
 command are:
 .PP
-\fB\-a\fR, \fB\-\-append\fR\ \&\fIGID\fR
+\fB\-a\fR, \fB\-\-append\fR
 .RS 4
 If group members are specified with \-U, append them to the existing member list, rather than replacing it\&.
 .RE
@@ -131,11 +131,11 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
-\fB\-g\fR,
-\fB\-N\fR, and
+\fB\-g\fR
+and
 \fB\-U\fR
 options are not specified) is defined by the
 \fBUSERGROUPS_ENAB\fR
diff --git a/man/de/man8/grpck.8 b/man/de/man8/grpck.8
index 300a8f7e..ad3cc90a 100644
--- a/man/de/man8/grpck.8
+++ b/man/de/man8/grpck.8
@@ -2,12 +2,12 @@
 .\"     Title: grpck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "GRPCK" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GRPCK" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/lastlog.8 b/man/de/man8/lastlog.8
index 076e7e13..e5be3179 100644
--- a/man/de/man8/lastlog.8
+++ b/man/de/man8/lastlog.8
@@ -2,12 +2,12 @@
 .\"     Title: lastlog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "LASTLOG" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LASTLOG" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/logoutd.8 b/man/de/man8/logoutd.8
index f58989c1..6b58d2f5 100644
--- a/man/de/man8/logoutd.8
+++ b/man/de/man8/logoutd.8
@@ -2,12 +2,12 @@
 .\"     Title: logoutd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "LOGOUTD" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LOGOUTD" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/newusers.8 b/man/de/man8/newusers.8
index 15eae248..80c587bd 100644
--- a/man/de/man8/newusers.8
+++ b/man/de/man8/newusers.8
@@ -2,12 +2,12 @@
 .\"     Title: newusers
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "NEWUSERS" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "NEWUSERS" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/nologin.8 b/man/de/man8/nologin.8
index 55fcdf02..30c22765 100644
--- a/man/de/man8/nologin.8
+++ b/man/de/man8/nologin.8
@@ -2,12 +2,12 @@
 .\"     Title: nologin
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "NOLOGIN" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "NOLOGIN" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/pwck.8 b/man/de/man8/pwck.8
index ba55ae4b..508c3f0a 100644
--- a/man/de/man8/pwck.8
+++ b/man/de/man8/pwck.8
@@ -2,12 +2,12 @@
 .\"     Title: pwck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "PWCK" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "PWCK" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/pwconv.8 b/man/de/man8/pwconv.8
index daff2f98..ed3cf954 100644
--- a/man/de/man8/pwconv.8
+++ b/man/de/man8/pwconv.8
@@ -2,12 +2,12 @@
 .\"     Title: pwconv
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "PWCONV" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "PWCONV" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/sulogin.8 b/man/de/man8/sulogin.8
index c26a362d..33e3f129 100644
--- a/man/de/man8/sulogin.8
+++ b/man/de/man8/sulogin.8
@@ -2,12 +2,12 @@
 .\"     Title: sulogin
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "SULOGIN" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "SULOGIN" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/useradd.8 b/man/de/man8/useradd.8
index e280cec5..b7489107 100644
--- a/man/de/man8/useradd.8
+++ b/man/de/man8/useradd.8
@@ -2,12 +2,12 @@
 .\"     Title: useradd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "USERADD" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERADD" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/userdel.8 b/man/de/man8/userdel.8
index e19051ae..b46e9cff 100644
--- a/man/de/man8/userdel.8
+++ b/man/de/man8/userdel.8
@@ -2,12 +2,12 @@
 .\"     Title: userdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "USERDEL" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERDEL" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -46,15 +46,7 @@ command are:
 .PP
 \fB\-f\fR, \fB\-\-force\fR
 .RS 4
-This option forces the removal of the user account, even if the user is still logged in\&. It also forces
-\fBuserdel\fR
-to remove the user\*(Aqs home directory and mail spool, even if another user uses the same home directory or if the mail spool is not owned by the specified user\&. If
-\fBUSERGROUPS_ENAB\fR
-is defined to
-\fIyes\fR
-in
-/etc/login\&.defs
-and if a group exists with the same name as the deleted user, then this group will be removed, even if it is still the primary group of another user\&.
+This option forces the removal of the user account and any other requested actions, skipping any safety checks\&.
 .sp
 \fINote:\fR
 This option is dangerous and may leave your system in an inconsistent state\&.
diff --git a/man/de/man8/usermod.8 b/man/de/man8/usermod.8
index 5b050f2f..3b431928 100644
--- a/man/de/man8/usermod.8
+++ b/man/de/man8/usermod.8
@@ -2,12 +2,12 @@
 .\"     Title: usermod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "USERMOD" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERMOD" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/de/man8/vipw.8 b/man/de/man8/vipw.8
index 3b4ab9ae..375d7154 100644
--- a/man/de/man8/vipw.8
+++ b/man/de/man8/vipw.8
@@ -2,12 +2,12 @@
 .\"     Title: vipw
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18.06.2024
+.\"      Date: 05.12.2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: German
 .\"
-.TH "VIPW" "8" "18.06.2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "VIPW" "8" "05.12.2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am
index 335e0298..2365e23b 100644
--- a/man/fr/Makefile.am
+++ b/man/fr/Makefile.am
@@ -16,7 +16,6 @@ man_MANS = \
 	man8/groupdel.8 \
 	man8/groupmems.8 \
 	man8/groupmod.8 \
-	man1/groups.1 \
 	man8/grpck.8 \
 	man8/grpconv.8 \
 	man8/grpunconv.8 \
@@ -68,7 +67,6 @@ endif
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	man1/id.1 \
 	man8/sulogin.8
 
 if USE_PAM
diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in
index 20bc80e6..968e0145 100644
--- a/man/fr/Makefile.in
+++ b/man/fr/Makefile.in
@@ -348,14 +348,14 @@ top_srcdir = @top_srcdir@
 man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
 	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
-	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
-	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man1/login.1 \
-	man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 man8/newusers.8 \
-	man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
-	man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man3/shadow.3 \
-	man5/shadow.5 man1/su.1 man5/suauth.5 man8/useradd.8 \
-	man8/userdel.8 man8/usermod.8 man8/vigr.8 man8/vipw.8 \
-	$(am__append_1) $(am__append_2) $(am__append_3)
+	man8/groupmems.8 man8/groupmod.8 man8/grpck.8 man8/grpconv.8 \
+	man8/grpunconv.8 man5/gshadow.5 man1/login.1 man5/login.defs.5 \
+	man8/logoutd.8 man1/newgrp.1 man8/newusers.8 man8/nologin.8 \
+	man1/passwd.1 man5/passwd.5 man8/pwck.8 man8/pwconv.8 \
+	man8/pwunconv.8 man1/sg.1 man3/shadow.3 man5/shadow.5 \
+	man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
+	man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1) \
+	$(am__append_2) $(am__append_3)
 man_nopam = \
 	man5/limits.5 \
 	man5/login.access.5 \
@@ -367,7 +367,7 @@ man_subids = \
 	man5/subgid.5 \
 	man5/subuid.5
 
-EXTRA_DIST = $(man_MANS) man1/id.1 man8/sulogin.8 $(am__append_4) \
+EXTRA_DIST = $(man_MANS) man8/sulogin.8 $(am__append_4) \
 	$(am__append_5)
 LANG = $(notdir $(CURDIR))
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_FALSE@VENDORDIR_COND = without_vendordir
diff --git a/man/fr/man1/chage.1 b/man/fr/man1/chage.1
index f0407261..3c2d2b0b 100644
--- a/man/fr/man1/chage.1
+++ b/man/fr/man1/chage.1
@@ -2,12 +2,12 @@
 .\"     Title: chage
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "CHAGE" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHAGE" "1" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man1/chfn.1 b/man/fr/man1/chfn.1
index 83270e69..3b515ba8 100644
--- a/man/fr/man1/chfn.1
+++ b/man/fr/man1/chfn.1
@@ -2,12 +2,12 @@
 .\"     Title: chfn
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "CHFN" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHFN" "1" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man1/chsh.1 b/man/fr/man1/chsh.1
index 0e4b2e4c..4dfec869 100644
--- a/man/fr/man1/chsh.1
+++ b/man/fr/man1/chsh.1
@@ -2,12 +2,12 @@
 .\"     Title: chsh
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "CHSH" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHSH" "1" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man1/expiry.1 b/man/fr/man1/expiry.1
index cb2a4071..4362ee5c 100644
--- a/man/fr/man1/expiry.1
+++ b/man/fr/man1/expiry.1
@@ -2,12 +2,12 @@
 .\"     Title: expiry
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "EXPIRY" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "EXPIRY" "1" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man1/gpasswd.1 b/man/fr/man1/gpasswd.1
index ca4f26b8..83090bcf 100644
--- a/man/fr/man1/gpasswd.1
+++ b/man/fr/man1/gpasswd.1
@@ -2,12 +2,12 @@
 .\"     Title: gpasswd
 .\"    Author: rafal Maszkowski
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "GPASSWD" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "GPASSWD" "1" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man1/groups.1 b/man/fr/man1/groups.1
deleted file mode 100644
index edf1d1a9..00000000
--- a/man/fr/man1/groups.1
+++ /dev/null
@@ -1,65 +0,0 @@
-'\" t
-.\"     Title: groups
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: French
-.\"
-.TH "GROUPS" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NOM"
-groups \- Afficher la liste des groupes auxquels appartient l\*(Aqutilisateur
-.SH "SYNOPSIS"
-.HP \w'\fBgroups\fR\ 'u
-\fBgroups\fR [\fIuser\fR]
-.SH "DESCRIPTION"
-.PP
-The
-\fBgroups\fR
-command displays the current group names or ID values\&. If the value does not have a corresponding entry in
-/etc/group, the value will be displayed as the numerical group value\&. The optional
-\fIuser\fR
-parameter will display the groups for the named user\&.
-.SH "NOTE"
-.PP
-Systems which do not support supplementary groups (see
-\fBinitgroups\fR(3)) will have the information from
-/etc/group
-reported\&. The user must use
-\fBnewgrp\fR
-or
-\fBsg\fR
-to change his current real and effective group ID\&.
-.SH "FICHIERS"
-.PP
-/etc/group
-.RS 4
-Informations sur les groupes\&.
-.RE
-.SH "VOIR AUSSI"
-.PP
-\fBnewgrp\fR(1),
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)\&.
diff --git a/man/fr/man1/id.1 b/man/fr/man1/id.1
deleted file mode 100644
index e6798a23..00000000
--- a/man/fr/man1/id.1
+++ /dev/null
@@ -1,62 +0,0 @@
-'\" t
-.\"     Title: id
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: French
-.\"
-.TH "ID" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NOM"
-id \- display current user and group ID names
-.SH "SYNOPSIS"
-.HP \w'\fBid\fR\ 'u
-\fBid\fR [\-a]
-.SH "DESCRIPTION"
-.PP
-The
-\fBid\fR
-command displays the current real and effective user and group ID names or values\&. If the value does not have a corresponding entry in
-/etc/passwd
-or
-/etc/group, the value will be displayed without the corresponding name\&. The optional
-\fB\-a\fR
-flag will display the group set on systems which support supplementary groups (see
-\fBinitgroups\fR(3))\&.
-.SH "FICHIERS"
-.PP
-/etc/group
-.RS 4
-Informations sur les groupes\&.
-.RE
-.PP
-/etc/passwd
-.RS 4
-Informations sur les comptes des utilisateurs\&.
-.RE
-.SH "VOIR AUSSI"
-.PP
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)
diff --git a/man/fr/man1/login.1 b/man/fr/man1/login.1
index 40f6ab95..12df15c7 100644
--- a/man/fr/man1/login.1
+++ b/man/fr/man1/login.1
@@ -2,12 +2,12 @@
 .\"     Title: login
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "LOGIN" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "LOGIN" "1" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man1/newgidmap.1 b/man/fr/man1/newgidmap.1
index 8d4e3c86..8678f41b 100644
--- a/man/fr/man1/newgidmap.1
+++ b/man/fr/man1/newgidmap.1
@@ -2,12 +2,12 @@
 .\"     Title: newgidmap
 .\"    Author: Eric Biederman
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "NEWGIDMAP" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "NEWGIDMAP" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man1/newgrp.1 b/man/fr/man1/newgrp.1
index d28ead84..eb9b1b55 100644
--- a/man/fr/man1/newgrp.1
+++ b/man/fr/man1/newgrp.1
@@ -2,12 +2,12 @@
 .\"     Title: newgrp
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "NEWGRP" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "NEWGRP" "1" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man1/newuidmap.1 b/man/fr/man1/newuidmap.1
index 5892124f..92f6b7f4 100644
--- a/man/fr/man1/newuidmap.1
+++ b/man/fr/man1/newuidmap.1
@@ -2,12 +2,12 @@
 .\"     Title: newuidmap
 .\"    Author: Eric Biederman
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "NEWUIDMAP" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "NEWUIDMAP" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man1/passwd.1 b/man/fr/man1/passwd.1
index f3c43d9b..a55095f3 100644
--- a/man/fr/man1/passwd.1
+++ b/man/fr/man1/passwd.1
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "PASSWD" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "PASSWD" "1" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -110,7 +110,7 @@ Verrouiller le mot de passe du compte indiqu\('e\&. Cette option d\('esactive un
 .sp
 Note that this does not disable the account\&. The user may still be able to login using another authentication token (e\&.g\&. an SSH key)\&. To disable the account, administrators should use
 \fBusermod \-\-expiredate 1\fR
-(this set the account\*(Aqs expire date to Jan 2, 1970)\&.
+(this sets the account\*(Aqs expire date to Jan 2, 1970)\&.
 .sp
 Les utilisateurs avec un mot de passe verrouill\('e ne sont pas autoris\('es \(`a le changer\&.
 .RE
diff --git a/man/fr/man1/sg.1 b/man/fr/man1/sg.1
index 25349f11..04f1c423 100644
--- a/man/fr/man1/sg.1
+++ b/man/fr/man1/sg.1
@@ -2,12 +2,12 @@
 .\"     Title: sg
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "SG" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "SG" "1" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man1/su.1 b/man/fr/man1/su.1
index d035aaaa..66861d52 100644
--- a/man/fr/man1/su.1
+++ b/man/fr/man1/su.1
@@ -2,12 +2,12 @@
 .\"     Title: su
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "SU" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "SU" "1" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man3/shadow.3 b/man/fr/man3/shadow.3
index 890ef178..1e8fa855 100644
--- a/man/fr/man3/shadow.3
+++ b/man/fr/man3/shadow.3
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: Library Calls
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "SHADOW" "3" "18/06/2024" "shadow\-utils 4\&.16\&.0" "Library Calls"
+.TH "SHADOW" "3" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "Library Calls"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man5/faillog.5 b/man/fr/man5/faillog.5
index d6fb3bdc..5a904957 100644
--- a/man/fr/man5/faillog.5
+++ b/man/fr/man5/faillog.5
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual:  File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "FAILLOG" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuratio"
+.TH "FAILLOG" "5" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuratio"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man5/gshadow.5 b/man/fr/man5/gshadow.5
index 4a38e5f3..dafe387b 100644
--- a/man/fr/man5/gshadow.5
+++ b/man/fr/man5/gshadow.5
@@ -2,12 +2,12 @@
 .\"     Title: gshadow
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "GSHADOW" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "GSHADOW" "5" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ Chaque ligne de ce fichier contient les champs suivants, s\('epar\('es par des d
 .PP
 \fBgroup name\fR
 .RS 4
-Ce doit \(^etre un nom de groupe valable, qui existe sur le syst\(`eme\&.
+It must be a valid group name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/fr/man5/limits.5 b/man/fr/man5/limits.5
index a2e6b3ad..d1ee2db1 100644
--- a/man/fr/man5/limits.5
+++ b/man/fr/man5/limits.5
@@ -2,12 +2,12 @@
 .\"     Title: limits
 .\"    Author: Luca Berra
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "LIMITS" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LIMITS" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man5/login.access.5 b/man/fr/man5/login.access.5
index c07250e9..169e7efd 100644
--- a/man/fr/man5/login.access.5
+++ b/man/fr/man5/login.access.5
@@ -2,12 +2,12 @@
 .\"     Title: login.access
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "LOGIN\&.ACCESS" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LOGIN\&.ACCESS" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man5/login.defs.5 b/man/fr/man5/login.defs.5
index 24e362db..bad0dba9 100644
--- a/man/fr/man5/login.defs.5
+++ b/man/fr/man5/login.defs.5
@@ -2,12 +2,12 @@
 .\"     Title: login.defs
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "LOGIN\&.DEFS" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LOGIN\&.DEFS" "5" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man5/passwd.5 b/man/fr/man5/passwd.5
index cade2b67..97f4c667 100644
--- a/man/fr/man5/passwd.5
+++ b/man/fr/man5/passwd.5
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "PASSWD" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "PASSWD" "5" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man5/porttime.5 b/man/fr/man5/porttime.5
index 37210d1c..41a1138b 100644
--- a/man/fr/man5/porttime.5
+++ b/man/fr/man5/porttime.5
@@ -2,12 +2,12 @@
 .\"     Title: porttime
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "PORTTIME" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "PORTTIME" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man5/shadow.5 b/man/fr/man5/shadow.5
index a3b12fe5..d442675e 100644
--- a/man/fr/man5/shadow.5
+++ b/man/fr/man5/shadow.5
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "SHADOW" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SHADOW" "5" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ Each line of this file contains 9 fields, separated by colons (\(Fo\ \&:\ \&\(Fc
 .PP
 \fBlogin name\fR
 .RS 4
-Ce doit \(^etre un nom de compte valable, qui existe sur le syst\(`eme\&.
+It must be a valid account name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/fr/man5/suauth.5 b/man/fr/man5/suauth.5
index 289de364..8b412d12 100644
--- a/man/fr/man5/suauth.5
+++ b/man/fr/man5/suauth.5
@@ -2,12 +2,12 @@
 .\"     Title: suauth
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "SUAUTH" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SUAUTH" "5" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man5/subgid.5 b/man/fr/man5/subgid.5
index 54327a7d..0d6752d3 100644
--- a/man/fr/man5/subgid.5
+++ b/man/fr/man5/subgid.5
@@ -2,12 +2,12 @@
 .\"     Title: subgid
 .\"    Author: Eric Biederman
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "SUBGID" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SUBGID" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,9 @@ configures the delegation of gids to
 \fIfiles\fR\&.
 .PP
 Note, that
-\fBgroupadd\fR
+\fBnewusers\fR,
+\fBuseradd\fR, and
+\fBusermod\fR
 will only create entries in
 /etc/subgid
 if subid delegation is managed via subid files\&.
diff --git a/man/fr/man5/subuid.5 b/man/fr/man5/subuid.5
index 0a6b48ff..1a8c1918 100644
--- a/man/fr/man5/subuid.5
+++ b/man/fr/man5/subuid.5
@@ -2,12 +2,12 @@
 .\"     Title: subuid
 .\"    Author: Eric Biederman
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "SUBUID" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SUBUID" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,9 @@ configures the delegation of uids to
 \fIfiles\fR\&.
 .PP
 Note, that
-\fBuseradd\fR
+\fBnewusers\fR,
+\fBuseradd\fR, and
+\fBusermod\fR
 will only create entries in
 /etc/subuid
 if subid delegation is managed via subid files\&.
diff --git a/man/fr/man8/chgpasswd.8 b/man/fr/man8/chgpasswd.8
index 58523859..672bedfb 100644
--- a/man/fr/man8/chgpasswd.8
+++ b/man/fr/man8/chgpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: chgpasswd
 .\"    Author: Thomas K\(/loczko <kloczek@pld.org.pl>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "CHGPASSWD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "CHGPASSWD" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/chpasswd.8 b/man/fr/man8/chpasswd.8
index 7d65758c..1b542a1a 100644
--- a/man/fr/man8/chpasswd.8
+++ b/man/fr/man8/chpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: chpasswd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "CHPASSWD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "CHPASSWD" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/faillog.8 b/man/fr/man8/faillog.8
index 989fa16b..21552f8d 100644
--- a/man/fr/man8/faillog.8
+++ b/man/fr/man8/faillog.8
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "FAILLOG" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "FAILLOG" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/groupadd.8 b/man/fr/man8/groupadd.8
index d31c8621..d1e78385 100644
--- a/man/fr/man8/groupadd.8
+++ b/man/fr/man8/groupadd.8
@@ -2,12 +2,12 @@
 .\"     Title: groupadd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "GROUPADD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPADD" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -146,7 +146,7 @@ Apply changes to configuration files under the root filesystem found under the d
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
 \fB\-g\fR,
diff --git a/man/fr/man8/groupdel.8 b/man/fr/man8/groupdel.8
index 57653ff2..549cf264 100644
--- a/man/fr/man8/groupdel.8
+++ b/man/fr/man8/groupdel.8
@@ -2,12 +2,12 @@
 .\"     Title: groupdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "GROUPDEL" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPDEL" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/groupmems.8 b/man/fr/man8/groupmems.8
index 9d2421c4..ecee230e 100644
--- a/man/fr/man8/groupmems.8
+++ b/man/fr/man8/groupmems.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmems
 .\"    Author: George Kraft, IV
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "GROUPMEMS" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPMEMS" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/groupmod.8 b/man/fr/man8/groupmod.8
index 8e0fafd8..71d6aa45 100644
--- a/man/fr/man8/groupmod.8
+++ b/man/fr/man8/groupmod.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "GROUPMOD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPMOD" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@ The options which apply to the
 \fBgroupmod\fR
 command are:
 .PP
-\fB\-a\fR, \fB\-\-append\fR\ \&\fIGID\fR
+\fB\-a\fR, \fB\-\-append\fR
 .RS 4
 If group members are specified with \-U, append them to the existing member list, rather than replacing it\&.
 .RE
@@ -131,11 +131,11 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
-\fB\-g\fR,
-\fB\-N\fR, and
+\fB\-g\fR
+and
 \fB\-U\fR
 options are not specified) is defined by the
 \fBUSERGROUPS_ENAB\fR
diff --git a/man/fr/man8/grpck.8 b/man/fr/man8/grpck.8
index 5b1133af..104f968e 100644
--- a/man/fr/man8/grpck.8
+++ b/man/fr/man8/grpck.8
@@ -2,12 +2,12 @@
 .\"     Title: grpck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "GRPCK" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GRPCK" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/lastlog.8 b/man/fr/man8/lastlog.8
index 6c58a8f4..3c9f74e8 100644
--- a/man/fr/man8/lastlog.8
+++ b/man/fr/man8/lastlog.8
@@ -2,12 +2,12 @@
 .\"     Title: lastlog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "LASTLOG" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LASTLOG" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/logoutd.8 b/man/fr/man8/logoutd.8
index 96f15704..9ffb22df 100644
--- a/man/fr/man8/logoutd.8
+++ b/man/fr/man8/logoutd.8
@@ -2,12 +2,12 @@
 .\"     Title: logoutd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "LOGOUTD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LOGOUTD" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/newusers.8 b/man/fr/man8/newusers.8
index a285a94e..c8e4ccf7 100644
--- a/man/fr/man8/newusers.8
+++ b/man/fr/man8/newusers.8
@@ -2,12 +2,12 @@
 .\"     Title: newusers
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "NEWUSERS" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "NEWUSERS" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/nologin.8 b/man/fr/man8/nologin.8
index cda217d4..85af12c0 100644
--- a/man/fr/man8/nologin.8
+++ b/man/fr/man8/nologin.8
@@ -2,12 +2,12 @@
 .\"     Title: nologin
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "NOLOGIN" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "NOLOGIN" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/pwck.8 b/man/fr/man8/pwck.8
index 3ed28bee..64d03b4e 100644
--- a/man/fr/man8/pwck.8
+++ b/man/fr/man8/pwck.8
@@ -2,12 +2,12 @@
 .\"     Title: pwck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "PWCK" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "PWCK" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/pwconv.8 b/man/fr/man8/pwconv.8
index cc56241b..160307e7 100644
--- a/man/fr/man8/pwconv.8
+++ b/man/fr/man8/pwconv.8
@@ -2,12 +2,12 @@
 .\"     Title: pwconv
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "PWCONV" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "PWCONV" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/sulogin.8 b/man/fr/man8/sulogin.8
index 8e1fcd44..b2418998 100644
--- a/man/fr/man8/sulogin.8
+++ b/man/fr/man8/sulogin.8
@@ -2,12 +2,12 @@
 .\"     Title: sulogin
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "SULOGIN" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "SULOGIN" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/useradd.8 b/man/fr/man8/useradd.8
index d0c1eae3..e68eec66 100644
--- a/man/fr/man8/useradd.8
+++ b/man/fr/man8/useradd.8
@@ -2,12 +2,12 @@
 .\"     Title: useradd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "USERADD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERADD" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/userdel.8 b/man/fr/man8/userdel.8
index d860bc41..aebe576a 100644
--- a/man/fr/man8/userdel.8
+++ b/man/fr/man8/userdel.8
@@ -2,12 +2,12 @@
 .\"     Title: userdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "USERDEL" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERDEL" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -46,15 +46,7 @@ command are:
 .PP
 \fB\-f\fR, \fB\-\-force\fR
 .RS 4
-This option forces the removal of the user account, even if the user is still logged in\&. It also forces
-\fBuserdel\fR
-to remove the user\*(Aqs home directory and mail spool, even if another user uses the same home directory or if the mail spool is not owned by the specified user\&. If
-\fBUSERGROUPS_ENAB\fR
-is defined to
-\fIyes\fR
-in
-/etc/login\&.defs
-and if a group exists with the same name as the deleted user, then this group will be removed, even if it is still the primary group of another user\&.
+This option forces the removal of the user account and any other requested actions, skipping any safety checks\&.
 .sp
 \fINote:\fR
 This option is dangerous and may leave your system in an inconsistent state\&.
diff --git a/man/fr/man8/usermod.8 b/man/fr/man8/usermod.8
index 0909921a..5e8831ba 100644
--- a/man/fr/man8/usermod.8
+++ b/man/fr/man8/usermod.8
@@ -2,12 +2,12 @@
 .\"     Title: usermod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 05/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "USERMOD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERMOD" "8" "05/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/fr/man8/vipw.8 b/man/fr/man8/vipw.8
index 2a48a42e..817761b0 100644
--- a/man/fr/man8/vipw.8
+++ b/man/fr/man8/vipw.8
@@ -2,12 +2,12 @@
 .\"     Title: vipw
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: French
 .\"
-.TH "VIPW" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "VIPW" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/groupadd.8.xml b/man/groupadd.8.xml
index 61a548f7..9abf159a 100644
--- a/man/groupadd.8.xml
+++ b/man/groupadd.8.xml
@@ -230,7 +230,7 @@
 	</term>
 	<listitem>
 	  <para>
-	    A list of usernames to add as members of the group.
+	    A comma-separated list of usernames to add as members of the group.
 	  </para>
 	  <para>
 	    The default behavior (if the <option>-g</option>,
diff --git a/man/groupmod.8.xml b/man/groupmod.8.xml
index 49ff7c69..2d51f271 100644
--- a/man/groupmod.8.xml
+++ b/man/groupmod.8.xml
@@ -70,7 +70,7 @@
     <variablelist remap='IP'>
       <varlistentry>
 	<term>
-	  <option>-a</option>, <option>--append</option>&nbsp;<replaceable>GID</replaceable>
+	  <option>-a</option>, <option>--append</option>
 	</term>
 	<listitem>
       <para>If group members are specified with -U, append them to the existing
@@ -195,13 +195,13 @@
 	</term>
 	<listitem>
 	  <para>
-	    A list of usernames to add as members of the group.
+	    A comma-separated list of usernames to add as members of the group.
 	  </para>
 	  <para>
-	    The default behavior (if the <option>-g</option>,
-	    <option>-N</option>, and <option>-U</option> options are not
-	    specified) is defined by the <option>USERGROUPS_ENAB</option>
-	    variable in <filename>/etc/login.defs</filename>.
+	    The default behavior (if the <option>-g</option> and
+	    <option>-U</option> options are not specified) is defined by the
+	    <option>USERGROUPS_ENAB</option> variable in
+	    <filename>/etc/login.defs</filename>.
 	  </para>
 	</listitem>
       </varlistentry>
diff --git a/man/groups.1.xml b/man/groups.1.xml
deleted file mode 100644
index dcbedbaf..00000000
--- a/man/groups.1.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   SPDX-FileCopyrightText: 1991 - 1994, Julianne Frances Haugh
-   SPDX-FileCopyrightText: 2007 - 2008, Nicolas François
-   SPDX-License-Identifier: BSD-3-Clause
--->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!-- SHADOW-CONFIG-HERE -->
-]>
-<refentry id='groups.1'>
-  <!-- $Id$ -->
-  <refentryinfo>
-    <author>
-      <firstname>Julianne Frances</firstname>
-      <surname>Haugh</surname>
-      <contrib>Creation, 1991</contrib>
-    </author>
-    <author>
-      <firstname>Thomas</firstname>
-      <surname>Kłoczko</surname>
-      <email>kloczek@pld.org.pl</email>
-      <contrib>shadow-utils maintainer, 2000 - 2007</contrib>
-    </author>
-    <author>
-      <firstname>Nicolas</firstname>
-      <surname>François</surname>
-      <email>nicolas.francois@centraliens.net</email>
-      <contrib>shadow-utils maintainer, 2007 - now</contrib>
-    </author>
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>groups</refentrytitle>
-    <manvolnum>1</manvolnum>
-    <refmiscinfo class="sectdesc">User Commands</refmiscinfo>
-    <refmiscinfo class="source">shadow-utils</refmiscinfo>
-    <refmiscinfo class="version">&SHADOW_UTILS_VERSION;</refmiscinfo>
-  </refmeta>
-  <refnamediv id='name'>
-    <refname>groups</refname>
-    <refpurpose>display current group names</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv id='synopsis'>
-    <cmdsynopsis>
-      <command>groups</command>
-      <arg choice='opt'>
-	<replaceable>user</replaceable>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1 id='description'>
-    <title>DESCRIPTION</title>
-    <para>
-      The <command>groups</command> command displays the current group names
-      or ID values. If the value does not have a corresponding entry in
-      <filename>/etc/group</filename>, the value will be displayed as the
-      numerical group value. The optional <replaceable>user</replaceable>
-      parameter will display the groups for the named user.
-    </para>
-  </refsect1>
-
-  <refsect1 id='note'>
-    <title>NOTE</title>
-    <para>
-      Systems which do not support supplementary groups (see <citerefentry>
-	<refentrytitle>initgroups</refentrytitle><manvolnum>3</manvolnum>
-      </citerefentry>) will have the
-      information from <filename>/etc/group</filename> reported. The user
-      must use <command>newgrp</command> or <command>sg</command> to change
-      his current real and effective group ID.
-    </para>
-  </refsect1>
-
-  <refsect1 id='files'>
-    <title>FILES</title>
-    <variablelist>
-      <varlistentry>
-	<term><filename>/etc/group</filename></term>
-	<listitem>
-	  <para>Group account information.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1 id='see_also'>
-    <title>SEE ALSO</title>
-    <para>
-      <citerefentry>
-	<refentrytitle>newgrp</refentrytitle><manvolnum>1</manvolnum>
-      </citerefentry>,
-      <citerefentry>
-	<refentrytitle>getgid</refentrytitle><manvolnum>2</manvolnum>
-      </citerefentry>,
-      <citerefentry>
-	<refentrytitle>getgroups</refentrytitle><manvolnum>2</manvolnum>
-      </citerefentry>,
-      <citerefentry>
-	<refentrytitle>getuid</refentrytitle><manvolnum>2</manvolnum>
-      </citerefentry>,
-      <citerefentry>
-	<refentrytitle>initgroups</refentrytitle><manvolnum>3</manvolnum>
-      </citerefentry>.
-    </para>
-  </refsect1>
-</refentry>
diff --git a/man/gshadow.5.xml b/man/gshadow.5.xml
index 7b7d560d..d4f028ae 100644
--- a/man/gshadow.5.xml
+++ b/man/gshadow.5.xml
@@ -51,7 +51,7 @@
 	<term><emphasis role="bold">group name</emphasis></term>
 	<listitem>
 	  <para>
-	    It must be a valid group name, which exist on the system.
+	    It must be a valid group name, which exists on the system.
 	  </para>
 	</listitem>
       </varlistentry>
diff --git a/man/hu/Makefile.am b/man/hu/Makefile.am
index 205bb0a8..6bf68e8a 100644
--- a/man/hu/Makefile.am
+++ b/man/hu/Makefile.am
@@ -4,7 +4,6 @@ mandir = @mandir@/hu
 man_MANS = \
 	man1/chsh.1 \
 	man1/gpasswd.1 \
-	man1/groups.1 \
 	man1/login.1 \
 	man1/newgrp.1 \
 	man1/passwd.1 \
diff --git a/man/hu/Makefile.in b/man/hu/Makefile.in
index 3ebe22bd..af80ff42 100644
--- a/man/hu/Makefile.in
+++ b/man/hu/Makefile.in
@@ -339,8 +339,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-man_MANS = man1/chsh.1 man1/gpasswd.1 man1/groups.1 man1/login.1 \
-	man1/newgrp.1 man1/passwd.1 man5/passwd.5 man1/sg.1 man1/su.1 \
+man_MANS = man1/chsh.1 man1/gpasswd.1 man1/login.1 man1/newgrp.1 \
+	man1/passwd.1 man5/passwd.5 man1/sg.1 man1/su.1 \
 	$(am__append_1)
 EXTRA_DIST = $(man_MANS)
 all: all-am
diff --git a/man/hu/man1/groups.1 b/man/hu/man1/groups.1
deleted file mode 100644
index c09a8bfd..00000000
--- a/man/hu/man1/groups.1
+++ /dev/null
@@ -1,35 +0,0 @@
-.\" SPDX-FileCopyrightText: 1991 \- 1994, Julianne Frances Haugh
-.\" SPDX-License-Identifier: BSD-3-Clause
-.\"
-.\"	$Id$
-.\"
-.TH GROUPS 1
-.SH NÉV
-groups \- kiírja a jelenlegi csoportazonosító neveket
-.SH ÁTTEKINTÉS
-.B groups
-.RI [ felhasználó ]
-.SH LEÍRÁS
-A
-.B groups
-parancs kiírja a jelenlegi csoportazonosító neveket vagy számértékeket. Ha
-nincs az értéknek megfelelő bejegyzés a \fI/etc/group\fR fájlban, akkor a
-csoport azonosító számát írja ki. Az opcionális \fIfelhasználó\fR paraméter
-esetén azokat a csoportokat írja ki, amelyekbe a megadott \fIfelhasználó\fR
-tartozik.
-.SH MEGJEGYZÉS
-Azok a rendszerek, amelyek nem támogatják a konkurrens csoportbeállításokat,
-a kiírt információkat a \fI/etc/group\fR fájlból gyűjtik. A felhasználónak
-muszáj a \fBnewgrp\fR vagy a \fBsg\fR parancsot használniuk, hogy
-megváltoztassák a jelenlegi valódi és effektív csoportazonosítójukat.
-.SH FÁJLOK
-\fI/etc/group\fR \- információ a csoportokról
-.SH LÁSD MÉG
-.BR newgrp (1),
-.BR getgid (2),
-.BR getgroups (2),
-.BR getuid (2)
-.SH AUTHOR
-Julianne Frances Haugh (jfh@tab.com)
-.SH MAGYAR FORDÍTÁS
-ifj. Dyekiss Emil <emil2@cds.hu>
diff --git a/man/id.1.xml b/man/id.1.xml
deleted file mode 100644
index 9d77330f..00000000
--- a/man/id.1.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   SPDX-FileCopyrightText: 1991       , Julianne Frances Haugh
-   SPDX-FileCopyrightText: 2007 - 2008, Nicolas François
-   SPDX-License-Identifier: BSD-3-Clause
--->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!-- SHADOW-CONFIG-HERE -->
-]>
-<refentry id='id.1'>
-  <!-- $Id$ -->
-  <refentryinfo>
-    <author>
-      <firstname>Julianne Frances</firstname>
-      <surname>Haugh</surname>
-      <contrib>Creation, 1991</contrib>
-    </author>
-    <author>
-      <firstname>Thomas</firstname>
-      <surname>Kłoczko</surname>
-      <email>kloczek@pld.org.pl</email>
-      <contrib>shadow-utils maintainer, 2000 - 2007</contrib>
-    </author>
-    <author>
-      <firstname>Nicolas</firstname>
-      <surname>François</surname>
-      <email>nicolas.francois@centraliens.net</email>
-      <contrib>shadow-utils maintainer, 2007 - now</contrib>
-    </author>
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>id</refentrytitle>
-    <manvolnum>1</manvolnum>
-    <refmiscinfo class="sectdesc">User Commands</refmiscinfo>
-    <refmiscinfo class="source">shadow-utils</refmiscinfo>
-    <refmiscinfo class="version">&SHADOW_UTILS_VERSION;</refmiscinfo>
-  </refmeta>
-  <refnamediv id='name'>
-    <refname>id</refname>
-    <refpurpose>display current user and group ID names</refpurpose>
-  </refnamediv>
-
-  <refsynopsisdiv id='synopsis'>
-    <cmdsynopsis>
-      <command>id</command>    <arg choice='opt'>-a </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-
-  <refsect1 id='description'>
-    <title>DESCRIPTION</title>
-    <para>
-      The <command>id</command> command displays the current real and
-      effective user and group ID names or values. If the value does not
-      have a corresponding entry in <filename>/etc/passwd</filename> or
-      <filename>/etc/group</filename>, the value will be displayed without
-      the corresponding name. The optional <option>-a</option> flag will
-      display the group set on systems which support supplementary groups
-      (see <citerefentry><refentrytitle>initgroups</refentrytitle>
-      <manvolnum>3</manvolnum></citerefentry>).
-    </para>
-  </refsect1>
-
-  <refsect1 id='files'>
-    <title>FILES</title>
-    <variablelist>
-      <varlistentry>
-	<term><filename>/etc/group</filename></term>
-	<listitem>
-	  <para>Group account information.</para>
-	</listitem>
-      </varlistentry>
-      <varlistentry>
-	<term><filename>/etc/passwd</filename></term>
-	<listitem>
-	  <para>User account information.</para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-
-  <refsect1 id='see_also'>
-    <title>SEE ALSO</title>
-    <para>
-      <citerefentry>
-	<refentrytitle>getgid</refentrytitle><manvolnum>2</manvolnum>
-      </citerefentry>,
-      <citerefentry>
-	<refentrytitle>getgroups</refentrytitle><manvolnum>2</manvolnum>
-      </citerefentry>,
-      <citerefentry>
-	<refentrytitle>getuid</refentrytitle><manvolnum>2</manvolnum>
-      </citerefentry>,
-      <citerefentry>
-	<refentrytitle>initgroups</refentrytitle><manvolnum>3</manvolnum>
-      </citerefentry>
-    </para>
-  </refsect1>
-</refentry>
diff --git a/man/it/Makefile.am b/man/it/Makefile.am
index b76187fa..736576c9 100644
--- a/man/it/Makefile.am
+++ b/man/it/Makefile.am
@@ -16,7 +16,6 @@ man_MANS = \
 	man8/groupdel.8 \
 	man8/groupmems.8 \
 	man8/groupmod.8 \
-	man1/groups.1 \
 	man8/grpck.8 \
 	man8/grpconv.8 \
 	man8/grpunconv.8 \
@@ -58,7 +57,6 @@ endif
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	man1/id.1 \
 	man8/sulogin.8
 
 if USE_PAM
diff --git a/man/it/Makefile.in b/man/it/Makefile.in
index 0befe2e1..2a454b6f 100644
--- a/man/it/Makefile.in
+++ b/man/it/Makefile.in
@@ -346,20 +346,20 @@ top_srcdir = @top_srcdir@
 man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
 	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
-	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
-	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man1/login.1 \
-	man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 man8/newusers.8 \
-	man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
-	man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man3/shadow.3 \
-	man5/shadow.5 man1/su.1 man5/suauth.5 man8/useradd.8 \
-	man8/userdel.8 man8/usermod.8 man8/vigr.8 man8/vipw.8 \
-	$(am__append_1) $(am__append_2)
+	man8/groupmems.8 man8/groupmod.8 man8/grpck.8 man8/grpconv.8 \
+	man8/grpunconv.8 man5/gshadow.5 man1/login.1 man5/login.defs.5 \
+	man8/logoutd.8 man1/newgrp.1 man8/newusers.8 man8/nologin.8 \
+	man1/passwd.1 man5/passwd.5 man8/pwck.8 man8/pwconv.8 \
+	man8/pwunconv.8 man1/sg.1 man3/shadow.3 man5/shadow.5 \
+	man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
+	man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1) \
+	$(am__append_2)
 man_nopam = \
 	man5/limits.5 \
 	man5/login.access.5 \
 	man5/porttime.5
 
-EXTRA_DIST = $(man_MANS) man1/id.1 man8/sulogin.8 $(am__append_3)
+EXTRA_DIST = $(man_MANS) man8/sulogin.8 $(am__append_3)
 LANG = $(notdir $(CURDIR))
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_FALSE@VENDORDIR_COND = without_vendordir
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_TRUE@VENDORDIR_COND = with_vendordir
diff --git a/man/it/man1/chage.1 b/man/it/man1/chage.1
index d97ef80a..d62a4b26 100644
--- a/man/it/man1/chage.1
+++ b/man/it/man1/chage.1
@@ -2,12 +2,12 @@
 .\"     Title: chage
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "CHAGE" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHAGE" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man1/chfn.1 b/man/it/man1/chfn.1
index 949ec372..b1661e4f 100644
--- a/man/it/man1/chfn.1
+++ b/man/it/man1/chfn.1
@@ -2,12 +2,12 @@
 .\"     Title: chfn
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "CHFN" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHFN" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man1/chsh.1 b/man/it/man1/chsh.1
index 60c0b45b..aeda0c7b 100644
--- a/man/it/man1/chsh.1
+++ b/man/it/man1/chsh.1
@@ -2,12 +2,12 @@
 .\"     Title: chsh
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "CHSH" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHSH" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man1/expiry.1 b/man/it/man1/expiry.1
index 3b2a6ff8..57abe52d 100644
--- a/man/it/man1/expiry.1
+++ b/man/it/man1/expiry.1
@@ -2,12 +2,12 @@
 .\"     Title: expiry
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "EXPIRY" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "EXPIRY" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man1/gpasswd.1 b/man/it/man1/gpasswd.1
index c5acb344..147d8600 100644
--- a/man/it/man1/gpasswd.1
+++ b/man/it/man1/gpasswd.1
@@ -2,12 +2,12 @@
 .\"     Title: gpasswd
 .\"    Author: Rafal Maszkowski
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "GPASSWD" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "GPASSWD" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man1/groups.1 b/man/it/man1/groups.1
deleted file mode 100644
index 54689f34..00000000
--- a/man/it/man1/groups.1
+++ /dev/null
@@ -1,65 +0,0 @@
-'\" t
-.\"     Title: groups
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: Italian
-.\"
-.TH "GROUPS" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NOME"
-groups \- mostra i nomi dei gruppi correnti
-.SH "SINOSSI"
-.HP \w'\fBgroups\fR\ 'u
-\fBgroups\fR [\fIuser\fR]
-.SH "DESCRIZIONE"
-.PP
-The
-\fBgroups\fR
-command displays the current group names or ID values\&. If the value does not have a corresponding entry in
-/etc/group, the value will be displayed as the numerical group value\&. The optional
-\fIuser\fR
-parameter will display the groups for the named user\&.
-.SH "NOTA"
-.PP
-Systems which do not support supplementary groups (see
-\fBinitgroups\fR(3)) will have the information from
-/etc/group
-reported\&. The user must use
-\fBnewgrp\fR
-or
-\fBsg\fR
-to change his current real and effective group ID\&.
-.SH "FILE"
-.PP
-/etc/group
-.RS 4
-Informazioni sugli account di gruppo\&.
-.RE
-.SH "VEDERE ANCHE"
-.PP
-\fBnewgrp\fR(1),
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)\&.
diff --git a/man/it/man1/id.1 b/man/it/man1/id.1
deleted file mode 100644
index ad56689e..00000000
--- a/man/it/man1/id.1
+++ /dev/null
@@ -1,62 +0,0 @@
-'\" t
-.\"     Title: id
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: Italian
-.\"
-.TH "ID" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NOME"
-id \- display current user and group ID names
-.SH "SINOSSI"
-.HP \w'\fBid\fR\ 'u
-\fBid\fR [\-a]
-.SH "DESCRIZIONE"
-.PP
-The
-\fBid\fR
-command displays the current real and effective user and group ID names or values\&. If the value does not have a corresponding entry in
-/etc/passwd
-or
-/etc/group, the value will be displayed without the corresponding name\&. The optional
-\fB\-a\fR
-flag will display the group set on systems which support supplementary groups (see
-\fBinitgroups\fR(3))\&.
-.SH "FILE"
-.PP
-/etc/group
-.RS 4
-Informazioni sugli account di gruppo\&.
-.RE
-.PP
-/etc/passwd
-.RS 4
-Informazioni sugli account utente\&.
-.RE
-.SH "VEDERE ANCHE"
-.PP
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)
diff --git a/man/it/man1/login.1 b/man/it/man1/login.1
index 4b2f2be4..8eef4104 100644
--- a/man/it/man1/login.1
+++ b/man/it/man1/login.1
@@ -2,12 +2,12 @@
 .\"     Title: login
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "LOGIN" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "LOGIN" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man1/newgrp.1 b/man/it/man1/newgrp.1
index 861c5290..f3f2cca4 100644
--- a/man/it/man1/newgrp.1
+++ b/man/it/man1/newgrp.1
@@ -2,12 +2,12 @@
 .\"     Title: newgrp
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "NEWGRP" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "NEWGRP" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man1/passwd.1 b/man/it/man1/passwd.1
index 6a4d58d9..d56e4cdc 100644
--- a/man/it/man1/passwd.1
+++ b/man/it/man1/passwd.1
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "PASSWD" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "PASSWD" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -110,7 +110,7 @@ Blocca la password dell\*(Aqaccount indicato\&. Questa opzione disabilita una pa
 .sp
 Note that this does not disable the account\&. The user may still be able to login using another authentication token (e\&.g\&. an SSH key)\&. To disable the account, administrators should use
 \fBusermod \-\-expiredate 1\fR
-(this set the account\*(Aqs expire date to Jan 2, 1970)\&.
+(this sets the account\*(Aqs expire date to Jan 2, 1970)\&.
 .sp
 Gli utenti con password bloccata non la possono cambiare\&.
 .RE
diff --git a/man/it/man1/sg.1 b/man/it/man1/sg.1
index 0331f9f2..6ef49bfa 100644
--- a/man/it/man1/sg.1
+++ b/man/it/man1/sg.1
@@ -2,12 +2,12 @@
 .\"     Title: sg
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "SG" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "SG" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man1/su.1 b/man/it/man1/su.1
index 82fea5ab..1b6f6ffb 100644
--- a/man/it/man1/su.1
+++ b/man/it/man1/su.1
@@ -2,12 +2,12 @@
 .\"     Title: su
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "SU" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "SU" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man3/shadow.3 b/man/it/man3/shadow.3
index 4ef99318..74b73ce8 100644
--- a/man/it/man3/shadow.3
+++ b/man/it/man3/shadow.3
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: Library Calls
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "SHADOW" "3" "18/06/2024" "shadow\-utils 4\&.16\&.0" "Library Calls"
+.TH "SHADOW" "3" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "Library Calls"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man5/faillog.5 b/man/it/man5/faillog.5
index 7da3061e..16e94945 100644
--- a/man/it/man5/faillog.5
+++ b/man/it/man5/faillog.5
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual:  File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "FAILLOG" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuratio"
+.TH "FAILLOG" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuratio"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man5/gshadow.5 b/man/it/man5/gshadow.5
index f1824528..fef54e73 100644
--- a/man/it/man5/gshadow.5
+++ b/man/it/man5/gshadow.5
@@ -2,12 +2,12 @@
 .\"     Title: gshadow
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "GSHADOW" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "GSHADOW" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ Ogni riga di questo file contiene questi campi separati da due punti:
 .PP
 \fBgroup name\fR
 .RS 4
-Deve essere un nome di gruppo valido, che esista nel sistema\&.
+It must be a valid group name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/it/man5/limits.5 b/man/it/man5/limits.5
index 8133f858..1201da8e 100644
--- a/man/it/man5/limits.5
+++ b/man/it/man5/limits.5
@@ -2,12 +2,12 @@
 .\"     Title: limits
 .\"    Author: Luca Berra
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "LIMITS" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LIMITS" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man5/login.access.5 b/man/it/man5/login.access.5
index dc1a8cb6..aeb43d69 100644
--- a/man/it/man5/login.access.5
+++ b/man/it/man5/login.access.5
@@ -2,12 +2,12 @@
 .\"     Title: login.access
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "LOGIN\&.ACCESS" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LOGIN\&.ACCESS" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man5/login.defs.5 b/man/it/man5/login.defs.5
index 4acd0a7f..54654429 100644
--- a/man/it/man5/login.defs.5
+++ b/man/it/man5/login.defs.5
@@ -2,12 +2,12 @@
 .\"     Title: login.defs
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "LOGIN\&.DEFS" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LOGIN\&.DEFS" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man5/passwd.5 b/man/it/man5/passwd.5
index 6cddc71a..d3676a25 100644
--- a/man/it/man5/passwd.5
+++ b/man/it/man5/passwd.5
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "PASSWD" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "PASSWD" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man5/porttime.5 b/man/it/man5/porttime.5
index ca123a90..875545cd 100644
--- a/man/it/man5/porttime.5
+++ b/man/it/man5/porttime.5
@@ -2,12 +2,12 @@
 .\"     Title: porttime
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "PORTTIME" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "PORTTIME" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man5/shadow.5 b/man/it/man5/shadow.5
index 13bc23cc..b2ca16a5 100644
--- a/man/it/man5/shadow.5
+++ b/man/it/man5/shadow.5
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "SHADOW" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SHADOW" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ Each line of this file contains 9 fields, separated by colons (\(Fo:\(Fc), in th
 .PP
 \fBlogin name\fR
 .RS 4
-Deve essere un nome valido di un account esistente nel sistema\&.
+It must be a valid account name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/it/man5/suauth.5 b/man/it/man5/suauth.5
index 7192c2e0..af126162 100644
--- a/man/it/man5/suauth.5
+++ b/man/it/man5/suauth.5
@@ -2,12 +2,12 @@
 .\"     Title: suauth
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "SUAUTH" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SUAUTH" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/chgpasswd.8 b/man/it/man8/chgpasswd.8
index 7581baaf..64f5bdd4 100644
--- a/man/it/man8/chgpasswd.8
+++ b/man/it/man8/chgpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: chgpasswd
 .\"    Author: Thomas K\(/loczko <kloczek@pld.org.pl>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "CHGPASSWD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "CHGPASSWD" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/chpasswd.8 b/man/it/man8/chpasswd.8
index 9fabaf70..78192442 100644
--- a/man/it/man8/chpasswd.8
+++ b/man/it/man8/chpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: chpasswd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "CHPASSWD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "CHPASSWD" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/faillog.8 b/man/it/man8/faillog.8
index 63923bd6..de0847be 100644
--- a/man/it/man8/faillog.8
+++ b/man/it/man8/faillog.8
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "FAILLOG" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "FAILLOG" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/groupadd.8 b/man/it/man8/groupadd.8
index 08e01d7b..d487e431 100644
--- a/man/it/man8/groupadd.8
+++ b/man/it/man8/groupadd.8
@@ -2,12 +2,12 @@
 .\"     Title: groupadd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "GROUPADD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPADD" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -146,7 +146,7 @@ Apply changes to configuration files under the root filesystem found under the d
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
 \fB\-g\fR,
diff --git a/man/it/man8/groupdel.8 b/man/it/man8/groupdel.8
index cc1b023d..047ebd16 100644
--- a/man/it/man8/groupdel.8
+++ b/man/it/man8/groupdel.8
@@ -2,12 +2,12 @@
 .\"     Title: groupdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "GROUPDEL" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPDEL" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/groupmems.8 b/man/it/man8/groupmems.8
index 8e5af40f..744a0365 100644
--- a/man/it/man8/groupmems.8
+++ b/man/it/man8/groupmems.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmems
 .\"    Author: George Kraft, IV
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "GROUPMEMS" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPMEMS" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/groupmod.8 b/man/it/man8/groupmod.8
index a604a39c..0eb23a73 100644
--- a/man/it/man8/groupmod.8
+++ b/man/it/man8/groupmod.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "GROUPMOD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPMOD" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@ The options which apply to the
 \fBgroupmod\fR
 command are:
 .PP
-\fB\-a\fR, \fB\-\-append\fR\ \&\fIGID\fR
+\fB\-a\fR, \fB\-\-append\fR
 .RS 4
 If group members are specified with \-U, append them to the existing member list, rather than replacing it\&.
 .RE
@@ -131,11 +131,11 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
-\fB\-g\fR,
-\fB\-N\fR, and
+\fB\-g\fR
+and
 \fB\-U\fR
 options are not specified) is defined by the
 \fBUSERGROUPS_ENAB\fR
diff --git a/man/it/man8/grpck.8 b/man/it/man8/grpck.8
index 642c2370..c9ea89d8 100644
--- a/man/it/man8/grpck.8
+++ b/man/it/man8/grpck.8
@@ -2,12 +2,12 @@
 .\"     Title: grpck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "GRPCK" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GRPCK" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/lastlog.8 b/man/it/man8/lastlog.8
index 7fbd044d..de1c7bb1 100644
--- a/man/it/man8/lastlog.8
+++ b/man/it/man8/lastlog.8
@@ -2,12 +2,12 @@
 .\"     Title: lastlog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "LASTLOG" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LASTLOG" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/logoutd.8 b/man/it/man8/logoutd.8
index 621758eb..650d2bec 100644
--- a/man/it/man8/logoutd.8
+++ b/man/it/man8/logoutd.8
@@ -2,12 +2,12 @@
 .\"     Title: logoutd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "LOGOUTD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LOGOUTD" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/newusers.8 b/man/it/man8/newusers.8
index 197000a5..bf192a64 100644
--- a/man/it/man8/newusers.8
+++ b/man/it/man8/newusers.8
@@ -2,12 +2,12 @@
 .\"     Title: newusers
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "NEWUSERS" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "NEWUSERS" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/nologin.8 b/man/it/man8/nologin.8
index 235f0c56..96620afa 100644
--- a/man/it/man8/nologin.8
+++ b/man/it/man8/nologin.8
@@ -2,12 +2,12 @@
 .\"     Title: nologin
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "NOLOGIN" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "NOLOGIN" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/pwck.8 b/man/it/man8/pwck.8
index e396f5cc..f139a525 100644
--- a/man/it/man8/pwck.8
+++ b/man/it/man8/pwck.8
@@ -2,12 +2,12 @@
 .\"     Title: pwck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "PWCK" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "PWCK" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/pwconv.8 b/man/it/man8/pwconv.8
index 3c3742bd..24274b47 100644
--- a/man/it/man8/pwconv.8
+++ b/man/it/man8/pwconv.8
@@ -2,12 +2,12 @@
 .\"     Title: pwconv
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "PWCONV" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "PWCONV" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/sulogin.8 b/man/it/man8/sulogin.8
index 93ff447e..5a3e3cc2 100644
--- a/man/it/man8/sulogin.8
+++ b/man/it/man8/sulogin.8
@@ -2,12 +2,12 @@
 .\"     Title: sulogin
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "SULOGIN" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "SULOGIN" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/useradd.8 b/man/it/man8/useradd.8
index 08a686b5..3a1c6a51 100644
--- a/man/it/man8/useradd.8
+++ b/man/it/man8/useradd.8
@@ -2,12 +2,12 @@
 .\"     Title: useradd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "USERADD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERADD" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/userdel.8 b/man/it/man8/userdel.8
index b73ace96..ca19bddd 100644
--- a/man/it/man8/userdel.8
+++ b/man/it/man8/userdel.8
@@ -2,12 +2,12 @@
 .\"     Title: userdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "USERDEL" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERDEL" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -46,15 +46,7 @@ command are:
 .PP
 \fB\-f\fR, \fB\-\-force\fR
 .RS 4
-This option forces the removal of the user account, even if the user is still logged in\&. It also forces
-\fBuserdel\fR
-to remove the user\*(Aqs home directory and mail spool, even if another user uses the same home directory or if the mail spool is not owned by the specified user\&. If
-\fBUSERGROUPS_ENAB\fR
-is defined to
-\fIyes\fR
-in
-/etc/login\&.defs
-and if a group exists with the same name as the deleted user, then this group will be removed, even if it is still the primary group of another user\&.
+This option forces the removal of the user account and any other requested actions, skipping any safety checks\&.
 .sp
 \fINote:\fR
 This option is dangerous and may leave your system in an inconsistent state\&.
diff --git a/man/it/man8/usermod.8 b/man/it/man8/usermod.8
index 0c1b10b3..c368b272 100644
--- a/man/it/man8/usermod.8
+++ b/man/it/man8/usermod.8
@@ -2,12 +2,12 @@
 .\"     Title: usermod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "USERMOD" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERMOD" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/it/man8/vipw.8 b/man/it/man8/vipw.8
index 04f21cf5..dc321789 100644
--- a/man/it/man8/vipw.8
+++ b/man/it/man8/vipw.8
@@ -2,12 +2,12 @@
 .\"     Title: vipw
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Italian
 .\"
-.TH "VIPW" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "VIPW" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ja/Makefile.am b/man/ja/Makefile.am
index 13f18da1..b759726c 100644
--- a/man/ja/Makefile.am
+++ b/man/ja/Makefile.am
@@ -13,7 +13,6 @@ man_MANS = \
 	man8/groupadd.8 \
 	man8/groupdel.8 \
 	man8/groupmod.8 \
-	man1/groups.1 \
 	man8/grpck.8 \
 	man8/grpconv.8 \
 	man8/grpunconv.8 \
@@ -52,7 +51,6 @@ endif
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	man1/id.1 \
 	man3/shadow.3 \
 	man8/sulogin.8
 
diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in
index 8dc98836..9e4207df 100644
--- a/man/ja/Makefile.in
+++ b/man/ja/Makefile.in
@@ -343,20 +343,19 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \
 	man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \
-	man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/groups.1 \
-	man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man1/login.1 \
-	man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 man8/newusers.8 \
-	man1/passwd.1 man5/passwd.5 man8/pwck.8 man8/pwconv.8 \
-	man8/pwunconv.8 man1/sg.1 man5/shadow.5 man1/su.1 \
-	man5/suauth.5 man8/useradd.8 man8/userdel.8 man8/usermod.8 \
-	man8/vigr.8 man8/vipw.8 $(am__append_1) $(am__append_2)
+	man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man8/grpck.8 \
+	man8/grpconv.8 man8/grpunconv.8 man1/login.1 man5/login.defs.5 \
+	man8/logoutd.8 man1/newgrp.1 man8/newusers.8 man1/passwd.1 \
+	man5/passwd.5 man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 \
+	man1/sg.1 man5/shadow.5 man1/su.1 man5/suauth.5 man8/useradd.8 \
+	man8/userdel.8 man8/usermod.8 man8/vigr.8 man8/vipw.8 \
+	$(am__append_1) $(am__append_2)
 man_nopam = \
 	man5/limits.5 \
 	man5/login.access.5 \
 	man5/porttime.5
 
-EXTRA_DIST = $(man_MANS) man1/id.1 man3/shadow.3 man8/sulogin.8 \
-	$(am__append_3)
+EXTRA_DIST = $(man_MANS) man3/shadow.3 man8/sulogin.8 $(am__append_3)
 all: all-am
 
 .SUFFIXES:
diff --git a/man/ja/man1/groups.1 b/man/ja/man1/groups.1
deleted file mode 100644
index d316afee..00000000
--- a/man/ja/man1/groups.1
+++ /dev/null
@@ -1,39 +0,0 @@
-.\" SPDX-FileCopyrightText: 1991 - 1994 Julianne Frances Haugh
-.\" SPDX-FileCopyrightText: Copyright (c) 2001 Maki KURODA
-.\" SPDX-License-Identifier: BSD-3-Clause
-.\" Translated Tue Oct 30 11:58:18 JST 2001 by Maki KURODA <mkuroda@aisys\-jp.com>
-.\" Modified Tue 16 Sep 2002 by NAKANO Takeo <nakano@apm.seikei.ac.jp>
-.\"
-.\" $Id$
-.\"
-.\"WORD:	concurrent group set	同時所属グループ集合
-.\"WORD:	real group ID		実グループ ID
-.\"WORD:	effective group ID	実効グループ ID
-.\"
-.TH GROUPS 1
-.SH 名前
-groups \- 現在のグループ名の表示
-.SH 書式
-\fBgroups\fR [\fIuser\fR]
-.SH 説明
-.B groups
-は現在のグループの名前または ID 値を表示する。
-ID 値に対応する名前が \fI/etc/group\fR に登録されていなければ、
-数値のグループ ID で表示される。
-パラメータとして \fIuser\fR を与えると、
-指定した \fIuser\fR が所属するグループ名を表示する。
-.SH 注意
-同時所属グループ集合 (concurrent group set)
-をサポートしていないシステムでは、
-\fI/etc/group\fR の情報が報告される。
-ユーザが現在の実グループ ID や実効グループ ID を変更するには、
-\fBnewgrp\fR や \fBsg\fR を使用しなければならない。
-.SH ファイル
-/etc/group \- グループ情報
-.SH 関連項目
-.BR newgrp (1),
-.BR getuid (2),
-.BR getgid (2),
-.BR getgroups (2)
-.SH 著者
-Julianne Frances Haugh <julie78787@gmail.com>
diff --git a/man/ja/man1/id.1 b/man/ja/man1/id.1
deleted file mode 100644
index 3f15aa2b..00000000
--- a/man/ja/man1/id.1
+++ /dev/null
@@ -1,33 +0,0 @@
-.\" SPDX-FileCopyrightText: 1991 Julianne Frances Haugh
-.\" SPDX-FileCopyrightText: Copyright (c) 2000 ISHIKAWA Keisuke
-.\" SPDX-License-Identifier: BSD-3-Clause
-.\"
-.\" Translated Thu Nov  9 23:17:10 JST 2000
-.\"         by ISHIKAWA Keisuke
-.\" Modified Tue 16 Sep 2002 by NAKANO Takeo <nakano@apm.seikei.ac.jp>
-.\"
-.\" $Id$
-.\"
-.TH ID 1
-.SH 名前
-id \- 現在のユーザ ID 名とグループ ID 名を表示する
-.SH 書式
-\fBid\fR [\fB\-a\fR]
-.SH 説明
-\fBid\fRは、現在の実ユーザ ID、実効ユーザ ID、実グループ ID、
-実効グループ ID の名前または値を表示する。
-値に対応するエントリが \fI/etc/passwd\fR や
-\fI/etc/group\fR に存在しない場合は、
-対応する名前は表示されずに値だけが表示される。
-ユーザが同時に複数のグループのメンバーになれるシステムでは、
-\fB\-a\fR オプションを指定するとグループの集合が表示される。
-.SH ファイル
-\fI/etc/passwd\fR \- ユーザーアカウント情報
-.br
-\fI/etc/group\fR \ \- グループ情報
-.SH 関連項目
-.BR getgid (2),
-.BR getgroups (2),
-.BR getuid (2)
-.SH 著者
-Julianne Frances Haugh <julie78787@gmail.com>
diff --git a/man/ko/Makefile.am b/man/ko/Makefile.am
index c269f0bb..4f73651b 100644
--- a/man/ko/Makefile.am
+++ b/man/ko/Makefile.am
@@ -4,7 +4,6 @@ mandir = @mandir@/ko
 man_MANS = \
 	man1/chfn.1 \
 	man1/chsh.1 \
-	man1/groups.1 \
 	man1/login.1 \
 	man5/passwd.5 \
 	man1/su.1 \
diff --git a/man/ko/Makefile.in b/man/ko/Makefile.in
index 6bd0da2a..eccffc5c 100644
--- a/man/ko/Makefile.in
+++ b/man/ko/Makefile.in
@@ -341,7 +341,6 @@ top_srcdir = @top_srcdir@
 man_MANS = \
 	man1/chfn.1 \
 	man1/chsh.1 \
-	man1/groups.1 \
 	man1/login.1 \
 	man5/passwd.5 \
 	man1/su.1 \
diff --git a/man/ko/man1/groups.1 b/man/ko/man1/groups.1
deleted file mode 100644
index d407d3de..00000000
--- a/man/ko/man1/groups.1
+++ /dev/null
@@ -1,32 +0,0 @@
-.\"$Id$
-.TH GROUPS 1L "GNU 쉘 유틸리티" "FSF" \" \-*\- nroff \-*\-
-.SH 이름
-groups \- 사용자가 속한 그룹들을 출력한다
-.SH 개요
-.B groups
-[사용자명...]
-.br
-.B groups
-{\-\-help,\-\-version}
-.SH 설명
-이 맨페이지는 GNU 버전의
-.BR groups 
-를 다룬다.
-.B groups
-는 주어진 각 
-.IR username
-또는 프로세스
-가 속한 추가 그룹의 이름을 출력해준다.
-만약 사용자명이 주어졌다면 각 사용자명이 소속된 그룹 목록 앞에 표시된다.
-.PP
-그룹 목록은 `id \-Gn'의 결과와 같다.
-.SS 옵션
-GNU
-.B groups
-가 단 한 개의 인수를 가지고 실행되면 다음 옵션들을 인식한다:
-.TP
-.I "\-\-help"
-표준출력으로 사용법을 출력하고 정상적으로 종료한다.
-.TP
-.I "\-\-version"
-표준출력으로 버전정보를 출력하고 정상적으로 종료한다.
diff --git a/man/login.defs.5.xml b/man/login.defs.5.xml
index 05ef5125..7263395c 100644
--- a/man/login.defs.5.xml
+++ b/man/login.defs.5.xml
@@ -326,7 +326,6 @@
 	  <para>MAX_MEMBERS_PER_GROUP</para>
 	</listitem>
       </varlistentry>
-      <!-- groups: no variables -->
       <varlistentry>
 	<term>grpck</term>
 	<listitem>
diff --git a/man/login.defs.d/TTYGROUP.xml b/man/login.defs.d/TTYGROUP.xml
index 8e0a9e87..fba16173 100644
--- a/man/login.defs.d/TTYGROUP.xml
+++ b/man/login.defs.d/TTYGROUP.xml
@@ -6,7 +6,7 @@
 -->
 <varlistentry>
   <term><option>TTYGROUP</option> (string)</term>
-  <term><option>TTYPERM</option> (string)</term>
+  <term><option>TTYPERM</option> (number)</term>
   <listitem>
     <para>
       The terminal permissions: the login tty will be owned by the
diff --git a/man/man1/chage.1 b/man/man1/chage.1
index d8dcaa77..064296ec 100644
--- a/man/man1/chage.1
+++ b/man/man1/chage.1
@@ -2,12 +2,12 @@
 .\"     Title: chage
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "CHAGE" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHAGE" "1" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man1/chfn.1 b/man/man1/chfn.1
index 4df59524..1a994bef 100644
--- a/man/man1/chfn.1
+++ b/man/man1/chfn.1
@@ -2,12 +2,12 @@
 .\"     Title: chfn
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "CHFN" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHFN" "1" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man1/chsh.1 b/man/man1/chsh.1
index 797f4757..ea7e60f2 100644
--- a/man/man1/chsh.1
+++ b/man/man1/chsh.1
@@ -2,12 +2,12 @@
 .\"     Title: chsh
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "CHSH" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHSH" "1" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man1/expiry.1 b/man/man1/expiry.1
index f24de71f..80244fd7 100644
--- a/man/man1/expiry.1
+++ b/man/man1/expiry.1
@@ -2,12 +2,12 @@
 .\"     Title: expiry
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "EXPIRY" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "EXPIRY" "1" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man1/getsubids.1 b/man/man1/getsubids.1
index 9d5c56bf..348a01ef 100644
--- a/man/man1/getsubids.1
+++ b/man/man1/getsubids.1
@@ -2,12 +2,12 @@
 .\"     Title: getsubids
 .\"    Author: Iker Pedrosa
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "GETSUBIDS" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "GETSUBIDS" "1" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man1/gpasswd.1 b/man/man1/gpasswd.1
index 4eec98e7..f0089734 100644
--- a/man/man1/gpasswd.1
+++ b/man/man1/gpasswd.1
@@ -2,12 +2,12 @@
 .\"     Title: gpasswd
 .\"    Author: Rafal Maszkowski
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "GPASSWD" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "GPASSWD" "1" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man1/groups.1 b/man/man1/groups.1
deleted file mode 100644
index dd517c03..00000000
--- a/man/man1/groups.1
+++ /dev/null
@@ -1,65 +0,0 @@
-'\" t
-.\"     Title: groups
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: English
-.\"
-.TH "GROUPS" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-groups \- display current group names
-.SH "SYNOPSIS"
-.HP \w'\fBgroups\fR\ 'u
-\fBgroups\fR [\fIuser\fR]
-.SH "DESCRIPTION"
-.PP
-The
-\fBgroups\fR
-command displays the current group names or ID values\&. If the value does not have a corresponding entry in
-/etc/group, the value will be displayed as the numerical group value\&. The optional
-\fIuser\fR
-parameter will display the groups for the named user\&.
-.SH "NOTE"
-.PP
-Systems which do not support supplementary groups (see
-\fBinitgroups\fR(3)) will have the information from
-/etc/group
-reported\&. The user must use
-\fBnewgrp\fR
-or
-\fBsg\fR
-to change his current real and effective group ID\&.
-.SH "FILES"
-.PP
-/etc/group
-.RS 4
-Group account information\&.
-.RE
-.SH "SEE ALSO"
-.PP
-\fBnewgrp\fR(1),
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)\&.
diff --git a/man/man1/id.1 b/man/man1/id.1
deleted file mode 100644
index f3a8eef4..00000000
--- a/man/man1/id.1
+++ /dev/null
@@ -1,62 +0,0 @@
-'\" t
-.\"     Title: id
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: English
-.\"
-.TH "ID" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-id \- display current user and group ID names
-.SH "SYNOPSIS"
-.HP \w'\fBid\fR\ 'u
-\fBid\fR [\-a]
-.SH "DESCRIPTION"
-.PP
-The
-\fBid\fR
-command displays the current real and effective user and group ID names or values\&. If the value does not have a corresponding entry in
-/etc/passwd
-or
-/etc/group, the value will be displayed without the corresponding name\&. The optional
-\fB\-a\fR
-flag will display the group set on systems which support supplementary groups (see
-\fBinitgroups\fR(3))\&.
-.SH "FILES"
-.PP
-/etc/group
-.RS 4
-Group account information\&.
-.RE
-.PP
-/etc/passwd
-.RS 4
-User account information\&.
-.RE
-.SH "SEE ALSO"
-.PP
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)
diff --git a/man/man1/login.1 b/man/man1/login.1
index 008d5b04..2a4c4ac0 100644
--- a/man/man1/login.1
+++ b/man/man1/login.1
@@ -2,12 +2,12 @@
 .\"     Title: login
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "LOGIN" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "LOGIN" "1" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -363,7 +363,7 @@ Enable setting of resource limits from
 and ulimit, umask, and niceness from the user\*(Aqs passwd gecos field\&.
 .RE
 .PP
-\fBTTYGROUP\fR (string), \fBTTYPERM\fR (string)
+\fBTTYGROUP\fR (string), \fBTTYPERM\fR (number)
 .RS 4
 The terminal permissions: the login tty will be owned by the
 \fBTTYGROUP\fR
diff --git a/man/man1/newgidmap.1 b/man/man1/newgidmap.1
index 63ee7ec4..b888eb72 100644
--- a/man/man1/newgidmap.1
+++ b/man/man1/newgidmap.1
@@ -2,12 +2,12 @@
 .\"     Title: newgidmap
 .\"    Author: Eric Biederman
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "NEWGIDMAP" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "NEWGIDMAP" "1" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man1/newgrp.1 b/man/man1/newgrp.1
index 13421ced..049e4625 100644
--- a/man/man1/newgrp.1
+++ b/man/man1/newgrp.1
@@ -2,12 +2,12 @@
 .\"     Title: newgrp
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "NEWGRP" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "NEWGRP" "1" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man1/newuidmap.1 b/man/man1/newuidmap.1
index d83a1c19..624a601c 100644
--- a/man/man1/newuidmap.1
+++ b/man/man1/newuidmap.1
@@ -2,12 +2,12 @@
 .\"     Title: newuidmap
 .\"    Author: Eric Biederman
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "NEWUIDMAP" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "NEWUIDMAP" "1" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man1/passwd.1 b/man/man1/passwd.1
index b61d5a27..d33278bc 100644
--- a/man/man1/passwd.1
+++ b/man/man1/passwd.1
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "PASSWD" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "PASSWD" "1" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -110,7 +110,7 @@ Lock the password of the named account\&. This option disables a password by cha
 .sp
 Note that this does not disable the account\&. The user may still be able to login using another authentication token (e\&.g\&. an SSH key)\&. To disable the account, administrators should use
 \fBusermod \-\-expiredate 1\fR
-(this set the account\*(Aqs expire date to Jan 2, 1970)\&.
+(this sets the account\*(Aqs expire date to Jan 2, 1970)\&.
 .sp
 Users with a locked password are not allowed to change their password\&.
 .RE
diff --git a/man/man1/sg.1 b/man/man1/sg.1
index d01ff179..9f3b42e8 100644
--- a/man/man1/sg.1
+++ b/man/man1/sg.1
@@ -2,12 +2,12 @@
 .\"     Title: sg
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "SG" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "SG" "1" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man1/su.1 b/man/man1/su.1
index 76ea7b53..3814a281 100644
--- a/man/man1/su.1
+++ b/man/man1/su.1
@@ -2,12 +2,12 @@
 .\"     Title: su
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "SU" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "SU" "1" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man3/shadow.3 b/man/man3/shadow.3
index d4fd7804..30349c60 100644
--- a/man/man3/shadow.3
+++ b/man/man3/shadow.3
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: Library Calls
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "SHADOW" "3" "06/18/2024" "shadow\-utils 4\&.16\&.0" "Library Calls"
+.TH "SHADOW" "3" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "Library Calls"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man5/faillog.5 b/man/man5/faillog.5
index bf24bb36..83cccf08 100644
--- a/man/man5/faillog.5
+++ b/man/man5/faillog.5
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual:  File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "FAILLOG" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuratio"
+.TH "FAILLOG" "5" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuratio"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man5/gshadow.5 b/man/man5/gshadow.5
index 73080938..2b621f25 100644
--- a/man/man5/gshadow.5
+++ b/man/man5/gshadow.5
@@ -2,12 +2,12 @@
 .\"     Title: gshadow
 .\"    Author: Nicolas François <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "GSHADOW" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "GSHADOW" "5" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ Each line of this file contains the following colon\-separated fields:
 .PP
 \fBgroup name\fR
 .RS 4
-It must be a valid group name, which exist on the system\&.
+It must be a valid group name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/man5/limits.5 b/man/man5/limits.5
index ada9ba93..58687b3f 100644
--- a/man/man5/limits.5
+++ b/man/man5/limits.5
@@ -2,12 +2,12 @@
 .\"     Title: limits
 .\"    Author: Luca Berra
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "LIMITS" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LIMITS" "5" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man5/login.access.5 b/man/man5/login.access.5
index afc87ef2..9df3eaba 100644
--- a/man/man5/login.access.5
+++ b/man/man5/login.access.5
@@ -2,12 +2,12 @@
 .\"     Title: login.access
 .\"    Author: Marek Michałkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "LOGIN\&.ACCESS" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LOGIN\&.ACCESS" "5" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man5/login.defs.5 b/man/man5/login.defs.5
index 41ab36c5..0cde9b00 100644
--- a/man/man5/login.defs.5
+++ b/man/man5/login.defs.5
@@ -2,12 +2,12 @@
 .\"     Title: login.defs
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "LOGIN\&.DEFS" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LOGIN\&.DEFS" "5" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -588,7 +588,7 @@ Enable "syslog" logging of
 activity \- in addition to sulog file logging\&.
 .RE
 .PP
-\fBTTYGROUP\fR (string), \fBTTYPERM\fR (string)
+\fBTTYGROUP\fR (string), \fBTTYPERM\fR (number)
 .RS 4
 The terminal permissions: the login tty will be owned by the
 \fBTTYGROUP\fR
diff --git a/man/man5/passwd.5 b/man/man5/passwd.5
index 8d21dbe9..791474fe 100644
--- a/man/man5/passwd.5
+++ b/man/man5/passwd.5
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "PASSWD" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "PASSWD" "5" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man5/porttime.5 b/man/man5/porttime.5
index 30542b7f..f026c2d2 100644
--- a/man/man5/porttime.5
+++ b/man/man5/porttime.5
@@ -2,12 +2,12 @@
 .\"     Title: porttime
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "PORTTIME" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "PORTTIME" "5" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man5/shadow.5 b/man/man5/shadow.5
index 5c346adb..c6d5d7d7 100644
--- a/man/man5/shadow.5
+++ b/man/man5/shadow.5
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "SHADOW" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SHADOW" "5" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ Each line of this file contains 9 fields, separated by colons (\(lq:\(rq), in th
 .PP
 \fBlogin name\fR
 .RS 4
-It must be a valid account name, which exist on the system\&.
+It must be a valid account name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/man5/suauth.5 b/man/man5/suauth.5
index 7bc2525c..693b5f0b 100644
--- a/man/man5/suauth.5
+++ b/man/man5/suauth.5
@@ -2,12 +2,12 @@
 .\"     Title: suauth
 .\"    Author: Marek Michałkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "SUAUTH" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SUAUTH" "5" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man5/subgid.5 b/man/man5/subgid.5
index a6fb69bb..d16ea934 100644
--- a/man/man5/subgid.5
+++ b/man/man5/subgid.5
@@ -2,12 +2,12 @@
 .\"     Title: subgid
 .\"    Author: Eric Biederman
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "SUBGID" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SUBGID" "5" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,9 @@ configures the delegation of gids to
 \fIfiles\fR\&.
 .PP
 Note, that
-\fBgroupadd\fR
+\fBnewusers\fR,
+\fBuseradd\fR, and
+\fBusermod\fR
 will only create entries in
 /etc/subgid
 if subid delegation is managed via subid files\&.
diff --git a/man/man5/subuid.5 b/man/man5/subuid.5
index 0a6c767a..34b9b1f5 100644
--- a/man/man5/subuid.5
+++ b/man/man5/subuid.5
@@ -2,12 +2,12 @@
 .\"     Title: subuid
 .\"    Author: Eric Biederman
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "SUBUID" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SUBUID" "5" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,9 @@ configures the delegation of uids to
 \fIfiles\fR\&.
 .PP
 Note, that
-\fBuseradd\fR
+\fBnewusers\fR,
+\fBuseradd\fR, and
+\fBusermod\fR
 will only create entries in
 /etc/subuid
 if subid delegation is managed via subid files\&.
diff --git a/man/man8/chgpasswd.8 b/man/man8/chgpasswd.8
index 406c2498..af191676 100644
--- a/man/man8/chgpasswd.8
+++ b/man/man8/chgpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: chgpasswd
 .\"    Author: Thomas Kłoczko <kloczek@pld.org.pl>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "CHGPASSWD" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "CHGPASSWD" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/chpasswd.8 b/man/man8/chpasswd.8
index b9b900d8..e95e1a98 100644
--- a/man/man8/chpasswd.8
+++ b/man/man8/chpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: chpasswd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "CHPASSWD" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "CHPASSWD" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/faillog.8 b/man/man8/faillog.8
index 74ec070e..3aa06c57 100644
--- a/man/man8/faillog.8
+++ b/man/man8/faillog.8
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "FAILLOG" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "FAILLOG" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/groupadd.8 b/man/man8/groupadd.8
index 32650f91..c7158097 100644
--- a/man/man8/groupadd.8
+++ b/man/man8/groupadd.8
@@ -2,12 +2,12 @@
 .\"     Title: groupadd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "GROUPADD" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPADD" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -146,7 +146,7 @@ Apply changes to configuration files under the root filesystem found under the d
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
 \fB\-g\fR,
diff --git a/man/man8/groupdel.8 b/man/man8/groupdel.8
index cd811bb9..d831a70f 100644
--- a/man/man8/groupdel.8
+++ b/man/man8/groupdel.8
@@ -2,12 +2,12 @@
 .\"     Title: groupdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "GROUPDEL" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPDEL" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/groupmems.8 b/man/man8/groupmems.8
index eeca2029..97d14d48 100644
--- a/man/man8/groupmems.8
+++ b/man/man8/groupmems.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmems
 .\"    Author: George Kraft, IV
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "GROUPMEMS" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPMEMS" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/groupmod.8 b/man/man8/groupmod.8
index bc95b038..86a25266 100644
--- a/man/man8/groupmod.8
+++ b/man/man8/groupmod.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "GROUPMOD" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPMOD" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@ The options which apply to the
 \fBgroupmod\fR
 command are:
 .PP
-\fB\-a\fR, \fB\-\-append\fR\ \&\fIGID\fR
+\fB\-a\fR, \fB\-\-append\fR
 .RS 4
 If group members are specified with \-U, append them to the existing member list, rather than replacing it\&.
 .RE
@@ -131,11 +131,11 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
-\fB\-g\fR,
-\fB\-N\fR, and
+\fB\-g\fR
+and
 \fB\-U\fR
 options are not specified) is defined by the
 \fBUSERGROUPS_ENAB\fR
diff --git a/man/man8/grpck.8 b/man/man8/grpck.8
index 2cc0aeeb..5a86d640 100644
--- a/man/man8/grpck.8
+++ b/man/man8/grpck.8
@@ -2,12 +2,12 @@
 .\"     Title: grpck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "GRPCK" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GRPCK" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/lastlog.8 b/man/man8/lastlog.8
index 6ae15bd9..af5152bf 100644
--- a/man/man8/lastlog.8
+++ b/man/man8/lastlog.8
@@ -2,12 +2,12 @@
 .\"     Title: lastlog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "LASTLOG" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LASTLOG" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/logoutd.8 b/man/man8/logoutd.8
index d5d69444..5d7d65dd 100644
--- a/man/man8/logoutd.8
+++ b/man/man8/logoutd.8
@@ -2,12 +2,12 @@
 .\"     Title: logoutd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "LOGOUTD" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LOGOUTD" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/newusers.8 b/man/man8/newusers.8
index 81db8746..cd941565 100644
--- a/man/man8/newusers.8
+++ b/man/man8/newusers.8
@@ -2,12 +2,12 @@
 .\"     Title: newusers
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "NEWUSERS" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "NEWUSERS" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/nologin.8 b/man/man8/nologin.8
index ae0970b8..2c0d02d9 100644
--- a/man/man8/nologin.8
+++ b/man/man8/nologin.8
@@ -2,12 +2,12 @@
 .\"     Title: nologin
 .\"    Author: Nicolas François <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "NOLOGIN" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "NOLOGIN" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/pwck.8 b/man/man8/pwck.8
index ef3a9916..1f05cb39 100644
--- a/man/man8/pwck.8
+++ b/man/man8/pwck.8
@@ -2,12 +2,12 @@
 .\"     Title: pwck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "PWCK" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "PWCK" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/pwconv.8 b/man/man8/pwconv.8
index f3bf2812..eb01b0f5 100644
--- a/man/man8/pwconv.8
+++ b/man/man8/pwconv.8
@@ -2,12 +2,12 @@
 .\"     Title: pwconv
 .\"    Author: Marek Michałkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "PWCONV" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "PWCONV" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/sulogin.8 b/man/man8/sulogin.8
index 455d8bda..322ac266 100644
--- a/man/man8/sulogin.8
+++ b/man/man8/sulogin.8
@@ -2,12 +2,12 @@
 .\"     Title: sulogin
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "SULOGIN" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "SULOGIN" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/useradd.8 b/man/man8/useradd.8
index b568a7dc..f53db55a 100644
--- a/man/man8/useradd.8
+++ b/man/man8/useradd.8
@@ -2,12 +2,12 @@
 .\"     Title: useradd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "USERADD" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERADD" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/userdel.8 b/man/man8/userdel.8
index b2e2fccf..255a3a6b 100644
--- a/man/man8/userdel.8
+++ b/man/man8/userdel.8
@@ -2,12 +2,12 @@
 .\"     Title: userdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "USERDEL" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERDEL" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -46,15 +46,7 @@ command are:
 .PP
 \fB\-f\fR, \fB\-\-force\fR
 .RS 4
-This option forces the removal of the user account, even if the user is still logged in\&. It also forces
-\fBuserdel\fR
-to remove the user\*(Aqs home directory and mail spool, even if another user uses the same home directory or if the mail spool is not owned by the specified user\&. If
-\fBUSERGROUPS_ENAB\fR
-is defined to
-\fIyes\fR
-in
-/etc/login\&.defs
-and if a group exists with the same name as the deleted user, then this group will be removed, even if it is still the primary group of another user\&.
+This option forces the removal of the user account and any other requested actions, skipping any safety checks\&.
 .sp
 \fINote:\fR
 This option is dangerous and may leave your system in an inconsistent state\&.
diff --git a/man/man8/usermod.8 b/man/man8/usermod.8
index 0e7dbfbf..b4fa5406 100644
--- a/man/man8/usermod.8
+++ b/man/man8/usermod.8
@@ -2,12 +2,12 @@
 .\"     Title: usermod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "USERMOD" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERMOD" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/man8/vipw.8 b/man/man8/vipw.8
index e30a6c58..ecf31b15 100644
--- a/man/man8/vipw.8
+++ b/man/man8/vipw.8
@@ -2,12 +2,12 @@
 .\"     Title: vipw
 .\"    Author: Marek Michałkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/05/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: English
 .\"
-.TH "VIPW" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "VIPW" "8" "12/05/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/passwd.1.xml b/man/passwd.1.xml
index 506b134e..878ab7ba 100644
--- a/man/passwd.1.xml
+++ b/man/passwd.1.xml
@@ -228,7 +228,7 @@
 	    Note that this does not disable the account. The user may
 	    still be able to login using another authentication token
 	    (e.g. an SSH key). To disable the account, administrators
-	    should use <command>usermod --expiredate 1</command> (this set
+	    should use <command>usermod --expiredate 1</command> (this sets
 	    the account's expire date to Jan 2, 1970).
 	  </para>
 	  <para>
diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am
index b2f096f7..2a015f3a 100644
--- a/man/pl/Makefile.am
+++ b/man/pl/Makefile.am
@@ -13,7 +13,6 @@ man_MANS = \
 	man8/groupdel.8 \
 	man8/groupmems.8 \
 	man8/groupmod.8 \
-	man1/groups.1 \
 	man8/grpck.8 \
 	man8/logoutd.8 \
 	man1/newgrp.1 \
@@ -36,8 +35,7 @@ man_MANS += $(man_nopam)
 endif
 
 EXTRA_DIST = \
-	$(man_MANS) \
-	man1/id.1
+	$(man_MANS)
 
 if USE_PAM
 EXTRA_DIST += $(man_nopam)
diff --git a/man/pl/Makefile.in b/man/pl/Makefile.in
index 39266aed..9f8e0e2d 100644
--- a/man/pl/Makefile.in
+++ b/man/pl/Makefile.in
@@ -347,14 +347,14 @@ top_srcdir = @top_srcdir@
 # 2012.01.28 - activate manpages with more than 50% translated messages
 man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
 	man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \
-	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
-	man8/logoutd.8 man1/newgrp.1 man1/sg.1 man3/shadow.3 \
-	man8/userdel.8 man8/usermod.8 man8/vigr.8 man8/vipw.8 \
-	$(am__append_1) $(am__append_2)
+	man8/groupmems.8 man8/groupmod.8 man8/grpck.8 man8/logoutd.8 \
+	man1/newgrp.1 man1/sg.1 man3/shadow.3 man8/userdel.8 \
+	man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1) \
+	$(am__append_2)
 man_nopam = \
 	man5/porttime.5
 
-EXTRA_DIST = $(man_MANS) man1/id.1 $(am__append_3)
+EXTRA_DIST = $(man_MANS) $(am__append_3)
 LANG = $(notdir $(CURDIR))
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_FALSE@VENDORDIR_COND = without_vendordir
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_TRUE@VENDORDIR_COND = with_vendordir
diff --git a/man/pl/man1/chage.1 b/man/pl/man1/chage.1
index 2d140643..16b1ac6d 100644
--- a/man/pl/man1/chage.1
+++ b/man/pl/man1/chage.1
@@ -2,12 +2,12 @@
 .\"     Title: chage
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "CHAGE" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHAGE" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man1/chsh.1 b/man/pl/man1/chsh.1
index d595a493..bf4fc4f7 100644
--- a/man/pl/man1/chsh.1
+++ b/man/pl/man1/chsh.1
@@ -2,12 +2,12 @@
 .\"     Title: chsh
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "CHSH" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHSH" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man1/expiry.1 b/man/pl/man1/expiry.1
index 24f33c19..b5a2b340 100644
--- a/man/pl/man1/expiry.1
+++ b/man/pl/man1/expiry.1
@@ -2,12 +2,12 @@
 .\"     Title: expiry
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "EXPIRY" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "EXPIRY" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man1/groups.1 b/man/pl/man1/groups.1
deleted file mode 100644
index 9fe09f6b..00000000
--- a/man/pl/man1/groups.1
+++ /dev/null
@@ -1,65 +0,0 @@
-'\" t
-.\"     Title: groups
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: Polish
-.\"
-.TH "GROUPS" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAZWA"
-groups \- display current group names
-.SH "STRESZCZENIE"
-.HP \w'\fBgroups\fR\ 'u
-\fBgroups\fR [\fIuser\fR]
-.SH "OPIS"
-.PP
-The
-\fBgroups\fR
-command displays the current group names or ID values\&. If the value does not have a corresponding entry in
-/etc/group, the value will be displayed as the numerical group value\&. The optional
-\fIuser\fR
-parameter will display the groups for the named user\&.
-.SH "UWAGI"
-.PP
-Systems which do not support supplementary groups (see
-\fBinitgroups\fR(3)) will have the information from
-/etc/group
-reported\&. The user must use
-\fBnewgrp\fR
-or
-\fBsg\fR
-to change his current real and effective group ID\&.
-.SH "PLIKI"
-.PP
-/etc/group
-.RS 4
-Informacje o grupach użytkownik\('ow\&.
-.RE
-.SH "ZOBACZ TAKŻE"
-.PP
-\fBnewgrp\fR(1),
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)\&.
diff --git a/man/pl/man1/id.1 b/man/pl/man1/id.1
deleted file mode 100644
index b7df953e..00000000
--- a/man/pl/man1/id.1
+++ /dev/null
@@ -1,62 +0,0 @@
-'\" t
-.\"     Title: id
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: Polish
-.\"
-.TH "ID" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAZWA"
-id \- display current user and group ID names
-.SH "STRESZCZENIE"
-.HP \w'\fBid\fR\ 'u
-\fBid\fR [\-a]
-.SH "OPIS"
-.PP
-The
-\fBid\fR
-command displays the current real and effective user and group ID names or values\&. If the value does not have a corresponding entry in
-/etc/passwd
-or
-/etc/group, the value will be displayed without the corresponding name\&. The optional
-\fB\-a\fR
-flag will display the group set on systems which support supplementary groups (see
-\fBinitgroups\fR(3))\&.
-.SH "PLIKI"
-.PP
-/etc/group
-.RS 4
-Informacje o grupach użytkownik\('ow\&.
-.RE
-.PP
-/etc/passwd
-.RS 4
-Informacja o kontach użytkownik\('ow\&.
-.RE
-.SH "ZOBACZ TAKŻE"
-.PP
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)
diff --git a/man/pl/man1/newgrp.1 b/man/pl/man1/newgrp.1
index 086eb04e..d367d0b6 100644
--- a/man/pl/man1/newgrp.1
+++ b/man/pl/man1/newgrp.1
@@ -2,12 +2,12 @@
 .\"     Title: newgrp
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "NEWGRP" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "NEWGRP" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man1/sg.1 b/man/pl/man1/sg.1
index 06d7d338..53e889b3 100644
--- a/man/pl/man1/sg.1
+++ b/man/pl/man1/sg.1
@@ -2,12 +2,12 @@
 .\"     Title: sg
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "SG" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "SG" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man3/shadow.3 b/man/pl/man3/shadow.3
index fd67b4fd..9c84e873 100644
--- a/man/pl/man3/shadow.3
+++ b/man/pl/man3/shadow.3
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: Library Calls
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "SHADOW" "3" "06/18/2024" "shadow\-utils 4\&.16\&.0" "Library Calls"
+.TH "SHADOW" "3" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "Library Calls"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man5/faillog.5 b/man/pl/man5/faillog.5
index e495c305..50408cde 100644
--- a/man/pl/man5/faillog.5
+++ b/man/pl/man5/faillog.5
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual:  File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "FAILLOG" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuratio"
+.TH "FAILLOG" "5" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuratio"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man5/porttime.5 b/man/pl/man5/porttime.5
index 3a5a9f76..6c1c6432 100644
--- a/man/pl/man5/porttime.5
+++ b/man/pl/man5/porttime.5
@@ -2,12 +2,12 @@
 .\"     Title: porttime
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "PORTTIME" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "PORTTIME" "5" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man8/faillog.8 b/man/pl/man8/faillog.8
index 9d986bf1..121218db 100644
--- a/man/pl/man8/faillog.8
+++ b/man/pl/man8/faillog.8
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "FAILLOG" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "FAILLOG" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man8/groupadd.8 b/man/pl/man8/groupadd.8
index 9a81b185..54fe8787 100644
--- a/man/pl/man8/groupadd.8
+++ b/man/pl/man8/groupadd.8
@@ -2,12 +2,12 @@
 .\"     Title: groupadd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "GROUPADD" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPADD" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -146,7 +146,7 @@ Apply changes to configuration files under the root filesystem found under the d
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
 \fB\-g\fR,
diff --git a/man/pl/man8/groupdel.8 b/man/pl/man8/groupdel.8
index 3a67c7bc..c01b4eb4 100644
--- a/man/pl/man8/groupdel.8
+++ b/man/pl/man8/groupdel.8
@@ -2,12 +2,12 @@
 .\"     Title: groupdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "GROUPDEL" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPDEL" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man8/groupmems.8 b/man/pl/man8/groupmems.8
index a6b7c6a4..f701093a 100644
--- a/man/pl/man8/groupmems.8
+++ b/man/pl/man8/groupmems.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmems
 .\"    Author: George Kraft, IV
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "GROUPMEMS" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPMEMS" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man8/groupmod.8 b/man/pl/man8/groupmod.8
index ce99e698..bde92039 100644
--- a/man/pl/man8/groupmod.8
+++ b/man/pl/man8/groupmod.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "GROUPMOD" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPMOD" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@ The options which apply to the
 \fBgroupmod\fR
 command are:
 .PP
-\fB\-a\fR, \fB\-\-append\fR\ \&\fIGID\fR
+\fB\-a\fR, \fB\-\-append\fR
 .RS 4
 If group members are specified with \-U, append them to the existing member list, rather than replacing it\&.
 .RE
@@ -131,11 +131,11 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
-\fB\-g\fR,
-\fB\-N\fR, and
+\fB\-g\fR
+and
 \fB\-U\fR
 options are not specified) is defined by the
 \fBUSERGROUPS_ENAB\fR
diff --git a/man/pl/man8/grpck.8 b/man/pl/man8/grpck.8
index de46f3ba..e1d738f2 100644
--- a/man/pl/man8/grpck.8
+++ b/man/pl/man8/grpck.8
@@ -2,12 +2,12 @@
 .\"     Title: grpck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "GRPCK" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GRPCK" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man8/lastlog.8 b/man/pl/man8/lastlog.8
index 0152269b..592ae799 100644
--- a/man/pl/man8/lastlog.8
+++ b/man/pl/man8/lastlog.8
@@ -2,12 +2,12 @@
 .\"     Title: lastlog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "LASTLOG" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LASTLOG" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man8/logoutd.8 b/man/pl/man8/logoutd.8
index 90e7e1f3..e56e49ae 100644
--- a/man/pl/man8/logoutd.8
+++ b/man/pl/man8/logoutd.8
@@ -2,12 +2,12 @@
 .\"     Title: logoutd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "LOGOUTD" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LOGOUTD" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man8/userdel.8 b/man/pl/man8/userdel.8
index 95d38a5e..4c049951 100644
--- a/man/pl/man8/userdel.8
+++ b/man/pl/man8/userdel.8
@@ -2,12 +2,12 @@
 .\"     Title: userdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "USERDEL" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERDEL" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -46,15 +46,7 @@ command are:
 .PP
 \fB\-f\fR, \fB\-\-force\fR
 .RS 4
-This option forces the removal of the user account, even if the user is still logged in\&. It also forces
-\fBuserdel\fR
-to remove the user\*(Aqs home directory and mail spool, even if another user uses the same home directory or if the mail spool is not owned by the specified user\&. If
-\fBUSERGROUPS_ENAB\fR
-is defined to
-\fIyes\fR
-in
-/etc/login\&.defs
-and if a group exists with the same name as the deleted user, then this group will be removed, even if it is still the primary group of another user\&.
+This option forces the removal of the user account and any other requested actions, skipping any safety checks\&.
 .sp
 \fINote:\fR
 This option is dangerous and may leave your system in an inconsistent state\&.
diff --git a/man/pl/man8/usermod.8 b/man/pl/man8/usermod.8
index e0d8c641..807dbefd 100644
--- a/man/pl/man8/usermod.8
+++ b/man/pl/man8/usermod.8
@@ -2,12 +2,12 @@
 .\"     Title: usermod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "USERMOD" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERMOD" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/pl/man8/vipw.8 b/man/pl/man8/vipw.8
index 075649ba..1350fe47 100644
--- a/man/pl/man8/vipw.8
+++ b/man/pl/man8/vipw.8
@@ -2,12 +2,12 @@
 .\"     Title: vipw
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Polish
 .\"
-.TH "VIPW" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "VIPW" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/po/XMLFILES b/man/po/XMLFILES
index de7925df..bf08e6da 100644
--- a/man/po/XMLFILES
+++ b/man/po/XMLFILES
@@ -13,7 +13,6 @@ XMLFILES = \
 	$(top_srcdir)/man/groupdel.8.xml \
 	$(top_srcdir)/man/groupmems.8.xml \
 	$(top_srcdir)/man/groupmod.8.xml \
-	$(top_srcdir)/man/groups.1.xml \
 	$(top_srcdir)/man/grpck.8.xml \
 	$(top_srcdir)/man/gshadow.5.xml \
 	$(top_srcdir)/man/lastlog.8.xml \
diff --git a/man/po/de.po b/man/po/de.po
index 7063b528..ce710a6a 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -4,7 +4,7 @@
 # Markus Hiereth <translation@hiereth.de>, 2021, 2022, 2023
 # Remark
 # This message catalogue does not contain strings for manpages
-# subuid(5), subgid(5), cpgr(8), cppw(8),
+# subuid(5), subgid(5),
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow-man-pages\n"
diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am
index 84d55d9e..845a603e 100644
--- a/man/ru/Makefile.am
+++ b/man/ru/Makefile.am
@@ -16,7 +16,6 @@ man_MANS = \
 	man8/groupdel.8 \
 	man8/groupmems.8 \
 	man8/groupmod.8 \
-	man1/groups.1 \
 	man8/grpck.8 \
 	man8/grpconv.8 \
 	man8/grpunconv.8 \
@@ -58,7 +57,6 @@ endif
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	man1/id.1 \
 	man8/sulogin.8
 
 if USE_PAM
diff --git a/man/ru/Makefile.in b/man/ru/Makefile.in
index 5db579f5..b07e7f15 100644
--- a/man/ru/Makefile.in
+++ b/man/ru/Makefile.in
@@ -346,20 +346,20 @@ top_srcdir = @top_srcdir@
 man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
 	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
-	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
-	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man1/login.1 \
-	man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 man8/newusers.8 \
-	man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
-	man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man3/shadow.3 \
-	man5/shadow.5 man1/su.1 man5/suauth.5 man8/useradd.8 \
-	man8/userdel.8 man8/usermod.8 man8/vigr.8 man8/vipw.8 \
-	$(am__append_1) $(am__append_2)
+	man8/groupmems.8 man8/groupmod.8 man8/grpck.8 man8/grpconv.8 \
+	man8/grpunconv.8 man5/gshadow.5 man1/login.1 man5/login.defs.5 \
+	man8/logoutd.8 man1/newgrp.1 man8/newusers.8 man8/nologin.8 \
+	man1/passwd.1 man5/passwd.5 man8/pwck.8 man8/pwconv.8 \
+	man8/pwunconv.8 man1/sg.1 man3/shadow.3 man5/shadow.5 \
+	man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
+	man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1) \
+	$(am__append_2)
 man_nopam = \
 	man5/limits.5 \
 	man5/login.access.5 \
 	man5/porttime.5
 
-EXTRA_DIST = $(man_MANS) man1/id.1 man8/sulogin.8 $(am__append_3)
+EXTRA_DIST = $(man_MANS) man8/sulogin.8 $(am__append_3)
 LANG = $(notdir $(CURDIR))
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_FALSE@VENDORDIR_COND = without_vendordir
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_TRUE@VENDORDIR_COND = with_vendordir
diff --git a/man/ru/man1/chage.1 b/man/ru/man1/chage.1
index b00c8a9d..f1ca7848 100644
--- a/man/ru/man1/chage.1
+++ b/man/ru/man1/chage.1
@@ -2,12 +2,12 @@
 .\"     Title: chage
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "chage" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "chage" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man1/chfn.1 b/man/ru/man1/chfn.1
index b9970858..bbf79085 100644
--- a/man/ru/man1/chfn.1
+++ b/man/ru/man1/chfn.1
@@ -2,12 +2,12 @@
 .\"     Title: chfn
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "chfn" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "chfn" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man1/chsh.1 b/man/ru/man1/chsh.1
index 200d40cb..f3dffeef 100644
--- a/man/ru/man1/chsh.1
+++ b/man/ru/man1/chsh.1
@@ -2,12 +2,12 @@
 .\"     Title: chsh
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "chsh" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "chsh" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man1/expiry.1 b/man/ru/man1/expiry.1
index f498e7fb..c305f632 100644
--- a/man/ru/man1/expiry.1
+++ b/man/ru/man1/expiry.1
@@ -2,12 +2,12 @@
 .\"     Title: expiry
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "expiry" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "expiry" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man1/gpasswd.1 b/man/ru/man1/gpasswd.1
index 7bde0e35..b14811de 100644
--- a/man/ru/man1/gpasswd.1
+++ b/man/ru/man1/gpasswd.1
@@ -2,12 +2,12 @@
 .\"     Title: gpasswd
 .\"    Author: Rafal Maszkowski
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "gpasswd" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "gpasswd" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man1/groups.1 b/man/ru/man1/groups.1
deleted file mode 100644
index 40a9120f..00000000
--- a/man/ru/man1/groups.1
+++ /dev/null
@@ -1,65 +0,0 @@
-'\" t
-.\"     Title: groups
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: Russian
-.\"
-.TH "groups" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "НАЗВАНИЕ"
-groups \- показывает имена групп запустившего программу пользователя
-.SH "СИНТАКСИС"
-.HP \w'\fBgroups\fR\ 'u
-\fBgroups\fR [\fIuser\fR]
-.SH "ОПИСАНИЕ"
-.PP
-The
-\fBgroups\fR
-command displays the current group names or ID values\&. If the value does not have a corresponding entry in
-/etc/group, the value will be displayed as the numerical group value\&. The optional
-\fIuser\fR
-parameter will display the groups for the named user\&.
-.SH "ЗАМЕЧАНИЕ"
-.PP
-Systems which do not support supplementary groups (see
-\fBinitgroups\fR(3)) will have the information from
-/etc/group
-reported\&. The user must use
-\fBnewgrp\fR
-or
-\fBsg\fR
-to change his current real and effective group ID\&.
-.SH "ФАЙЛЫ"
-.PP
-/etc/group
-.RS 4
-содержит информацию о группах
-.RE
-.SH "СМОТРИТЕ ТАКЖЕ"
-.PP
-\fBnewgrp\fR(1),
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)\&.
diff --git a/man/ru/man1/id.1 b/man/ru/man1/id.1
deleted file mode 100644
index 5317b539..00000000
--- a/man/ru/man1/id.1
+++ /dev/null
@@ -1,62 +0,0 @@
-'\" t
-.\"     Title: id
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: Russian
-.\"
-.TH "id" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "НАЗВАНИЕ"
-id \- display current user and group ID names
-.SH "СИНТАКСИС"
-.HP \w'\fBid\fR\ 'u
-\fBid\fR [\-a]
-.SH "ОПИСАНИЕ"
-.PP
-The
-\fBid\fR
-command displays the current real and effective user and group ID names or values\&. If the value does not have a corresponding entry in
-/etc/passwd
-or
-/etc/group, the value will be displayed without the corresponding name\&. The optional
-\fB\-a\fR
-flag will display the group set on systems which support supplementary groups (see
-\fBinitgroups\fR(3))\&.
-.SH "ФАЙЛЫ"
-.PP
-/etc/group
-.RS 4
-содержит информацию о группах
-.RE
-.PP
-/etc/passwd
-.RS 4
-содержит информацию о пользователях
-.RE
-.SH "СМОТРИТЕ ТАКЖЕ"
-.PP
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)
diff --git a/man/ru/man1/login.1 b/man/ru/man1/login.1
index a9efed14..a95bff52 100644
--- a/man/ru/man1/login.1
+++ b/man/ru/man1/login.1
@@ -2,12 +2,12 @@
 .\"     Title: login
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "login" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "login" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man1/newgrp.1 b/man/ru/man1/newgrp.1
index a1b548db..21418cd9 100644
--- a/man/ru/man1/newgrp.1
+++ b/man/ru/man1/newgrp.1
@@ -2,12 +2,12 @@
 .\"     Title: newgrp
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "newgrp" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "newgrp" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man1/passwd.1 b/man/ru/man1/passwd.1
index 14c21d37..2cb75d13 100644
--- a/man/ru/man1/passwd.1
+++ b/man/ru/man1/passwd.1
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "passwd" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "passwd" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -110,7 +110,7 @@ days, the user may no longer sign on to the account\&.
 .sp
 Note that this does not disable the account\&. The user may still be able to login using another authentication token (e\&.g\&. an SSH key)\&. To disable the account, administrators should use
 \fBusermod \-\-expiredate 1\fR
-(this set the account\*(Aqs expire date to Jan 2, 1970)\&.
+(this sets the account\*(Aqs expire date to Jan 2, 1970)\&.
 .sp
 Посетитель с заблокированным паролем не может изменить свой пароль\&.
 .RE
diff --git a/man/ru/man1/sg.1 b/man/ru/man1/sg.1
index 43386a58..6c7d7ed6 100644
--- a/man/ru/man1/sg.1
+++ b/man/ru/man1/sg.1
@@ -2,12 +2,12 @@
 .\"     Title: sg
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "sg" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "sg" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man1/su.1 b/man/ru/man1/su.1
index 70892e9b..07618d15 100644
--- a/man/ru/man1/su.1
+++ b/man/ru/man1/su.1
@@ -2,12 +2,12 @@
 .\"     Title: su
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "su" "1" "06/18/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "su" "1" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man3/shadow.3 b/man/ru/man3/shadow.3
index 356fa6ab..6ff9ea44 100644
--- a/man/ru/man3/shadow.3
+++ b/man/ru/man3/shadow.3
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: Library Calls
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "shadow" "3" "06/18/2024" "shadow\-utils 4\&.16\&.0" "Library Calls"
+.TH "shadow" "3" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "Library Calls"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man5/faillog.5 b/man/ru/man5/faillog.5
index 052e6934..d8cca9d9 100644
--- a/man/ru/man5/faillog.5
+++ b/man/ru/man5/faillog.5
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual:  File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "faillog" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuratio"
+.TH "faillog" "5" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuratio"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man5/gshadow.5 b/man/ru/man5/gshadow.5
index 1a523132..b41b5490 100644
--- a/man/ru/man5/gshadow.5
+++ b/man/ru/man5/gshadow.5
@@ -2,12 +2,12 @@
 .\"     Title: gshadow
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "gshadow" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "gshadow" "5" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ contains the shadowed information for group accounts\&.
 .PP
 \fBgroup name\fR
 .RS 4
-Должно содержать правильное имя группы, которая существует в системе\&.
+It must be a valid group name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/ru/man5/limits.5 b/man/ru/man5/limits.5
index 645dc90b..31698da4 100644
--- a/man/ru/man5/limits.5
+++ b/man/ru/man5/limits.5
@@ -2,12 +2,12 @@
 .\"     Title: limits
 .\"    Author: Luca Berra
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "limits" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "limits" "5" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man5/login.access.5 b/man/ru/man5/login.access.5
index 99bb57ec..35bdeb07 100644
--- a/man/ru/man5/login.access.5
+++ b/man/ru/man5/login.access.5
@@ -2,12 +2,12 @@
 .\"     Title: login.access
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "login\&.access" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "login\&.access" "5" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man5/login.defs.5 b/man/ru/man5/login.defs.5
index 4676d122..2146a440 100644
--- a/man/ru/man5/login.defs.5
+++ b/man/ru/man5/login.defs.5
@@ -2,12 +2,12 @@
 .\"     Title: login.defs
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "login\&.defs" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "login\&.defs" "5" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man5/passwd.5 b/man/ru/man5/passwd.5
index 93db32fd..c7ec5a44 100644
--- a/man/ru/man5/passwd.5
+++ b/man/ru/man5/passwd.5
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "passwd" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "passwd" "5" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man5/porttime.5 b/man/ru/man5/porttime.5
index 674c8ec1..ce991657 100644
--- a/man/ru/man5/porttime.5
+++ b/man/ru/man5/porttime.5
@@ -2,12 +2,12 @@
 .\"     Title: porttime
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "porttime" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "porttime" "5" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man5/shadow.5 b/man/ru/man5/shadow.5
index 979bd256..530948d3 100644
--- a/man/ru/man5/shadow.5
+++ b/man/ru/man5/shadow.5
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "shadow" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "shadow" "5" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ Each line of this file contains 9 fields, separated by colons (\(Fo:\(Fc), in th
 .PP
 \fBlogin name\fR
 .RS 4
-Должно содержать правильное имя учётной записи, которая существует в системе\&.
+It must be a valid account name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/ru/man5/suauth.5 b/man/ru/man5/suauth.5
index 4915924a..dc10156d 100644
--- a/man/ru/man5/suauth.5
+++ b/man/ru/man5/suauth.5
@@ -2,12 +2,12 @@
 .\"     Title: suauth
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "suauth" "5" "06/18/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "suauth" "5" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/chgpasswd.8 b/man/ru/man8/chgpasswd.8
index 33b23351..5862a5a5 100644
--- a/man/ru/man8/chgpasswd.8
+++ b/man/ru/man8/chgpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: chgpasswd
 .\"    Author: Thomas K\(/loczko <kloczek@pld.org.pl>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "chgpasswd" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "chgpasswd" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/chpasswd.8 b/man/ru/man8/chpasswd.8
index e00944df..943b66d2 100644
--- a/man/ru/man8/chpasswd.8
+++ b/man/ru/man8/chpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: chpasswd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "chpasswd" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "chpasswd" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/faillog.8 b/man/ru/man8/faillog.8
index a2b28ec1..370191c5 100644
--- a/man/ru/man8/faillog.8
+++ b/man/ru/man8/faillog.8
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "faillog" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "faillog" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/groupadd.8 b/man/ru/man8/groupadd.8
index 013fbb29..b74355f2 100644
--- a/man/ru/man8/groupadd.8
+++ b/man/ru/man8/groupadd.8
@@ -2,12 +2,12 @@
 .\"     Title: groupadd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "groupadd" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "groupadd" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -146,7 +146,7 @@ Apply changes to configuration files under the root filesystem found under the d
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
 \fB\-g\fR,
diff --git a/man/ru/man8/groupdel.8 b/man/ru/man8/groupdel.8
index a867a0ae..3a4fad9f 100644
--- a/man/ru/man8/groupdel.8
+++ b/man/ru/man8/groupdel.8
@@ -2,12 +2,12 @@
 .\"     Title: groupdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "groupdel" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "groupdel" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/groupmems.8 b/man/ru/man8/groupmems.8
index 834f76fd..012f17e9 100644
--- a/man/ru/man8/groupmems.8
+++ b/man/ru/man8/groupmems.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmems
 .\"    Author: George Kraft, IV
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "groupmems" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "groupmems" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/groupmod.8 b/man/ru/man8/groupmod.8
index f904aec7..3296649a 100644
--- a/man/ru/man8/groupmod.8
+++ b/man/ru/man8/groupmod.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "groupmod" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "groupmod" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@ The options which apply to the
 \fBgroupmod\fR
 command are:
 .PP
-\fB\-a\fR, \fB\-\-append\fR\ \&\fIGID\fR
+\fB\-a\fR, \fB\-\-append\fR
 .RS 4
 If group members are specified with \-U, append them to the existing member list, rather than replacing it\&.
 .RE
@@ -131,11 +131,11 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
-\fB\-g\fR,
-\fB\-N\fR, and
+\fB\-g\fR
+and
 \fB\-U\fR
 options are not specified) is defined by the
 \fBUSERGROUPS_ENAB\fR
diff --git a/man/ru/man8/grpck.8 b/man/ru/man8/grpck.8
index 5bf979fd..2a845f7a 100644
--- a/man/ru/man8/grpck.8
+++ b/man/ru/man8/grpck.8
@@ -2,12 +2,12 @@
 .\"     Title: grpck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "grpck" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "grpck" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/lastlog.8 b/man/ru/man8/lastlog.8
index 84a06f0e..4f4aff78 100644
--- a/man/ru/man8/lastlog.8
+++ b/man/ru/man8/lastlog.8
@@ -2,12 +2,12 @@
 .\"     Title: lastlog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "lastlog" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "lastlog" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/logoutd.8 b/man/ru/man8/logoutd.8
index 4ad47ad0..78c01adf 100644
--- a/man/ru/man8/logoutd.8
+++ b/man/ru/man8/logoutd.8
@@ -2,12 +2,12 @@
 .\"     Title: logoutd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "logoutd" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "logoutd" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/newusers.8 b/man/ru/man8/newusers.8
index 91ddc10f..4df9f2c7 100644
--- a/man/ru/man8/newusers.8
+++ b/man/ru/man8/newusers.8
@@ -2,12 +2,12 @@
 .\"     Title: newusers
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "newusers" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "newusers" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/nologin.8 b/man/ru/man8/nologin.8
index 2fc6c0ac..a858234f 100644
--- a/man/ru/man8/nologin.8
+++ b/man/ru/man8/nologin.8
@@ -2,12 +2,12 @@
 .\"     Title: nologin
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "nologin" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "nologin" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/pwck.8 b/man/ru/man8/pwck.8
index 30a979f8..5fc0719b 100644
--- a/man/ru/man8/pwck.8
+++ b/man/ru/man8/pwck.8
@@ -2,12 +2,12 @@
 .\"     Title: pwck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "pwck" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "pwck" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/pwconv.8 b/man/ru/man8/pwconv.8
index d8c7b246..13e203f7 100644
--- a/man/ru/man8/pwconv.8
+++ b/man/ru/man8/pwconv.8
@@ -2,12 +2,12 @@
 .\"     Title: pwconv
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "pwconv" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "pwconv" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/sulogin.8 b/man/ru/man8/sulogin.8
index 29140124..9e688887 100644
--- a/man/ru/man8/sulogin.8
+++ b/man/ru/man8/sulogin.8
@@ -2,12 +2,12 @@
 .\"     Title: sulogin
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "sulogin" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "sulogin" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/useradd.8 b/man/ru/man8/useradd.8
index ca6986f7..f4d049a3 100644
--- a/man/ru/man8/useradd.8
+++ b/man/ru/man8/useradd.8
@@ -2,12 +2,12 @@
 .\"     Title: useradd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "useradd" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "useradd" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/userdel.8 b/man/ru/man8/userdel.8
index 07df39e1..936fd79c 100644
--- a/man/ru/man8/userdel.8
+++ b/man/ru/man8/userdel.8
@@ -2,12 +2,12 @@
 .\"     Title: userdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "userdel" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "userdel" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -46,15 +46,7 @@ command are:
 .PP
 \fB\-f\fR, \fB\-\-force\fR
 .RS 4
-This option forces the removal of the user account, even if the user is still logged in\&. It also forces
-\fBuserdel\fR
-to remove the user\*(Aqs home directory and mail spool, even if another user uses the same home directory or if the mail spool is not owned by the specified user\&. If
-\fBUSERGROUPS_ENAB\fR
-is defined to
-\fIyes\fR
-in
-/etc/login\&.defs
-and if a group exists with the same name as the deleted user, then this group will be removed, even if it is still the primary group of another user\&.
+This option forces the removal of the user account and any other requested actions, skipping any safety checks\&.
 .sp
 \fINote:\fR
 This option is dangerous and may leave your system in an inconsistent state\&.
diff --git a/man/ru/man8/usermod.8 b/man/ru/man8/usermod.8
index d9ff01a1..45e8ac47 100644
--- a/man/ru/man8/usermod.8
+++ b/man/ru/man8/usermod.8
@@ -2,12 +2,12 @@
 .\"     Title: usermod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "usermod" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "usermod" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/ru/man8/vipw.8 b/man/ru/man8/vipw.8
index 666775e7..c23ce974 100644
--- a/man/ru/man8/vipw.8
+++ b/man/ru/man8/vipw.8
@@ -2,12 +2,12 @@
 .\"     Title: vipw
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 06/18/2024
+.\"      Date: 12/06/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Russian
 .\"
-.TH "vipw" "8" "06/18/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "vipw" "8" "12/06/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/shadow.5.xml b/man/shadow.5.xml
index d2ad44b9..cec69705 100644
--- a/man/shadow.5.xml
+++ b/man/shadow.5.xml
@@ -64,7 +64,7 @@
 	<term><emphasis role="bold">login name</emphasis></term>
 	<listitem>
 	  <para>
-	    It must be a valid account name, which exist on the system.
+	    It must be a valid account name, which exists on the system.
 	  </para>
 	</listitem>
       </varlistentry>
diff --git a/man/subgid.5.xml b/man/subgid.5.xml
index e473768d..09a866fc 100644
--- a/man/subgid.5.xml
+++ b/man/subgid.5.xml
@@ -51,7 +51,8 @@
       <replaceable>files</replaceable>.
     </para>
     <para>
-      Note, that <command>groupadd</command> will only create entries in
+      Note, that <command>newusers</command>, <command>useradd</command>, and
+      <command>usermod</command> will only create entries in
       <filename>/etc/subgid</filename> if subid delegation is managed via subid
       files.
     </para>
diff --git a/man/subuid.5.xml b/man/subuid.5.xml
index 79a6b42a..eb28eed7 100644
--- a/man/subuid.5.xml
+++ b/man/subuid.5.xml
@@ -51,7 +51,8 @@
       <replaceable>files</replaceable>.
     </para>
     <para>
-      Note, that <command>useradd</command> will only create entries in
+      Note, that <command>newusers</command>, <command>useradd</command>, and
+      <command>usermod</command> will only create entries in
       <filename>/etc/subuid</filename> if subid delegation is managed via subid
       files.
     </para>
diff --git a/man/sv/Makefile.am b/man/sv/Makefile.am
index 70329edf..1918af72 100644
--- a/man/sv/Makefile.am
+++ b/man/sv/Makefile.am
@@ -12,7 +12,6 @@ man_MANS = \
 	man8/groupdel.8 \
 	man8/groupmems.8 \
 	man8/groupmod.8 \
-	man1/groups.1 \
 	man8/grpck.8 \
 	man5/gshadow.5 \
 	man8/logoutd.8 \
@@ -41,8 +40,7 @@ man_MANS += $(man_nopam)
 endif
 
 EXTRA_DIST = \
-	$(man_MANS) \
-	man1/id.1
+	$(man_MANS)
 
 if USE_PAM
 EXTRA_DIST += $(man_nopam)
diff --git a/man/sv/Makefile.in b/man/sv/Makefile.in
index 4c91989c..94cbfeca 100644
--- a/man/sv/Makefile.in
+++ b/man/sv/Makefile.in
@@ -347,16 +347,16 @@ top_srcdir = @top_srcdir@
 # 2012.01.28 - activate manpages with more than 50% translated messages
 man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
 	man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \
-	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
-	man5/gshadow.5 man8/logoutd.8 man1/newgrp.1 man8/nologin.8 \
-	man1/passwd.1 man5/passwd.5 man8/pwck.8 man1/sg.1 \
-	man3/shadow.3 man5/suauth.5 man8/userdel.8 man8/vigr.8 \
-	man8/vipw.8 $(am__append_1) $(am__append_2)
+	man8/groupmems.8 man8/groupmod.8 man8/grpck.8 man5/gshadow.5 \
+	man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/passwd.1 \
+	man5/passwd.5 man8/pwck.8 man1/sg.1 man3/shadow.3 \
+	man5/suauth.5 man8/userdel.8 man8/vigr.8 man8/vipw.8 \
+	$(am__append_1) $(am__append_2)
 man_nopam = \
 	man5/limits.5 \
 	man5/porttime.5
 
-EXTRA_DIST = $(man_MANS) man1/id.1 $(am__append_3)
+EXTRA_DIST = $(man_MANS) $(am__append_3)
 LANG = $(notdir $(CURDIR))
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_FALSE@VENDORDIR_COND = without_vendordir
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_TRUE@VENDORDIR_COND = with_vendordir
diff --git a/man/sv/man1/chage.1 b/man/sv/man1/chage.1
index deb31942..34f286aa 100644
--- a/man/sv/man1/chage.1
+++ b/man/sv/man1/chage.1
@@ -2,12 +2,12 @@
 .\"     Title: chage
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "CHAGE" "1" "18-06-2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHAGE" "1" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man1/chsh.1 b/man/sv/man1/chsh.1
index d5a36ca0..adff1653 100644
--- a/man/sv/man1/chsh.1
+++ b/man/sv/man1/chsh.1
@@ -2,12 +2,12 @@
 .\"     Title: chsh
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "CHSH" "1" "18-06-2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHSH" "1" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man1/expiry.1 b/man/sv/man1/expiry.1
index d3df14ef..a19a13ab 100644
--- a/man/sv/man1/expiry.1
+++ b/man/sv/man1/expiry.1
@@ -2,12 +2,12 @@
 .\"     Title: expiry
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "EXPIRY" "1" "18-06-2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "EXPIRY" "1" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man1/groups.1 b/man/sv/man1/groups.1
deleted file mode 100644
index e78d75be..00000000
--- a/man/sv/man1/groups.1
+++ /dev/null
@@ -1,65 +0,0 @@
-'\" t
-.\"     Title: groups
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: Swedish
-.\"
-.TH "GROUPS" "1" "18-06-2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAMN"
-groups \- visa aktuella gruppnamn
-.SH "SYNOPSIS"
-.HP \w'\fBgroups\fR\ 'u
-\fBgroups\fR [\fIuser\fR]
-.SH "BESKRIVNING"
-.PP
-The
-\fBgroups\fR
-command displays the current group names or ID values\&. If the value does not have a corresponding entry in
-/etc/group, the value will be displayed as the numerical group value\&. The optional
-\fIuser\fR
-parameter will display the groups for the named user\&.
-.SH "NOTERA"
-.PP
-Systems which do not support supplementary groups (see
-\fBinitgroups\fR(3)) will have the information from
-/etc/group
-reported\&. The user must use
-\fBnewgrp\fR
-or
-\fBsg\fR
-to change his current real and effective group ID\&.
-.SH "FILER"
-.PP
-/etc/group
-.RS 4
-Gruppkontoinformation\&.
-.RE
-.SH "SE OCKS\(oA"
-.PP
-\fBnewgrp\fR(1),
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)\&.
diff --git a/man/sv/man1/id.1 b/man/sv/man1/id.1
deleted file mode 100644
index e753f88c..00000000
--- a/man/sv/man1/id.1
+++ /dev/null
@@ -1,62 +0,0 @@
-'\" t
-.\"     Title: id
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: Swedish
-.\"
-.TH "ID" "1" "18-06-2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAMN"
-id \- display current user and group ID names
-.SH "SYNOPSIS"
-.HP \w'\fBid\fR\ 'u
-\fBid\fR [\-a]
-.SH "BESKRIVNING"
-.PP
-The
-\fBid\fR
-command displays the current real and effective user and group ID names or values\&. If the value does not have a corresponding entry in
-/etc/passwd
-or
-/etc/group, the value will be displayed without the corresponding name\&. The optional
-\fB\-a\fR
-flag will display the group set on systems which support supplementary groups (see
-\fBinitgroups\fR(3))\&.
-.SH "FILER"
-.PP
-/etc/group
-.RS 4
-Gruppkontoinformation\&.
-.RE
-.PP
-/etc/passwd
-.RS 4
-Anv\(:andarkontoinformation\&.
-.RE
-.SH "SE OCKS\(oA"
-.PP
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)
diff --git a/man/sv/man1/newgrp.1 b/man/sv/man1/newgrp.1
index 401b9d20..38176a1c 100644
--- a/man/sv/man1/newgrp.1
+++ b/man/sv/man1/newgrp.1
@@ -2,12 +2,12 @@
 .\"     Title: newgrp
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "NEWGRP" "1" "18-06-2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "NEWGRP" "1" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man1/passwd.1 b/man/sv/man1/passwd.1
index 7769fcb1..c75e2460 100644
--- a/man/sv/man1/passwd.1
+++ b/man/sv/man1/passwd.1
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "PASSWD" "1" "18-06-2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "PASSWD" "1" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -110,7 +110,7 @@ Lock the password of the named account\&. This option disables a password by cha
 .sp
 Note that this does not disable the account\&. The user may still be able to login using another authentication token (e\&.g\&. an SSH key)\&. To disable the account, administrators should use
 \fBusermod \-\-expiredate 1\fR
-(this set the account\*(Aqs expire date to Jan 2, 1970)\&.
+(this sets the account\*(Aqs expire date to Jan 2, 1970)\&.
 .sp
 Users with a locked password are not allowed to change their password\&.
 .RE
diff --git a/man/sv/man1/sg.1 b/man/sv/man1/sg.1
index 7e561b35..55895491 100644
--- a/man/sv/man1/sg.1
+++ b/man/sv/man1/sg.1
@@ -2,12 +2,12 @@
 .\"     Title: sg
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "SG" "1" "18-06-2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "SG" "1" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man3/shadow.3 b/man/sv/man3/shadow.3
index 94354bff..cd77077f 100644
--- a/man/sv/man3/shadow.3
+++ b/man/sv/man3/shadow.3
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: Library Calls
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "SHADOW" "3" "18-06-2024" "shadow\-utils 4\&.16\&.0" "Library Calls"
+.TH "SHADOW" "3" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "Library Calls"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man5/faillog.5 b/man/sv/man5/faillog.5
index 47e6dc53..a54d2929 100644
--- a/man/sv/man5/faillog.5
+++ b/man/sv/man5/faillog.5
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual:  File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "FAILLOG" "5" "18-06-2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuratio"
+.TH "FAILLOG" "5" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuratio"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man5/gshadow.5 b/man/sv/man5/gshadow.5
index f1df953c..0c48ca37 100644
--- a/man/sv/man5/gshadow.5
+++ b/man/sv/man5/gshadow.5
@@ -2,12 +2,12 @@
 .\"     Title: gshadow
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "GSHADOW" "5" "18-06-2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "GSHADOW" "5" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ Each line of this file contains the following colon\-separated fields:
 .PP
 \fBgroup name\fR
 .RS 4
-It must be a valid group name, which exist on the system\&.
+It must be a valid group name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/sv/man5/limits.5 b/man/sv/man5/limits.5
index 3f5bec0e..03907d1f 100644
--- a/man/sv/man5/limits.5
+++ b/man/sv/man5/limits.5
@@ -2,12 +2,12 @@
 .\"     Title: limits
 .\"    Author: Luca Berra
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "LIMITS" "5" "18-06-2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LIMITS" "5" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man5/passwd.5 b/man/sv/man5/passwd.5
index 4f2736fe..40331005 100644
--- a/man/sv/man5/passwd.5
+++ b/man/sv/man5/passwd.5
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "PASSWD" "5" "18-06-2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "PASSWD" "5" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man5/porttime.5 b/man/sv/man5/porttime.5
index a44b82bf..01c3a173 100644
--- a/man/sv/man5/porttime.5
+++ b/man/sv/man5/porttime.5
@@ -2,12 +2,12 @@
 .\"     Title: porttime
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "PORTTIME" "5" "18-06-2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "PORTTIME" "5" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man5/suauth.5 b/man/sv/man5/suauth.5
index db9dbf59..371fe8a6 100644
--- a/man/sv/man5/suauth.5
+++ b/man/sv/man5/suauth.5
@@ -2,12 +2,12 @@
 .\"     Title: suauth
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "SUAUTH" "5" "18-06-2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SUAUTH" "5" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man8/faillog.8 b/man/sv/man8/faillog.8
index 5209493b..6c10ee48 100644
--- a/man/sv/man8/faillog.8
+++ b/man/sv/man8/faillog.8
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "FAILLOG" "8" "18-06-2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "FAILLOG" "8" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man8/groupadd.8 b/man/sv/man8/groupadd.8
index 7b54bec6..3656cd76 100644
--- a/man/sv/man8/groupadd.8
+++ b/man/sv/man8/groupadd.8
@@ -2,12 +2,12 @@
 .\"     Title: groupadd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "GROUPADD" "8" "18-06-2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPADD" "8" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -146,7 +146,7 @@ Apply changes to configuration files under the root filesystem found under the d
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
 \fB\-g\fR,
diff --git a/man/sv/man8/groupdel.8 b/man/sv/man8/groupdel.8
index 93e5bb61..bc0e6db3 100644
--- a/man/sv/man8/groupdel.8
+++ b/man/sv/man8/groupdel.8
@@ -2,12 +2,12 @@
 .\"     Title: groupdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "GROUPDEL" "8" "18-06-2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPDEL" "8" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man8/groupmems.8 b/man/sv/man8/groupmems.8
index 3e7eb8bb..f475bca9 100644
--- a/man/sv/man8/groupmems.8
+++ b/man/sv/man8/groupmems.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmems
 .\"    Author: George Kraft, IV
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "GROUPMEMS" "8" "18-06-2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPMEMS" "8" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man8/groupmod.8 b/man/sv/man8/groupmod.8
index 3c032324..81392ea4 100644
--- a/man/sv/man8/groupmod.8
+++ b/man/sv/man8/groupmod.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "GROUPMOD" "8" "18-06-2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPMOD" "8" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@ The options which apply to the
 \fBgroupmod\fR
 command are:
 .PP
-\fB\-a\fR, \fB\-\-append\fR\ \&\fIGID\fR
+\fB\-a\fR, \fB\-\-append\fR
 .RS 4
 If group members are specified with \-U, append them to the existing member list, rather than replacing it\&.
 .RE
@@ -131,11 +131,11 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
-\fB\-g\fR,
-\fB\-N\fR, and
+\fB\-g\fR
+and
 \fB\-U\fR
 options are not specified) is defined by the
 \fBUSERGROUPS_ENAB\fR
diff --git a/man/sv/man8/grpck.8 b/man/sv/man8/grpck.8
index eab34792..986a6e86 100644
--- a/man/sv/man8/grpck.8
+++ b/man/sv/man8/grpck.8
@@ -2,12 +2,12 @@
 .\"     Title: grpck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "GRPCK" "8" "18-06-2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GRPCK" "8" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man8/lastlog.8 b/man/sv/man8/lastlog.8
index b85676d6..9e76bdb6 100644
--- a/man/sv/man8/lastlog.8
+++ b/man/sv/man8/lastlog.8
@@ -2,12 +2,12 @@
 .\"     Title: lastlog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "LASTLOG" "8" "18-06-2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LASTLOG" "8" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man8/logoutd.8 b/man/sv/man8/logoutd.8
index 6cf383ef..c0366581 100644
--- a/man/sv/man8/logoutd.8
+++ b/man/sv/man8/logoutd.8
@@ -2,12 +2,12 @@
 .\"     Title: logoutd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "LOGOUTD" "8" "18-06-2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LOGOUTD" "8" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man8/nologin.8 b/man/sv/man8/nologin.8
index 35cf6198..1b31d3d1 100644
--- a/man/sv/man8/nologin.8
+++ b/man/sv/man8/nologin.8
@@ -2,12 +2,12 @@
 .\"     Title: nologin
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "NOLOGIN" "8" "18-06-2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "NOLOGIN" "8" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man8/pwck.8 b/man/sv/man8/pwck.8
index 502961b9..0884133c 100644
--- a/man/sv/man8/pwck.8
+++ b/man/sv/man8/pwck.8
@@ -2,12 +2,12 @@
 .\"     Title: pwck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "PWCK" "8" "18-06-2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "PWCK" "8" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/sv/man8/userdel.8 b/man/sv/man8/userdel.8
index 4f3852c1..14f0ffe4 100644
--- a/man/sv/man8/userdel.8
+++ b/man/sv/man8/userdel.8
@@ -2,12 +2,12 @@
 .\"     Title: userdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "USERDEL" "8" "18-06-2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERDEL" "8" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -46,15 +46,7 @@ command are:
 .PP
 \fB\-f\fR, \fB\-\-force\fR
 .RS 4
-This option forces the removal of the user account, even if the user is still logged in\&. It also forces
-\fBuserdel\fR
-to remove the user\*(Aqs home directory and mail spool, even if another user uses the same home directory or if the mail spool is not owned by the specified user\&. If
-\fBUSERGROUPS_ENAB\fR
-is defined to
-\fIyes\fR
-in
-/etc/login\&.defs
-and if a group exists with the same name as the deleted user, then this group will be removed, even if it is still the primary group of another user\&.
+This option forces the removal of the user account and any other requested actions, skipping any safety checks\&.
 .sp
 \fINote:\fR
 This option is dangerous and may leave your system in an inconsistent state\&.
diff --git a/man/sv/man8/vipw.8 b/man/sv/man8/vipw.8
index cc2d7f87..044786c1 100644
--- a/man/sv/man8/vipw.8
+++ b/man/sv/man8/vipw.8
@@ -2,12 +2,12 @@
 .\"     Title: vipw
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18-06-2024
+.\"      Date: 06-12-2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Swedish
 .\"
-.TH "VIPW" "8" "18-06-2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "VIPW" "8" "06-12-2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/Makefile.am b/man/uk/Makefile.am
index 3fb5ffb3..a0f106d6 100644
--- a/man/uk/Makefile.am
+++ b/man/uk/Makefile.am
@@ -16,7 +16,6 @@ man_MANS = \
 	man8/groupdel.8 \
 	man8/groupmems.8 \
 	man8/groupmod.8 \
-	man1/groups.1 \
 	man8/grpck.8 \
 	man8/grpconv.8 \
 	man8/grpunconv.8 \
@@ -57,7 +56,6 @@ endif
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	man1/id.1 \
 	man8/sulogin.8
 
 if USE_PAM
diff --git a/man/uk/Makefile.in b/man/uk/Makefile.in
index 979061ba..cffc9377 100644
--- a/man/uk/Makefile.in
+++ b/man/uk/Makefile.in
@@ -346,19 +346,19 @@ top_srcdir = @top_srcdir@
 man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
 	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
-	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
-	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man1/login.1 \
-	man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 man8/newusers.8 \
-	man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
-	man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man3/shadow.3 \
-	man5/shadow.5 man1/su.1 man5/suauth.5 man8/useradd.8 \
-	man8/userdel.8 man8/usermod.8 man8/vigr.8 man8/vipw.8 \
-	$(am__append_1) $(am__append_2)
+	man8/groupmems.8 man8/groupmod.8 man8/grpck.8 man8/grpconv.8 \
+	man8/grpunconv.8 man5/gshadow.5 man1/login.1 man5/login.defs.5 \
+	man8/logoutd.8 man1/newgrp.1 man8/newusers.8 man8/nologin.8 \
+	man1/passwd.1 man5/passwd.5 man8/pwck.8 man8/pwconv.8 \
+	man8/pwunconv.8 man1/sg.1 man3/shadow.3 man5/shadow.5 \
+	man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
+	man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1) \
+	$(am__append_2)
 man_nopam = \
 	man5/login.access.5 \
 	man5/porttime.5
 
-EXTRA_DIST = $(man_MANS) man1/id.1 man8/sulogin.8 $(am__append_3)
+EXTRA_DIST = $(man_MANS) man8/sulogin.8 $(am__append_3)
 LANG = $(notdir $(CURDIR))
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_FALSE@VENDORDIR_COND = without_vendordir
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_TRUE@VENDORDIR_COND = with_vendordir
diff --git a/man/uk/man1/chage.1 b/man/uk/man1/chage.1
index 112a71c8..e3665db3 100644
--- a/man/uk/man1/chage.1
+++ b/man/uk/man1/chage.1
@@ -2,12 +2,12 @@
 .\"     Title: chage
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "chage" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "chage" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man1/chfn.1 b/man/uk/man1/chfn.1
index 77bf69a0..214000b6 100644
--- a/man/uk/man1/chfn.1
+++ b/man/uk/man1/chfn.1
@@ -2,12 +2,12 @@
 .\"     Title: chfn
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "chfn" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "chfn" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man1/chsh.1 b/man/uk/man1/chsh.1
index 389dd80a..27748a2d 100644
--- a/man/uk/man1/chsh.1
+++ b/man/uk/man1/chsh.1
@@ -2,12 +2,12 @@
 .\"     Title: chsh
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "chsh" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "chsh" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man1/expiry.1 b/man/uk/man1/expiry.1
index 41c38eff..a467d030 100644
--- a/man/uk/man1/expiry.1
+++ b/man/uk/man1/expiry.1
@@ -2,12 +2,12 @@
 .\"     Title: expiry
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "expiry" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "expiry" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man1/gpasswd.1 b/man/uk/man1/gpasswd.1
index b0448c3c..a7fc7c9d 100644
--- a/man/uk/man1/gpasswd.1
+++ b/man/uk/man1/gpasswd.1
@@ -2,12 +2,12 @@
 .\"     Title: gpasswd
 .\"    Author: Rafal Maszkowski
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "gpasswd" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "gpasswd" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man1/groups.1 b/man/uk/man1/groups.1
deleted file mode 100644
index 289ce056..00000000
--- a/man/uk/man1/groups.1
+++ /dev/null
@@ -1,65 +0,0 @@
-'\" t
-.\"     Title: groups
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: Ukrainian
-.\"
-.TH "groups" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "НАЗВА"
-groups \- показ поточних назв груп
-.SH "КОРОТКИЙ ОГЛЯД"
-.HP \w'\fBgroups\fR\ 'u
-\fBgroups\fR [\fIuser\fR]
-.SH "ОПИС"
-.PP
-The
-\fBgroups\fR
-command displays the current group names or ID values\&. If the value does not have a corresponding entry in
-/etc/group, the value will be displayed as the numerical group value\&. The optional
-\fIuser\fR
-parameter will display the groups for the named user\&.
-.SH "ЗАУВАЖЕННЯ"
-.PP
-Systems which do not support supplementary groups (see
-\fBinitgroups\fR(3)) will have the information from
-/etc/group
-reported\&. The user must use
-\fBnewgrp\fR
-or
-\fBsg\fR
-to change his current real and effective group ID\&.
-.SH "ФАЙЛИ"
-.PP
-/etc/group
-.RS 4
-Відомості щодо груп облікових записів\&.
-.RE
-.SH "ДИВ\&. ТАКОЖ"
-.PP
-\fBnewgrp\fR(1),
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)\&.
diff --git a/man/uk/man1/id.1 b/man/uk/man1/id.1
deleted file mode 100644
index 2ca74e94..00000000
--- a/man/uk/man1/id.1
+++ /dev/null
@@ -1,62 +0,0 @@
-'\" t
-.\"     Title: id
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: Ukrainian
-.\"
-.TH "id" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "НАЗВА"
-id \- display current user and group ID names
-.SH "КОРОТКИЙ ОГЛЯД"
-.HP \w'\fBid\fR\ 'u
-\fBid\fR [\-a]
-.SH "ОПИС"
-.PP
-The
-\fBid\fR
-command displays the current real and effective user and group ID names or values\&. If the value does not have a corresponding entry in
-/etc/passwd
-or
-/etc/group, the value will be displayed without the corresponding name\&. The optional
-\fB\-a\fR
-flag will display the group set on systems which support supplementary groups (see
-\fBinitgroups\fR(3))\&.
-.SH "ФАЙЛИ"
-.PP
-/etc/group
-.RS 4
-Відомості щодо груп облікових записів\&.
-.RE
-.PP
-/etc/passwd
-.RS 4
-Відомості щодо облікових записів користувача\&.
-.RE
-.SH "ДИВ\&. ТАКОЖ"
-.PP
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)
diff --git a/man/uk/man1/login.1 b/man/uk/man1/login.1
index 4fd98acb..455ceefa 100644
--- a/man/uk/man1/login.1
+++ b/man/uk/man1/login.1
@@ -2,12 +2,12 @@
 .\"     Title: login
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "login" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "login" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man1/newgrp.1 b/man/uk/man1/newgrp.1
index 4a1acccf..f2d535f8 100644
--- a/man/uk/man1/newgrp.1
+++ b/man/uk/man1/newgrp.1
@@ -2,12 +2,12 @@
 .\"     Title: newgrp
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "newgrp" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "newgrp" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man1/passwd.1 b/man/uk/man1/passwd.1
index 194a2e81..562b2868 100644
--- a/man/uk/man1/passwd.1
+++ b/man/uk/man1/passwd.1
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "passwd" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "passwd" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -110,7 +110,7 @@ days, the user may no longer sign on to the account\&.
 .sp
 Note that this does not disable the account\&. The user may still be able to login using another authentication token (e\&.g\&. an SSH key)\&. To disable the account, administrators should use
 \fBusermod \-\-expiredate 1\fR
-(this set the account\*(Aqs expire date to Jan 2, 1970)\&.
+(this sets the account\*(Aqs expire date to Jan 2, 1970)\&.
 .sp
 Користувачі із заблокованим паролем не зможуть змінювати власний пароль\&.
 .RE
diff --git a/man/uk/man1/sg.1 b/man/uk/man1/sg.1
index 04cb7fbe..242260db 100644
--- a/man/uk/man1/sg.1
+++ b/man/uk/man1/sg.1
@@ -2,12 +2,12 @@
 .\"     Title: sg
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "sg" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "sg" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man1/su.1 b/man/uk/man1/su.1
index b3208b62..ed5e0d42 100644
--- a/man/uk/man1/su.1
+++ b/man/uk/man1/su.1
@@ -2,12 +2,12 @@
 .\"     Title: su
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "su" "1" "18/06/2024" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "su" "1" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man3/shadow.3 b/man/uk/man3/shadow.3
index 54916a3d..ea60c3fd 100644
--- a/man/uk/man3/shadow.3
+++ b/man/uk/man3/shadow.3
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: Library Calls
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "shadow" "3" "18/06/2024" "shadow\-utils 4\&.16\&.0" "Library Calls"
+.TH "shadow" "3" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "Library Calls"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man5/faillog.5 b/man/uk/man5/faillog.5
index 4508da63..41753f5b 100644
--- a/man/uk/man5/faillog.5
+++ b/man/uk/man5/faillog.5
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual:  File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "faillog" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuratio"
+.TH "faillog" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuratio"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man5/gshadow.5 b/man/uk/man5/gshadow.5
index 0d2780ae..7a074664 100644
--- a/man/uk/man5/gshadow.5
+++ b/man/uk/man5/gshadow.5
@@ -2,12 +2,12 @@
 .\"     Title: gshadow
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "gshadow" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "gshadow" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ contains the shadowed information for group accounts\&.
 .PP
 \fBgroup name\fR
 .RS 4
-Це має бути коректна назва групи, яка існує у системі\&.
+It must be a valid group name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/uk/man5/login.access.5 b/man/uk/man5/login.access.5
index e44ca261..3d3cc866 100644
--- a/man/uk/man5/login.access.5
+++ b/man/uk/man5/login.access.5
@@ -2,12 +2,12 @@
 .\"     Title: login.access
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "login\&.access" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "login\&.access" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man5/login.defs.5 b/man/uk/man5/login.defs.5
index 55a7dc32..c97f1a8f 100644
--- a/man/uk/man5/login.defs.5
+++ b/man/uk/man5/login.defs.5
@@ -2,12 +2,12 @@
 .\"     Title: login.defs
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "login\&.defs" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "login\&.defs" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man5/passwd.5 b/man/uk/man5/passwd.5
index 65b22d63..d0ba6038 100644
--- a/man/uk/man5/passwd.5
+++ b/man/uk/man5/passwd.5
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "passwd" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "passwd" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man5/porttime.5 b/man/uk/man5/porttime.5
index 42a5904c..eb84c768 100644
--- a/man/uk/man5/porttime.5
+++ b/man/uk/man5/porttime.5
@@ -2,12 +2,12 @@
 .\"     Title: porttime
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "porttime" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "porttime" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man5/shadow.5 b/man/uk/man5/shadow.5
index 1db8e7ea..06514c9e 100644
--- a/man/uk/man5/shadow.5
+++ b/man/uk/man5/shadow.5
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "shadow" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "shadow" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ is a file which contains the password information for the system\*(Aqs accounts
 .PP
 \fBlogin name\fR
 .RS 4
-Це має бути коректна назва облікового запису, яка існує у системі\&.
+It must be a valid account name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/uk/man5/suauth.5 b/man/uk/man5/suauth.5
index bf058b32..e0b2a163 100644
--- a/man/uk/man5/suauth.5
+++ b/man/uk/man5/suauth.5
@@ -2,12 +2,12 @@
 .\"     Title: suauth
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "suauth" "5" "18/06/2024" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "suauth" "5" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/chgpasswd.8 b/man/uk/man8/chgpasswd.8
index e5a6a1c4..23eca1b9 100644
--- a/man/uk/man8/chgpasswd.8
+++ b/man/uk/man8/chgpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: chgpasswd
 .\"    Author: Thomas K\(/loczko <kloczek@pld.org.pl>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "chgpasswd" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "chgpasswd" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/chpasswd.8 b/man/uk/man8/chpasswd.8
index ef4b5eee..87c752ea 100644
--- a/man/uk/man8/chpasswd.8
+++ b/man/uk/man8/chpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: chpasswd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "chpasswd" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "chpasswd" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/faillog.8 b/man/uk/man8/faillog.8
index 51f2c4e1..053f0720 100644
--- a/man/uk/man8/faillog.8
+++ b/man/uk/man8/faillog.8
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "faillog" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "faillog" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/groupadd.8 b/man/uk/man8/groupadd.8
index 4064ff3d..6c5fe7af 100644
--- a/man/uk/man8/groupadd.8
+++ b/man/uk/man8/groupadd.8
@@ -2,12 +2,12 @@
 .\"     Title: groupadd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "groupadd" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "groupadd" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -146,7 +146,7 @@ Apply changes to configuration files under the root filesystem found under the d
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-Список імен користувачів, яких слід додати як учасників групи\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
 \fB\-g\fR,
diff --git a/man/uk/man8/groupdel.8 b/man/uk/man8/groupdel.8
index 2a5c5aba..39d9ab61 100644
--- a/man/uk/man8/groupdel.8
+++ b/man/uk/man8/groupdel.8
@@ -2,12 +2,12 @@
 .\"     Title: groupdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "groupdel" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "groupdel" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/groupmems.8 b/man/uk/man8/groupmems.8
index 5bb1c296..a7a48b09 100644
--- a/man/uk/man8/groupmems.8
+++ b/man/uk/man8/groupmems.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmems
 .\"    Author: George Kraft, IV
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "groupmems" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "groupmems" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/groupmod.8 b/man/uk/man8/groupmod.8
index b22fa2cb..b489ea33 100644
--- a/man/uk/man8/groupmod.8
+++ b/man/uk/man8/groupmod.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "groupmod" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "groupmod" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@ The options which apply to the
 \fBgroupmod\fR
 command are:
 .PP
-\fB\-a\fR, \fB\-\-append\fR\ \&\fIGID\fR
+\fB\-a\fR, \fB\-\-append\fR
 .RS 4
 Учасників групи вказують за допомогою параметра \-U\&. Записи буде дописано до наявного списку учасників, а не використано для заміни цього списку\&.
 .RE
@@ -131,11 +131,11 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-Список імен користувачів, яких слід додати як учасників групи\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
-\fB\-g\fR,
-\fB\-N\fR, and
+\fB\-g\fR
+and
 \fB\-U\fR
 options are not specified) is defined by the
 \fBUSERGROUPS_ENAB\fR
diff --git a/man/uk/man8/grpck.8 b/man/uk/man8/grpck.8
index d148705d..3dcd89ef 100644
--- a/man/uk/man8/grpck.8
+++ b/man/uk/man8/grpck.8
@@ -2,12 +2,12 @@
 .\"     Title: grpck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "grpck" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "grpck" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/lastlog.8 b/man/uk/man8/lastlog.8
index 9a38d483..ffbb5d76 100644
--- a/man/uk/man8/lastlog.8
+++ b/man/uk/man8/lastlog.8
@@ -2,12 +2,12 @@
 .\"     Title: lastlog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "lastlog" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "lastlog" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/logoutd.8 b/man/uk/man8/logoutd.8
index ecc22237..3dd78680 100644
--- a/man/uk/man8/logoutd.8
+++ b/man/uk/man8/logoutd.8
@@ -2,12 +2,12 @@
 .\"     Title: logoutd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "logoutd" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "logoutd" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/newusers.8 b/man/uk/man8/newusers.8
index e7f0512f..055d6501 100644
--- a/man/uk/man8/newusers.8
+++ b/man/uk/man8/newusers.8
@@ -2,12 +2,12 @@
 .\"     Title: newusers
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "newusers" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "newusers" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/nologin.8 b/man/uk/man8/nologin.8
index 9074e177..56aaa1e2 100644
--- a/man/uk/man8/nologin.8
+++ b/man/uk/man8/nologin.8
@@ -2,12 +2,12 @@
 .\"     Title: nologin
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "nologin" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "nologin" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/pwck.8 b/man/uk/man8/pwck.8
index 45e84dff..1e8e1f08 100644
--- a/man/uk/man8/pwck.8
+++ b/man/uk/man8/pwck.8
@@ -2,12 +2,12 @@
 .\"     Title: pwck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "pwck" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "pwck" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/pwconv.8 b/man/uk/man8/pwconv.8
index 069e4082..2b4c61ff 100644
--- a/man/uk/man8/pwconv.8
+++ b/man/uk/man8/pwconv.8
@@ -2,12 +2,12 @@
 .\"     Title: pwconv
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "pwconv" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "pwconv" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/sulogin.8 b/man/uk/man8/sulogin.8
index 1cf313d6..746f50de 100644
--- a/man/uk/man8/sulogin.8
+++ b/man/uk/man8/sulogin.8
@@ -2,12 +2,12 @@
 .\"     Title: sulogin
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "sulogin" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "sulogin" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/useradd.8 b/man/uk/man8/useradd.8
index c9f8704c..230a9972 100644
--- a/man/uk/man8/useradd.8
+++ b/man/uk/man8/useradd.8
@@ -2,12 +2,12 @@
 .\"     Title: useradd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "useradd" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "useradd" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/userdel.8 b/man/uk/man8/userdel.8
index 777f14d1..e0f3f478 100644
--- a/man/uk/man8/userdel.8
+++ b/man/uk/man8/userdel.8
@@ -2,12 +2,12 @@
 .\"     Title: userdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "userdel" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "userdel" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -46,15 +46,7 @@ command are:
 .PP
 \fB\-f\fR, \fB\-\-force\fR
 .RS 4
-This option forces the removal of the user account, even if the user is still logged in\&. It also forces
-\fBuserdel\fR
-to remove the user\*(Aqs home directory and mail spool, even if another user uses the same home directory or if the mail spool is not owned by the specified user\&. If
-\fBUSERGROUPS_ENAB\fR
-is defined to
-\fIyes\fR
-in
-/etc/login\&.defs
-and if a group exists with the same name as the deleted user, then this group will be removed, even if it is still the primary group of another user\&.
+This option forces the removal of the user account and any other requested actions, skipping any safety checks\&.
 .sp
 \fINote:\fR
 This option is dangerous and may leave your system in an inconsistent state\&.
diff --git a/man/uk/man8/usermod.8 b/man/uk/man8/usermod.8
index 11f019e7..1164f0df 100644
--- a/man/uk/man8/usermod.8
+++ b/man/uk/man8/usermod.8
@@ -2,12 +2,12 @@
 .\"     Title: usermod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "usermod" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "usermod" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/uk/man8/vipw.8 b/man/uk/man8/vipw.8
index 494a14b8..ff963049 100644
--- a/man/uk/man8/vipw.8
+++ b/man/uk/man8/vipw.8
@@ -2,12 +2,12 @@
 .\"     Title: vipw
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 18/06/2024
+.\"      Date: 06/12/2024
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Ukrainian
 .\"
-.TH "vipw" "8" "18/06/2024" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "vipw" "8" "06/12/2024" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/userdel.8.xml b/man/userdel.8.xml
index 5bd2981a..32851f11 100644
--- a/man/userdel.8.xml
+++ b/man/userdel.8.xml
@@ -77,17 +77,9 @@
 	</term>
 	<listitem>
 	  <para>
-	    This option forces the removal of the user account, even if the
-	    user is still
-	    logged in. It also forces <command>userdel</command> to remove
-	    the user's home directory and mail spool, even if another
-	    user uses the same home directory or if the mail spool is not
-	    owned by the specified user.  If
-	    <option>USERGROUPS_ENAB</option> is defined to <emphasis
-	    remap='I'>yes</emphasis> in <filename>/etc/login.defs</filename>
-	    and if a group exists with the same name as the deleted user,
-	    then this group will be removed, even if it is still the primary
-	    group of another user.
+	    This option forces the removal of the user account
+	    and any other requested actions,
+	    skipping any safety checks.
 	  </para>
 	  <para>
 	    <emphasis>Note:</emphasis> This option is dangerous and may leave
diff --git a/man/zh_CN/Makefile.am b/man/zh_CN/Makefile.am
index a8b93a56..59d1072d 100644
--- a/man/zh_CN/Makefile.am
+++ b/man/zh_CN/Makefile.am
@@ -16,7 +16,6 @@ man_MANS = \
 	man8/groupdel.8 \
 	man8/groupmems.8 \
 	man8/groupmod.8 \
-	man1/groups.1 \
 	man8/grpck.8 \
 	man8/grpconv.8 \
 	man8/grpunconv.8 \
@@ -58,7 +57,6 @@ endif
 
 EXTRA_DIST = \
 	$(man_MANS) \
-	man1/id.1 \
 	man8/sulogin.8
 
 if USE_PAM
diff --git a/man/zh_CN/Makefile.in b/man/zh_CN/Makefile.in
index da1dbf67..c84495ce 100644
--- a/man/zh_CN/Makefile.in
+++ b/man/zh_CN/Makefile.in
@@ -346,20 +346,20 @@ top_srcdir = @top_srcdir@
 man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
 	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
-	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
-	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man1/login.1 \
-	man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 man8/newusers.8 \
-	man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
-	man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man3/shadow.3 \
-	man5/shadow.5 man1/su.1 man5/suauth.5 man8/useradd.8 \
-	man8/userdel.8 man8/usermod.8 man8/vigr.8 man8/vipw.8 \
-	$(am__append_1) $(am__append_2)
+	man8/groupmems.8 man8/groupmod.8 man8/grpck.8 man8/grpconv.8 \
+	man8/grpunconv.8 man5/gshadow.5 man1/login.1 man5/login.defs.5 \
+	man8/logoutd.8 man1/newgrp.1 man8/newusers.8 man8/nologin.8 \
+	man1/passwd.1 man5/passwd.5 man8/pwck.8 man8/pwconv.8 \
+	man8/pwunconv.8 man1/sg.1 man3/shadow.3 man5/shadow.5 \
+	man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
+	man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1) \
+	$(am__append_2)
 man_nopam = \
 	man5/limits.5 \
 	man5/login.access.5 \
 	man5/porttime.5
 
-EXTRA_DIST = $(man_MANS) man1/id.1 man8/sulogin.8 $(am__append_3)
+EXTRA_DIST = $(man_MANS) man8/sulogin.8 $(am__append_3)
 LANG = $(notdir $(CURDIR))
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_FALSE@VENDORDIR_COND = without_vendordir
 @ENABLE_REGENERATE_MAN_TRUE@@HAVE_VENDORDIR_TRUE@VENDORDIR_COND = with_vendordir
diff --git a/man/zh_CN/man1/chage.1 b/man/zh_CN/man1/chage.1
index a50208dc..5bbd72d7 100644
--- a/man/zh_CN/man1/chage.1
+++ b/man/zh_CN/man1/chage.1
@@ -2,12 +2,12 @@
 .\"     Title: chage
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "CHAGE" "1" "2024-06-18" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHAGE" "1" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man1/chfn.1 b/man/zh_CN/man1/chfn.1
index 4b997763..8c25ddaf 100644
--- a/man/zh_CN/man1/chfn.1
+++ b/man/zh_CN/man1/chfn.1
@@ -2,12 +2,12 @@
 .\"     Title: chfn
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "CHFN" "1" "2024-06-18" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHFN" "1" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man1/chsh.1 b/man/zh_CN/man1/chsh.1
index 3dba036b..8fd0577d 100644
--- a/man/zh_CN/man1/chsh.1
+++ b/man/zh_CN/man1/chsh.1
@@ -2,12 +2,12 @@
 .\"     Title: chsh
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "CHSH" "1" "2024-06-18" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "CHSH" "1" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man1/expiry.1 b/man/zh_CN/man1/expiry.1
index 4c338e39..cedad4a1 100644
--- a/man/zh_CN/man1/expiry.1
+++ b/man/zh_CN/man1/expiry.1
@@ -2,12 +2,12 @@
 .\"     Title: expiry
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "EXPIRY" "1" "2024-06-18" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "EXPIRY" "1" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man1/gpasswd.1 b/man/zh_CN/man1/gpasswd.1
index ec068801..4fa25639 100644
--- a/man/zh_CN/man1/gpasswd.1
+++ b/man/zh_CN/man1/gpasswd.1
@@ -2,12 +2,12 @@
 .\"     Title: gpasswd
 .\"    Author: Rafal Maszkowski
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "GPASSWD" "1" "2024-06-18" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "GPASSWD" "1" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man1/groups.1 b/man/zh_CN/man1/groups.1
deleted file mode 100644
index 187e6fb6..00000000
--- a/man/zh_CN/man1/groups.1
+++ /dev/null
@@ -1,65 +0,0 @@
-'\" t
-.\"     Title: groups
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: Chinese Simplified
-.\"
-.TH "GROUPS" "1" "2024-06-18" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "名称"
-groups \- 显示当前组名
-.SH "大纲"
-.HP \w'\fBgroups\fR\ 'u
-\fBgroups\fR [\fIuser\fR]
-.SH "描述"
-.PP
-The
-\fBgroups\fR
-command displays the current group names or ID values\&. If the value does not have a corresponding entry in
-/etc/group, the value will be displayed as the numerical group value\&. The optional
-\fIuser\fR
-parameter will display the groups for the named user\&.
-.SH "注意"
-.PP
-Systems which do not support supplementary groups (see
-\fBinitgroups\fR(3)) will have the information from
-/etc/group
-reported\&. The user must use
-\fBnewgrp\fR
-or
-\fBsg\fR
-to change his current real and effective group ID\&.
-.SH "文件"
-.PP
-/etc/group
-.RS 4
-组账户信息。
-.RE
-.SH "参见"
-.PP
-\fBnewgrp\fR(1),
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)\&.
diff --git a/man/zh_CN/man1/id.1 b/man/zh_CN/man1/id.1
deleted file mode 100644
index 72339804..00000000
--- a/man/zh_CN/man1/id.1
+++ /dev/null
@@ -1,62 +0,0 @@
-'\" t
-.\"     Title: id
-.\"    Author: Julianne Frances Haugh
-.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
-.\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
-.\"  Language: Chinese Simplified
-.\"
-.TH "ID" "1" "2024-06-18" "shadow\-utils 4\&.16\&.0" "User Commands"
-.\" -----------------------------------------------------------------
-.\" * Define some portability stuff
-.\" -----------------------------------------------------------------
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.\" http://bugs.debian.org/507673
-.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
-.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "名称"
-id \- display current user and group ID names
-.SH "大纲"
-.HP \w'\fBid\fR\ 'u
-\fBid\fR [\-a]
-.SH "描述"
-.PP
-The
-\fBid\fR
-command displays the current real and effective user and group ID names or values\&. If the value does not have a corresponding entry in
-/etc/passwd
-or
-/etc/group, the value will be displayed without the corresponding name\&. The optional
-\fB\-a\fR
-flag will display the group set on systems which support supplementary groups (see
-\fBinitgroups\fR(3))\&.
-.SH "文件"
-.PP
-/etc/group
-.RS 4
-组账户信息。
-.RE
-.PP
-/etc/passwd
-.RS 4
-用户账户信息。
-.RE
-.SH "参见"
-.PP
-\fBgetgid\fR(2),
-\fBgetgroups\fR(2),
-\fBgetuid\fR(2),
-\fBinitgroups\fR(3)
diff --git a/man/zh_CN/man1/login.1 b/man/zh_CN/man1/login.1
index b6a58e9a..22dbb01f 100644
--- a/man/zh_CN/man1/login.1
+++ b/man/zh_CN/man1/login.1
@@ -2,12 +2,12 @@
 .\"     Title: login
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "LOGIN" "1" "2024-06-18" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "LOGIN" "1" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man1/newgrp.1 b/man/zh_CN/man1/newgrp.1
index 9bdfb380..6d29f827 100644
--- a/man/zh_CN/man1/newgrp.1
+++ b/man/zh_CN/man1/newgrp.1
@@ -2,12 +2,12 @@
 .\"     Title: newgrp
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "NEWGRP" "1" "2024-06-18" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "NEWGRP" "1" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man1/passwd.1 b/man/zh_CN/man1/passwd.1
index 331d0b42..1126ffab 100644
--- a/man/zh_CN/man1/passwd.1
+++ b/man/zh_CN/man1/passwd.1
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "PASSWD" "1" "2024-06-18" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "PASSWD" "1" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -110,7 +110,7 @@ days, the user may no longer sign on to the account\&.
 .sp
 Note that this does not disable the account\&. The user may still be able to login using another authentication token (e\&.g\&. an SSH key)\&. To disable the account, administrators should use
 \fBusermod \-\-expiredate 1\fR
-(this set the account\*(Aqs expire date to Jan 2, 1970)\&.
+(this sets the account\*(Aqs expire date to Jan 2, 1970)\&.
 .sp
 被锁定了密码的用户不允许更改密码。
 .RE
diff --git a/man/zh_CN/man1/sg.1 b/man/zh_CN/man1/sg.1
index eb33cd73..97cb9bf2 100644
--- a/man/zh_CN/man1/sg.1
+++ b/man/zh_CN/man1/sg.1
@@ -2,12 +2,12 @@
 .\"     Title: sg
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "SG" "1" "2024-06-18" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "SG" "1" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man1/su.1 b/man/zh_CN/man1/su.1
index 26f1595f..471114ab 100644
--- a/man/zh_CN/man1/su.1
+++ b/man/zh_CN/man1/su.1
@@ -2,12 +2,12 @@
 .\"     Title: su
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: User Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "SU" "1" "2024-06-18" "shadow\-utils 4\&.16\&.0" "User Commands"
+.TH "SU" "1" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man3/shadow.3 b/man/zh_CN/man3/shadow.3
index 4a46651b..c34cdb1f 100644
--- a/man/zh_CN/man3/shadow.3
+++ b/man/zh_CN/man3/shadow.3
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: Library Calls
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "SHADOW" "3" "2024-06-18" "shadow\-utils 4\&.16\&.0" "Library Calls"
+.TH "SHADOW" "3" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "Library Calls"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man5/faillog.5 b/man/zh_CN/man5/faillog.5
index 4f925588..f8ec0c5c 100644
--- a/man/zh_CN/man5/faillog.5
+++ b/man/zh_CN/man5/faillog.5
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual:  File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "FAILLOG" "5" "2024-06-18" "shadow\-utils 4\&.16\&.0" "File Formats and Configuratio"
+.TH "FAILLOG" "5" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuratio"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man5/gshadow.5 b/man/zh_CN/man5/gshadow.5
index e1a86cdd..a8d11ef0 100644
--- a/man/zh_CN/man5/gshadow.5
+++ b/man/zh_CN/man5/gshadow.5
@@ -2,12 +2,12 @@
 .\"     Title: gshadow
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "GSHADOW" "5" "2024-06-18" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "GSHADOW" "5" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ contains the shadowed information for group accounts\&.
 .PP
 \fBgroup name\fR
 .RS 4
-必须是系统中已经存在的有效组。
+It must be a valid group name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/zh_CN/man5/limits.5 b/man/zh_CN/man5/limits.5
index 0ffa8675..2f326ba4 100644
--- a/man/zh_CN/man5/limits.5
+++ b/man/zh_CN/man5/limits.5
@@ -2,12 +2,12 @@
 .\"     Title: limits
 .\"    Author: Luca Berra
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "LIMITS" "5" "2024-06-18" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LIMITS" "5" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man5/login.access.5 b/man/zh_CN/man5/login.access.5
index 7a8f2b29..ba2f2cf5 100644
--- a/man/zh_CN/man5/login.access.5
+++ b/man/zh_CN/man5/login.access.5
@@ -2,12 +2,12 @@
 .\"     Title: login.access
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "LOGIN\&.ACCESS" "5" "2024-06-18" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LOGIN\&.ACCESS" "5" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man5/login.defs.5 b/man/zh_CN/man5/login.defs.5
index ead34a5d..624fd5bc 100644
--- a/man/zh_CN/man5/login.defs.5
+++ b/man/zh_CN/man5/login.defs.5
@@ -2,12 +2,12 @@
 .\"     Title: login.defs
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "LOGIN\&.DEFS" "5" "2024-06-18" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "LOGIN\&.DEFS" "5" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man5/passwd.5 b/man/zh_CN/man5/passwd.5
index 6b5c16a8..9d1330e6 100644
--- a/man/zh_CN/man5/passwd.5
+++ b/man/zh_CN/man5/passwd.5
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "PASSWD" "5" "2024-06-18" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "PASSWD" "5" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man5/porttime.5 b/man/zh_CN/man5/porttime.5
index 352732f1..a81ecb24 100644
--- a/man/zh_CN/man5/porttime.5
+++ b/man/zh_CN/man5/porttime.5
@@ -2,12 +2,12 @@
 .\"     Title: porttime
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "PORTTIME" "5" "2024-06-18" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "PORTTIME" "5" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man5/shadow.5 b/man/zh_CN/man5/shadow.5
index ff559007..9e4e49c2 100644
--- a/man/zh_CN/man5/shadow.5
+++ b/man/zh_CN/man5/shadow.5
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "SHADOW" "5" "2024-06-18" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SHADOW" "5" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ Each line of this file contains 9 fields, separated by colons (\(lq:\(rq), in th
 .PP
 \fBlogin name\fR
 .RS 4
-必须是有效的账户名，且已经存在于系统中。
+It must be a valid account name, which exists on the system\&.
 .RE
 .PP
 \fBencrypted password\fR
diff --git a/man/zh_CN/man5/suauth.5 b/man/zh_CN/man5/suauth.5
index 21a0dd02..903ac6f2 100644
--- a/man/zh_CN/man5/suauth.5
+++ b/man/zh_CN/man5/suauth.5
@@ -2,12 +2,12 @@
 .\"     Title: suauth
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "SUAUTH" "5" "2024-06-18" "shadow\-utils 4\&.16\&.0" "File Formats and Configuration"
+.TH "SUAUTH" "5" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/chgpasswd.8 b/man/zh_CN/man8/chgpasswd.8
index 910dc29d..232e72fa 100644
--- a/man/zh_CN/man8/chgpasswd.8
+++ b/man/zh_CN/man8/chgpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: chgpasswd
 .\"    Author: Thomas K\(/loczko <kloczek@pld.org.pl>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "CHGPASSWD" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "CHGPASSWD" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/chpasswd.8 b/man/zh_CN/man8/chpasswd.8
index 2408efad..d5d87d55 100644
--- a/man/zh_CN/man8/chpasswd.8
+++ b/man/zh_CN/man8/chpasswd.8
@@ -2,12 +2,12 @@
 .\"     Title: chpasswd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "CHPASSWD" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "CHPASSWD" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/faillog.8 b/man/zh_CN/man8/faillog.8
index bb56925a..054a7820 100644
--- a/man/zh_CN/man8/faillog.8
+++ b/man/zh_CN/man8/faillog.8
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "FAILLOG" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "FAILLOG" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/groupadd.8 b/man/zh_CN/man8/groupadd.8
index 589240c2..00cec478 100644
--- a/man/zh_CN/man8/groupadd.8
+++ b/man/zh_CN/man8/groupadd.8
@@ -2,12 +2,12 @@
 .\"     Title: groupadd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "GROUPADD" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPADD" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -146,7 +146,7 @@ Apply changes to configuration files under the root filesystem found under the d
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
 \fB\-g\fR,
diff --git a/man/zh_CN/man8/groupdel.8 b/man/zh_CN/man8/groupdel.8
index 46c39afe..ca69b59c 100644
--- a/man/zh_CN/man8/groupdel.8
+++ b/man/zh_CN/man8/groupdel.8
@@ -2,12 +2,12 @@
 .\"     Title: groupdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "GROUPDEL" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPDEL" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/groupmems.8 b/man/zh_CN/man8/groupmems.8
index 7e5f1efb..5b622c7b 100644
--- a/man/zh_CN/man8/groupmems.8
+++ b/man/zh_CN/man8/groupmems.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmems
 .\"    Author: George Kraft, IV
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "GROUPMEMS" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPMEMS" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/groupmod.8 b/man/zh_CN/man8/groupmod.8
index 58af4f76..55945d10 100644
--- a/man/zh_CN/man8/groupmod.8
+++ b/man/zh_CN/man8/groupmod.8
@@ -2,12 +2,12 @@
 .\"     Title: groupmod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "GROUPMOD" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GROUPMOD" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@ The options which apply to the
 \fBgroupmod\fR
 command are:
 .PP
-\fB\-a\fR, \fB\-\-append\fR\ \&\fIGID\fR
+\fB\-a\fR, \fB\-\-append\fR
 .RS 4
 If group members are specified with \-U, append them to the existing member list, rather than replacing it\&.
 .RE
@@ -131,11 +131,11 @@ directory\&. This option does not chroot and is intended for preparing a cross\-
 .PP
 \fB\-U\fR, \fB\-\-users\fR
 .RS 4
-A list of usernames to add as members of the group\&.
+A comma\-separated list of usernames to add as members of the group\&.
 .sp
 The default behavior (if the
-\fB\-g\fR,
-\fB\-N\fR, and
+\fB\-g\fR
+and
 \fB\-U\fR
 options are not specified) is defined by the
 \fBUSERGROUPS_ENAB\fR
diff --git a/man/zh_CN/man8/grpck.8 b/man/zh_CN/man8/grpck.8
index 5eca8aee..00ea01c8 100644
--- a/man/zh_CN/man8/grpck.8
+++ b/man/zh_CN/man8/grpck.8
@@ -2,12 +2,12 @@
 .\"     Title: grpck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "GRPCK" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "GRPCK" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/lastlog.8 b/man/zh_CN/man8/lastlog.8
index 1488dc4a..57ef7c49 100644
--- a/man/zh_CN/man8/lastlog.8
+++ b/man/zh_CN/man8/lastlog.8
@@ -2,12 +2,12 @@
 .\"     Title: lastlog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "LASTLOG" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LASTLOG" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/logoutd.8 b/man/zh_CN/man8/logoutd.8
index 4a413ca8..eaf0c459 100644
--- a/man/zh_CN/man8/logoutd.8
+++ b/man/zh_CN/man8/logoutd.8
@@ -2,12 +2,12 @@
 .\"     Title: logoutd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "LOGOUTD" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "LOGOUTD" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/newusers.8 b/man/zh_CN/man8/newusers.8
index c84efbd6..4f23f579 100644
--- a/man/zh_CN/man8/newusers.8
+++ b/man/zh_CN/man8/newusers.8
@@ -2,12 +2,12 @@
 .\"     Title: newusers
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "NEWUSERS" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "NEWUSERS" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/nologin.8 b/man/zh_CN/man8/nologin.8
index 4159e586..5d136362 100644
--- a/man/zh_CN/man8/nologin.8
+++ b/man/zh_CN/man8/nologin.8
@@ -2,12 +2,12 @@
 .\"     Title: nologin
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "NOLOGIN" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "NOLOGIN" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/pwck.8 b/man/zh_CN/man8/pwck.8
index 31177852..04a6845f 100644
--- a/man/zh_CN/man8/pwck.8
+++ b/man/zh_CN/man8/pwck.8
@@ -2,12 +2,12 @@
 .\"     Title: pwck
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "PWCK" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "PWCK" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/pwconv.8 b/man/zh_CN/man8/pwconv.8
index 6d0a3979..ea584d24 100644
--- a/man/zh_CN/man8/pwconv.8
+++ b/man/zh_CN/man8/pwconv.8
@@ -2,12 +2,12 @@
 .\"     Title: pwconv
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "PWCONV" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "PWCONV" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/sulogin.8 b/man/zh_CN/man8/sulogin.8
index b37a236f..d70d3b81 100644
--- a/man/zh_CN/man8/sulogin.8
+++ b/man/zh_CN/man8/sulogin.8
@@ -2,12 +2,12 @@
 .\"     Title: sulogin
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "SULOGIN" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "SULOGIN" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/useradd.8 b/man/zh_CN/man8/useradd.8
index f7caf684..4e1806b2 100644
--- a/man/zh_CN/man8/useradd.8
+++ b/man/zh_CN/man8/useradd.8
@@ -2,12 +2,12 @@
 .\"     Title: useradd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "USERADD" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERADD" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/userdel.8 b/man/zh_CN/man8/userdel.8
index 072c0901..0f03beae 100644
--- a/man/zh_CN/man8/userdel.8
+++ b/man/zh_CN/man8/userdel.8
@@ -2,12 +2,12 @@
 .\"     Title: userdel
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "USERDEL" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERDEL" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -46,15 +46,7 @@ command are:
 .PP
 \fB\-f\fR, \fB\-\-force\fR
 .RS 4
-This option forces the removal of the user account, even if the user is still logged in\&. It also forces
-\fBuserdel\fR
-to remove the user\*(Aqs home directory and mail spool, even if another user uses the same home directory or if the mail spool is not owned by the specified user\&. If
-\fBUSERGROUPS_ENAB\fR
-is defined to
-\fIyes\fR
-in
-/etc/login\&.defs
-and if a group exists with the same name as the deleted user, then this group will be removed, even if it is still the primary group of another user\&.
+This option forces the removal of the user account and any other requested actions, skipping any safety checks\&.
 .sp
 \fINote:\fR
 This option is dangerous and may leave your system in an inconsistent state\&.
diff --git a/man/zh_CN/man8/usermod.8 b/man/zh_CN/man8/usermod.8
index 777feb4d..0ba298a5 100644
--- a/man/zh_CN/man8/usermod.8
+++ b/man/zh_CN/man8/usermod.8
@@ -2,12 +2,12 @@
 .\"     Title: usermod
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "USERMOD" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "USERMOD" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man8/vipw.8 b/man/zh_CN/man8/vipw.8
index 99764f35..c5a06519 100644
--- a/man/zh_CN/man8/vipw.8
+++ b/man/zh_CN/man8/vipw.8
@@ -2,12 +2,12 @@
 .\"     Title: vipw
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2024-06-18
+.\"      Date: 2024-12-06
 .\"    Manual: System Management Commands
-.\"    Source: shadow-utils 4.16.0
+.\"    Source: shadow-utils 4.17.0-rc1
 .\"  Language: Chinese Simplified
 .\"
-.TH "VIPW" "8" "2024-06-18" "shadow\-utils 4\&.16\&.0" "System Management Commands"
+.TH "VIPW" "8" "2024-12-06" "shadow\-utils 4\&.17\&.0\-rc1" "System Management Commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6d2c0521..3aff87b2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,8 +22,6 @@ lib/find_new_sub_gids.c
 lib/find_new_sub_uids.c
 lib/find_new_uid.c
 lib/fputsx.c
-lib/get_gid.c
-lib/get_uid.c
 lib/getdef.c
 lib/getgr_nam_gid.c
 lib/getrange.c
@@ -92,11 +90,9 @@ src/groupadd.c
 src/groupdel.c
 src/groupmems.c
 src/groupmod.c
-src/groups.c
 src/grpck.c
 src/grpconv.c
 src/grpunconv.c
-src/id.c
 src/lastlog.c
 src/login.c
 src/login_nopam.c
diff --git a/po/bs.po b/po/bs.po
index d00c8b5e..ff6e4dc3 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2004-05-09 12:03+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -494,10 +494,6 @@ msgstr ""
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "nepoznata grupa: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "nepoznata grupa: %s\n"
@@ -816,6 +812,10 @@ msgstr ""
 msgid "%s: '%s' contains illegal characters\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: grupa %s postoji\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: grupa %s postoji\n"
@@ -1266,10 +1266,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr ""
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr ""
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1370,12 +1366,6 @@ msgstr ""
 msgid "%s: cannot delete %s\n"
 msgstr "%s: nepoznat član %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr ""
-
-msgid " groups="
-msgstr ""
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1582,6 +1572,10 @@ msgstr "Stara šifra:"
 msgid "%s: failure forking: %s\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: grupa %s postoji\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: grupa %s postoji\n"
@@ -1621,6 +1615,10 @@ msgstr ""
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "nepoznata grupa: %s\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1852,6 +1850,10 @@ msgstr ""
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid user name '%s'\n"
+msgstr "nepoznata grupa: %s\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr ""
@@ -2049,12 +2051,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2646,19 +2648,19 @@ msgid "failed to rename mailbox"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "nepoznata grupa: %s\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "nepoznata grupa: %s\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "nepoznata grupa: %s\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "nepoznata grupa: %s\n"
 
 #, c-format
diff --git a/po/ca.gmo b/po/ca.gmo
index 7a4698c6..f76f84de 100644
Binary files a/po/ca.gmo and b/po/ca.gmo differ
diff --git a/po/ca.po b/po/ca.po
index 5de9d1fb..054bfeb4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,22 +1,22 @@
 # Shadow Catalan translation.
 # Guillem Jover <guillem@debian.org>, 2004, 2005, 2006.
 # Innocent De Marchi <tangram.peces@gmail.com>, 2011-2012
+# Carles Pina i Estany <cpina@debian.org>, 2024
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
-"PO-Revision-Date: 2012-01-22 18:25+0100\n"
-"Last-Translator: Innocent De Marchi <tangram.peces@gmail.com>\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
+"PO-Revision-Date: 2024-08-11 21:26+0100\n"
+"Last-Translator: Carles Pina i Estany <cpina@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n!=1;\n"
-"X-Poedit-Language: Catalan\n"
-"X-Poedit-Country: SPAIN\n"
+"X-Generator: Poedit 3.2.2\n"
 
 #, c-format
 msgid "Warning: unknown group %s\n"
@@ -114,57 +114,52 @@ msgstr "%s: Configuració incorrecta: GID_MIN (%lu), GID_MAX (%lu)\n"
 
 #, c-format
 msgid "%s: Encountered error attempting to use preferred GID: %s\n"
-msgstr ""
+msgstr "%s: s'ha trobat un error en intentar utilitzar el GID preferit: %s\n"
 
 #, c-format
 msgid "%s: failed to allocate memory: %s\n"
 msgstr "%s: no es pot assignar memòria: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+#, c-format
 msgid ""
 "%s: Can't get unique system GID (%s). Suppressing additional messages.\n"
 msgstr ""
-"%s: no es pot obtenir un GID de sistema únic (no hi ha més GID disponibles)\n"
+"%s: no es pot obtenir un GID de sistema únic (%s). S'estan suprimint els "
+"missatges addicionals.\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Can't get unique GID (no more available GIDs)\n"
+#, c-format
 msgid "%s: Can't get unique GID (%s). Suppressing additional messages.\n"
-msgstr "%s: no es pot obtenir un GID únic (no hi ha més GID disponibles)\n"
+msgstr ""
+"%s: no es pot obtenir un GID únic (%s). S'estan suprimint els missatges "
+"addicionals\n"
 
 #, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s: no es pot obtenir un GID únic (no hi ha més GID disponibles)\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-#| "(%lu)\n"
+#, c-format
 msgid ""
 "%s: Invalid configuration: SUB_GID_MIN (%lu), SUB_GID_MAX (%lu), "
 "SUB_GID_COUNT (%lu)\n"
 msgstr ""
-"%s: Configuració incorrecta: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-"(%lu)\n"
+"%s: la configuració no és vàlida: SUB_GID_MIN (%lu), SUB_GID_MAX (%lu), "
+"SUB_GID_COUNT (%lu)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Can't get unique subordinate GID range\n"
-msgstr "%s: no es pot generar l'usuari\n"
+msgstr "%s: no es pot obtenir un únic rang GID subordinat\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-#| "(%lu)\n"
+#, c-format
 msgid ""
 "%s: Invalid configuration: SUB_UID_MIN (%lu), SUB_UID_MAX (%lu), "
 "SUB_UID_COUNT (%lu)\n"
 msgstr ""
-"%s: Configuració incorrecta: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-"(%lu)\n"
+"%s: la configuració no és vàlida: SUB_UID_MIN (%lu), SUB_UID_MAX (%lu), "
+"SUB_UID_COUNT (%lu)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Can't get unique subordinate UID range\n"
-msgstr "%s: no es pot generar l'usuari\n"
+msgstr "%s: no es pot obtenir un únic rang UID subordinat\n"
 
 #, c-format
 msgid ""
@@ -180,18 +175,20 @@ msgstr "%s: Configuració incorrecta: UID_MIN (%lu), UID_MAX (%lu)\n"
 
 #, c-format
 msgid "%s: Encountered error attempting to use preferred UID: %s\n"
-msgstr ""
+msgstr "%s: s'ha trobat un error en intentar utilitzar l'UID preferit: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Can't get unique system UID (no more available UIDs)\n"
+#, c-format
 msgid ""
 "%s: Can't get unique system UID (%s). Suppressing additional messages.\n"
-msgstr "%s: no es pot obtenir un UID únic (no hi ha més UID disponibles)\n"
+msgstr ""
+"%s: no es pot obtenir un UID de sistema únic (%s). S'estan suprimint els "
+"missatges addicionals.\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Can't get unique UID (no more available UIDs)\n"
+#, c-format
 msgid "%s: Can't get unique UID (%s). Suppressing additional messages.\n"
-msgstr "%s: no es pot obtenir un GID únic (no hi ha més GID disponibles)\n"
+msgstr ""
+"%s: no es pot obtenir un UID únic (%s). S'estan suprimint els missatges "
+"addicionals.\n"
 
 #, c-format
 msgid "%s: Can't get unique UID (no more available UIDs)\n"
@@ -210,56 +207,45 @@ msgstr ""
 "error de configuració - element «%s» desconegut (notifiqueu-ho a "
 "l'administrador)\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Authentication failure\n"
+#, c-format
 msgid "%s: Memory allocation failure\n"
-msgstr "%s: l'autenticació ha fallat\n"
+msgstr "%s: Ha fallat l'assignació de memòria\n"
 
 #, c-format
 msgid "%s: subuid overflow detected.\n"
-msgstr ""
+msgstr "%s: s'ha detectat un desbordament subuid.\n"
 
-#, fuzzy, c-format
-#| msgid "%s: invalid field '%s'\n"
+#, c-format
 msgid "%s: Invalid map file %s specified\n"
-msgstr "%s: el camp «%s» no és vàlid\n"
+msgstr "%s: S'ha especificat el fitxer mapa %s que no és vàlid\n"
 
 #, c-format
 msgid "%s: Could not prctl(PR_SET_KEEPCAPS)\n"
-msgstr ""
+msgstr "%s: no s'ha pogut prctl(PR_SET_KEEPCAPS)\n"
 
-#, fuzzy, c-format
-#| msgid "Could not set name for %s\n"
+#, c-format
 msgid "%s: Could not seteuid to %d\n"
-msgstr "No s'ha pogut establir el nom per a %s\n"
+msgstr "%s: No s'ha pogut fer un «seteuid» a %d\n"
 
-#, fuzzy, c-format
-#| msgid "Could not set name for %s\n"
+#, c-format
 msgid "%s: Could not set caps\n"
-msgstr "No s'ha pogut establir el nom per a %s\n"
+msgstr "%s: No s'han pogut establir les «capabilities»\n"
 
-#, fuzzy, c-format
-#| msgid "%s: can't open file\n"
+#, c-format
 msgid "%s: stpeprintf failed!\n"
-msgstr "%s: no es pot obrir el fitxer\n"
+msgstr "%s: ha fallat stpeprintf!\n"
 
-#, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
+#, c-format
 msgid "%s: open of %s failed: %s\n"
-msgstr ""
-"%s: línia %d: no s'ha pogut canviar el propietari (ordre «chown»)  %s: %s\n"
+msgstr "%s: L'obertura de %s ha fallat: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
+#, c-format
 msgid "%s: write to %s failed: %s\n"
-msgstr ""
-"%s: línia %d: no s'ha pogut canviar el propietari (ordre «chown»)  %s: %s\n"
+msgstr "%s: L'escriptura a %s ha fallat: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
+#, c-format
 msgid "%s: closing %s failed: %s\n"
-msgstr ""
-"%s: línia %d: no s'ha pogut canviar el propietari (ordre «chown»)  %s: %s\n"
+msgstr "%s: El tancament de %s ha fallat: %s\n"
 
 msgid "Too many logins.\n"
 msgstr "Massa entrades.\n"
@@ -285,9 +271,9 @@ msgstr "Teniu correu."
 msgid "%s: nscd did not terminate normally (signal %d)\n"
 msgstr "%s: nscd no ha acabat correctament (senyal %d)\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: nscd exited with status %d\n"
-msgstr "%s: «nscd» ha sortit amb l'estat %d"
+msgstr "%s: «nscd» ha sortit amb l'estat %d\n"
 
 msgid "no change"
 msgstr "no hi ha canvis"
@@ -309,7 +295,7 @@ msgstr "massa curta"
 
 #, c-format
 msgid "Bad password: %s.  "
-msgstr "La contrasenya és incorrecta: %s."
+msgstr "La contrasenya és incorrecta: %s.  "
 
 #, c-format
 msgid "passwd: pam_start() failed, error %d\n"
@@ -327,24 +313,23 @@ msgstr "passwd: s'ha actualitzat la contrasenya satisfactòriament\n"
 
 #, c-format
 msgid "%s: PAM modules requesting echoing are not supported.\n"
-msgstr ""
+msgstr "%s: Els mòduls PAM que sol·liciten eco no són compatibles.\n"
 
-#, fuzzy, c-format
-#| msgid "%s: repository %s not supported\n"
+#, c-format
 msgid "%s: conversation type %d not supported.\n"
-msgstr "%s: el dipòsit %s no és admès\n"
+msgstr "%s: El tipus de conversació %d no és compatible.\n"
 
-#, fuzzy, c-format
-#| msgid "%s: pam_start: error %d\n"
+#, c-format
 msgid "%s: (user %s) pam_start failure %d\n"
-msgstr "%s: pam_start: error %d\n"
+msgstr "%s: (usuari %s) «pam_start» ha fallat %d\n"
 
-#, fuzzy, c-format
-#| msgid "passwd: pam_start() failed, error %d\n"
+#, c-format
 msgid ""
 "%s: (user %s) pam_chauthtok() failed, error:\n"
 "%s\n"
-msgstr "passwd: pam_start() ha fallat, error %d\n"
+msgstr ""
+"%s: (usuari %s) «pam_chauthtok()» ha fallat amb l'error:\n"
+"%s\n"
 
 msgid "Password: "
 msgstr "Contrasenya: "
@@ -363,16 +348,17 @@ msgstr "%s: múltiples opcions «--root»\n"
 
 #, c-format
 msgid "%s: option '%s' requires an argument\n"
-msgstr "%s: l'opció '%s' requereix un argument\n"
+msgstr "%s: l'opció «%s» requereix un argument\n"
 
 #, c-format
 msgid "%s: failed to drop privileges (%s)\n"
 msgstr "%s: ha fallat la rebaixa de privilegis (%s)\n"
 
-#, fuzzy, c-format
-#| msgid "%s: invalid chroot path '%s'\n"
+#, c-format
 msgid "%s: invalid chroot path '%s', only absolute paths are supported.\n"
-msgstr "%s: camí «chroot» incorrecta  «%s»\n"
+msgstr ""
+"%s: el camí «chroot» «%s» no és vàlid, només són acceptats els camins "
+"absoluts\n"
 
 #, c-format
 msgid "%s: cannot access chroot directory %s: %s\n"
@@ -382,9 +368,9 @@ msgstr "%s: no es pot accedir al directori «chroot» %s: %s\n"
 msgid "%s: unable to chroot to directory %s: %s\n"
 msgstr "%s: no es pot executar «chroot» en el directori %s: %s\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot chdir in chroot directory %s: %s\n"
-msgstr "%s: no es pot accedir al directori «chroot» %s: %s\n"
+msgstr "%s: no es pot fer «chdir» al directori «chroot» %s: %s\n"
 
 #, c-format
 msgid ""
@@ -400,15 +386,16 @@ msgid ""
 "ENCRYPT_METHOD and the corresponding configuration for your selected hash "
 "method.\n"
 msgstr ""
+"No s'ha pogut generar una sal des de la configuració «%s», comproveu la "
+"configuració a ENCRYPT_METHOD i la configuració corresponent per al mètode "
+"«hash» seleccionat.\n"
 
-#, fuzzy
-#| msgid "Cannot open audit interface - aborting.\n"
 msgid "Cannot open audit interface.\n"
-msgstr "No es pot obrir la interfície d'auditoria - cancel·lant.\n"
+msgstr "No es pot obrir la interfície d'auditoria.\n"
 
 #, c-format
 msgid "%s: can not get previous SELinux process context: %s\n"
-msgstr ""
+msgstr "%s: no es pot obtenir el context previ del procés SELinux: %s\n"
 
 #, c-format
 msgid "[libsemanage]: %s\n"
@@ -438,10 +425,9 @@ msgstr "No es pot iniciar la transacció SELinux\n"
 msgid "Could not query seuser for %s\n"
 msgstr "No es pot consultar el «seuser» per a %s\n"
 
-#, fuzzy, c-format
-#| msgid "Could not set serange for %s\n"
+#, c-format
 msgid "Could not set serange for %s to %s\n"
-msgstr "No s'ha pogut definir el «serange» per a %s\n"
+msgstr "No s'ha pogut definir el «serange» de %s a %s\n"
 
 #, c-format
 msgid "Could not set sename for %s\n"
@@ -494,7 +480,7 @@ msgstr "No es pot validar la transacció SELinux\n"
 #, c-format
 msgid "Login mapping for %s is not defined, OK if default mapping was used\n"
 msgstr ""
-"L'assignació d'inici de sessió per a %s no està definida, seleccionau «OK» "
+"L'assignació d'inici de sessió per a %s no està definida, seleccioneu «OK» "
 "si s'utilitzava l'assignació per defecte\n"
 
 #, c-format
@@ -520,7 +506,7 @@ msgstr "No es pot executar %s"
 
 #, c-format
 msgid "Maximum subsystem depth reached\n"
-msgstr ""
+msgstr "S'ha assolit la profunditat màxima del subsistema\n"
 
 #, c-format
 msgid "Invalid root directory '%s'\n"
@@ -546,10 +532,6 @@ msgstr "%s:  %s no és ni un directori ni un enllaç simbòlic.\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: no es pot llegir l'enllaç simbòlic %s: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: enllaç simbòlic sospitosament llarg:  %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: no es pot crear el directori %s: %s\n"
@@ -615,10 +597,9 @@ msgstr "%s: no es pot obrir el fitxer %s: %s\n"
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s: l'usuari %s està actualment dins el sistema\n"
 
-#, fuzzy, c-format
-#| msgid "%s: user %s is currently logged in\n"
+#, c-format
 msgid "%s: user %s is currently used by process %d\n"
-msgstr "%s: l'usuari %s està actualment dins el sistema\n"
+msgstr "%s: l'usuari %s està actualment en ús pel procés %d\n"
 
 msgid "Unable to determine your tty name."
 msgstr "No s'ha pogut determinar el nom del vostre tty."
@@ -654,10 +635,9 @@ msgstr ""
 msgid "  -h, --help                    display this help message and exit\n"
 msgstr "  -h, --help                    mostra aquesta ajuda i acaba\n"
 
-#, fuzzy
-#| msgid "  -g, --group                   edit group database\n"
 msgid "  -i, --iso8601                 use YYYY-MM-DD when printing dates\n"
-msgstr "  -g, --group                   edita la base de dades del grup\n"
+msgstr ""
+"  -i, --iso8601                 usa YYYY-MM-DD a l'hora de mostrar dates\n"
 
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
@@ -678,23 +658,20 @@ msgstr ""
 "  -m, --mindays DIES_MÍN        estableix el número mínim de dies abans\n"
 "                                del canvi de contrasenya a DIES_MÍN\n"
 
-#, fuzzy
 msgid ""
 "  -M, --maxdays MAX_DAYS        set maximum number of days before password\n"
 "                                change to MAX_DAYS\n"
 msgstr ""
-"  -M, --maxdays DIES_MÀX        estableix el número màxim de dies abans\n"
-"                                del canvi de contrasenya a DIES_MÀX\n"
+"  -M, --maxdays DIES_MÀX        estableix en DIES_MÀX el màxim nombre de "
+"dies\n"
+"                                abans de canviar la contrasenya\n"
 
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
 msgstr ""
-"  -R, --root CHROOT_DIR         fes «chroot» en el directori CHROOT_DIR \n"
+"  -R, --root DIR_CHROOT         fes «chroot» en el directori DIR_CHROOT\n"
 
-#, fuzzy
-#| msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
 msgid "  -P, --prefix PREFIX_DIR       directory prefix\n"
-msgstr ""
-"  -R, --root CHROOT_DIR         fes «chroot» en el directori CHROOT_DIR \n"
+msgstr "  -P, --prefix DIR_PREFIX      directori prefix\n"
 
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
@@ -727,7 +704,7 @@ msgid "never"
 msgstr "mai"
 
 msgid "future"
-msgstr ""
+msgstr "futur"
 
 msgid "Last password change\t\t\t\t\t: "
 msgstr "Últim canvi de contrasenya\t\t\t\t: "
@@ -823,30 +800,28 @@ msgstr ""
 "Opcions:\n"
 
 msgid "  -f, --full-name FULL_NAME     change user's full name\n"
-msgstr "  -f, --full-name FULL_NAME     canviar el nom complet de l'usuari\n"
+msgstr "  -f, --full-name NOM_COMPLET  canvia el nom complet de l'usuari\n"
 
 msgid "  -h, --home-phone HOME_PHONE   change user's home phone number\n"
 msgstr ""
-"  -h, --home-phone HOME_PHONE   canvia el número de telèfon domestic de "
-"l'usuari\n"
+"  -h, --home-phone TELÈFON_LLAR       canvia el número de telèfon domèstic "
+"de l'usuari\n"
 
 msgid "  -o, --other OTHER_INFO        change user's other GECOS information\n"
 msgstr ""
-"  -o, --other OTHER_INFO        canvia altres informacions «GECOS» de "
+"  -o, --other ALTRA_INFORMACIÓ        canvia altres informacions «GECOS» de "
 "l'usuari\n"
 
 msgid "  -r, --room ROOM_NUMBER        change user's room number\n"
-msgstr ""
-"  -r, --room ROOM_NUMBER        canviar el número d'espai de l'usuari\n"
+msgstr "  -r, --room NÚMERO_SALA       canvia el número de sala de l'usuari\n"
 
 msgid "  -u, --help                    display this help message and exit\n"
-msgstr ""
-"  -u, --help                    mostra aquest missatge d'ajuda i surt\n"
+msgstr "  -u, --help                   mostra aquest missatge d'ajuda i surt\n"
 
 msgid "  -w, --work-phone WORK_PHONE   change user's office phone number\n"
 msgstr ""
-"  -w, --work-phone WORK_PHONE   canvia el número de telèfon del treball de "
-"l'usuari\n"
+"  -w, --work-phone TELÈFON_FEINA     canvia el número de telèfon de la feina "
+"de l'usuari\n"
 
 msgid "Full Name"
 msgstr "Nom complet"
@@ -856,7 +831,7 @@ msgid "\t%s: %s\n"
 msgstr "\t%s: %s\n"
 
 msgid "Room Number"
-msgstr "Número d'espai"
+msgstr "Número de sala"
 
 msgid "Work Phone"
 msgstr "Telèfon de la feina"
@@ -885,11 +860,11 @@ msgstr "%s: el nom no és vàlid: «%s»\n"
 # traducció dubtosa
 #, c-format
 msgid "%s: room number with non-ASCII characters: '%s'\n"
-msgstr "%s: número d'habitació amb caràcters que no són ASCII: «%s»\n"
+msgstr "%s: número de sala amb caràcters que no són ASCII: «%s»\n"
 
 #, c-format
 msgid "%s: invalid room number: '%s'\n"
-msgstr "%s: el número d'habitació no és vàlid: «%s»\n"
+msgstr "%s: el número de sala no és vàlid: «%s»\n"
 
 #, c-format
 msgid "%s: invalid work phone: '%s'\n"
@@ -907,6 +882,11 @@ msgstr "%s: «%s» conté caràcters que no són ASCII\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: «%s» conté caràcters no permesos\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: «%s» no és un nom de grup vàlid\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: l'usuari «%s» no existeix\n"
@@ -942,21 +922,16 @@ msgstr ""
 "                                l'algorisme MD5\n"
 
 # traducció dubtosa
-#, fuzzy
-#| msgid ""
-#| "  -s, --sha-rounds              number of SHA rounds for the SHA*\n"
-#| "                                crypt algorithms\n"
 msgid ""
 "  -s, --sha-rounds              number of rounds for the SHA, BCRYPT\n"
 "                                or YESCRYPT crypt algorithms\n"
 msgstr ""
-" -s, --sha-rounds              nombre de passos SHA pel\n"
-"                                algorisme de xifratge SHA*\n"
+"  -s, --sha-rounds              nombre de passos pels algoritmes de\n"
+"                                xifratge SHA, BCRYPT o YESCRYPT\n"
 
-#, fuzzy, c-format
-#| msgid "%s: unsupported crypt method: %s\n"
+#, c-format
 msgid "%s: no crypt method defined\n"
-msgstr "%s:  mètode de xifratge no està implementat: %s\n"
+msgstr "%s: no s'ha definit cap mètode de xifratge\n"
 
 #, c-format
 msgid "%s: %s flag is only allowed with the %s flag\n"
@@ -978,9 +953,9 @@ msgstr "%s: línia %d: la línia és massa llarga\n"
 msgid "%s: line %d: missing new password\n"
 msgstr "%s: línia %d: manca la nova contrasenya\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: failed to crypt password with salt '%s': %s\n"
-msgstr "%s: Error en escriure %s: %s\n"
+msgstr "%s: no s'ha pogut xifrar la contrasenya amb la sal «%s»: %s\n"
 
 #, c-format
 msgid "%s: line %d: group '%s' does not exist\n"
@@ -1010,15 +985,13 @@ msgstr ""
 msgid "Login Shell"
 msgstr "Intèrpret d'accés"
 
-#, fuzzy, c-format
-#| msgid "%s: Cannot get the size of %s: %s\n"
+#, c-format
 msgid "Cannot parse shell files: %s"
-msgstr "%s: No es pot obtenir la mida de %s: %s\n"
+msgstr "No es poden analitzar els fitxers d'intèrpret d'ordres: %s"
 
-#, fuzzy, c-format
-#| msgid "%s: cannot create new defaults file\n"
+#, c-format
 msgid "Cannot evaluate entries in shell files: %s"
-msgstr "%s: no es pot crear un fitxer nou de preferències predeterminades\n"
+msgstr "No es poden avaluar les entrades dels fitxers d'intèrpret d'ordres: %s"
 
 #, c-format
 msgid "You may not change the shell for '%s'.\n"
@@ -1032,10 +1005,9 @@ msgstr "S'està canviant l'intèrpret d'accés per a %s\n"
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s: L'entrada no és vàlida: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: %s is an invalid shell\n"
+#, c-format
 msgid "%s: Warning: %s is an invalid shell\n"
-msgstr "%s: %s no és un intèrpret («shell») vàlid.\n"
+msgstr "%s: Avís: %s no és un intèrpret d'ordres vàlid\n"
 
 #, c-format
 msgid "%s: %s is an invalid shell\n"
@@ -1226,7 +1198,7 @@ msgid "Re-enter new password: "
 msgstr "Tornau a escriure la nova contrasenya: "
 
 msgid "They don't match; try again"
-msgstr "No coincideixen; intenteu-ho de nou."
+msgstr "No coincideixen; intenteu-ho de nou"
 
 #, c-format
 msgid "%s: Try again later\n"
@@ -1291,24 +1263,21 @@ msgstr ""
 msgid "  -r, --system                  create a system account\n"
 msgstr "  -r, --system                  genera un compte del sistema\n"
 
-#, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -U, --users USERS             list of user members of this group\n"
-msgstr "  -l, --list                    llista els membres del grup\n"
+msgstr ""
+"  -U, --users USUARIS             llista dels usuaris membres d'aquest grup\n"
 
-#, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
+#, c-format
 msgid "Invalid member username %s\n"
-msgstr "el nom d'usuari «%s» no és vàlid\n"
+msgstr "El nom d'usuari del membre «%s» no és vàlid\n"
 
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s: «%s» no és un nom de grup vàlid\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Cannot open %s: %s\n"
+#, c-format
 msgid "%s: cannot open %s: %s\n"
-msgstr "%s: no es pot obrir el fitxer %s: %s\n"
+msgstr "%s: no es pot obrir %s: %s\n"
 
 #, c-format
 msgid "%s: invalid group ID '%s'\n"
@@ -1334,14 +1303,15 @@ msgid ""
 "  -P, --prefix PREFIX_DIR       prefix directory where are located the /etc/"
 "* files\n"
 msgstr ""
+"  -P, --prefix PREFIXDIR        prefix del directori on es troben els "
+"fitxers /etc/*\n"
 
-#, fuzzy
 msgid ""
 "  -f, --force                   delete group even if it is the primary group "
 "of a user\n"
 msgstr ""
-"  -r, --reset                   restableix els comptadors d'errors "
-"d'identificació\n"
+"  -f, --force                   esborra el grup encara que sigui el grup "
+"primari d'un usuari\n"
 
 #, c-format
 msgid "%s: cannot remove entry '%s' from %s\n"
@@ -1415,21 +1385,14 @@ msgstr "%s: el seu nom de grup no concorda amb el seu nom d'usuari\n"
 msgid "%s: only root can use the -g/--group option\n"
 msgstr "%s:només l'usuari «root» pot fer servir l'opció -g/--group\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --append                  append the user to the supplemental "
-#| "GROUPS\n"
-#| "                                mentioned by the -G option without "
-#| "removing\n"
-#| "                                the user from other groups\n"
 msgid ""
 "  -a, --append                  append the users mentioned by -U option to "
 "the group \n"
 "                                without removing existing user members\n"
 msgstr ""
-"  -a, --append                  afegeix l'usuari als GRUPS addicionals\n"
-"                                llistats amb la opció -G sense eliminar-los\n"
-"                                d'altres grups\n"
+"  -a, --append                  afegeix al grup els usuaris citats amb "
+"l'opció -U\n"
+"                                sense eliminar-ne els usuaris ja existents\n"
 
 msgid "  -g, --gid GID                 change the group ID to GID\n"
 msgstr "  -g, --gid GID                 canvia l'ID del grup per GID\n"
@@ -1453,10 +1416,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: el nom de grup «%s» no és vàlid\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: usuari %s desconegut\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1490,6 +1449,7 @@ msgstr "  -s, --sort                    ordena les entrades per UID\n"
 msgid ""
 "  -S, --silence-warnings        silence controversial/paranoid warnings\n"
 msgstr ""
+"  -S, --silence-warnings        silencia els avisos polèmics/paranoics\n"
 
 #, c-format
 msgid "%s: -s and -r are incompatible\n"
@@ -1527,7 +1487,7 @@ msgstr "no hi ha cap entrada coincident al fitxer de grup en %s\n"
 
 #, c-format
 msgid "add group '%s' in %s? "
-msgstr "voleu afegir el grup «%s» a %s?"
+msgstr "voleu afegir el grup «%s» a %s? "
 
 #, c-format
 msgid ""
@@ -1566,33 +1526,25 @@ msgstr "%s: no hi ha canvis\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: no es pot eliminar %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Forma d'ús: id [-a]\n"
-
-msgid " groups="
-msgstr " grups="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
 "  -b, --before DIES             mostra només els registres de lastlog més\n"
 "                                antics que DIES\n"
 
-#, fuzzy
 msgid ""
 "  -C, --clear                   clear lastlog record of a user (usable only "
 "with -u)\n"
 msgstr ""
-"  -a, --all                     mostra els registres «faillog» per a tots "
-"els usuaris\n"
+"  -C, --clear                   neteja el registre lastlog de l'usuari "
+"(utilitzable només amb -u)\n"
 
-#, fuzzy
 msgid ""
 "  -S, --set                     set lastlog record to current time (usable "
 "only with -u)\n"
 msgstr ""
-"  -a, --all                     mostra els registres «faillog» per a tots "
-"els usuaris\n"
+"  -S, --set                     estableix el registre de lastlog per l'hora "
+"actual (utilitzable només amb -u)\n"
 
 msgid ""
 "  -t, --time DAYS               print only lastlog records more recent than "
@@ -1606,10 +1558,9 @@ msgid ""
 msgstr ""
 "  -u, --user USUARI              mostra el registre de lastlog de l'USUARI\n"
 
-#, fuzzy, c-format
-#| msgid "Username                Port     Latest"
+#, c-format
 msgid "Username         Port     From%*sLatest\n"
-msgstr "Usuari                  Port     Últim"
+msgstr "Usuari                  Port     De%*sÚltim\n"
 
 msgid "Username                Port     Latest"
 msgstr "Usuari                  Port     Últim"
@@ -1622,28 +1573,33 @@ msgid ""
 "%s: Selected uid(s) are higher than LASTLOG_UID_MAX (%lu),\n"
 "\tthe output might be incorrect.\n"
 msgstr ""
+"%s: els uid seleccionats són més alts que LASTLOG_UID_MAX (%lu),\n"
+"\tla sortida pot ser incorrecta.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Failed to update the entry for UID %lu\n"
-msgstr "%s: No s'ha pogut obtenir l'entrada de la UID %lu\n"
+msgstr "%s: No s'ha pogut actualitzar l'entrada de l'UID %lu\n"
 
 #, c-format
 msgid ""
 "%s: Selected uid(s) are higher than LASTLOG_UID_MAX (%lu),\n"
 "\tthey will not be updated.\n"
 msgstr ""
+"%s: els uid seleccionats són més alts que LASTLOG_UID_MAX (%lu),\n"
+"\tno s'actualitzaran.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Failed to update the lastlog file\n"
-msgstr "%s: no es pot actualitzar el fitxer de contrasenyes\n"
+msgstr "%s: No s'ha pogut actualitzar el fitxer lastlog\n"
 
 #, c-format
 msgid "%s: Option -C cannot be used together with option -S\n"
-msgstr ""
+msgstr "%s: l'opció -C no es pot utilitzar juntament amb l'opció -S\n"
 
 #, c-format
 msgid "%s: Options -C and -S require option -u to specify the user\n"
 msgstr ""
+"%s: les opcions -C i -S requereixen l'opció -u per especificar l'usuari\n"
 
 #, c-format
 msgid "Usage: %s [-p] [name]\n"
@@ -1742,48 +1698,49 @@ msgstr "Forma d'ús: logoutd\n"
 
 #, c-format
 msgid "%s: gid range [%lu-%lu) -> [%lu-%lu) not allowed\n"
-msgstr ""
+msgstr "%s: l'interval de gid [%lu-%lu) -> [%lu-%lu) no està permès\n"
 
 #, c-format
 msgid ""
 "usage: %s [<pid|fd:<pidfd>] <gid> <lowergid> <count> [ <gid> <lowergid> "
 "<count> ] ... \n"
 msgstr ""
+"ús: %s [<pid|fd:<pidfd>] <gid> <gid menor> <compte> [ <gid> <gid menor> "
+"<compte> ] ... \n"
 
 #, c-format
 msgid "%s: kernel doesn't support setgroups restrictions\n"
-msgstr ""
+msgstr "%s: el nucli no admet restriccions de «setgroups»\n"
 
-#, fuzzy, c-format
-#| msgid "%s: can't open group file\n"
+#, c-format
 msgid "%s: couldn't open process setgroups: %s\n"
-msgstr "%s: no es pot obrir el fitxer de grups\n"
+msgstr "%s: no s'ha pogut obrir el process setgroups: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to remove %s\n"
+#, c-format
 msgid "%s: failed to read setgroups: %s\n"
-msgstr "%s: fallida en eliminar %s\n"
+msgstr "%s: no s'ha pogut llegir el «setgroups»: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to remove %s\n"
+#, c-format
 msgid "%s: failed to seek setgroups: %s\n"
-msgstr "%s: fallida en eliminar %s\n"
+msgstr "%s: no s'han pogut cercar els setgroups: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to unlock %s\n"
+#, c-format
 msgid "%s: failed to setgroups %s policy: %s\n"
-msgstr "%s: ha fallat el desbloqueig de %s\n"
+msgstr "%s: no s'ha pogut establir la política de grups %s: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Failed to create tcb directory for %s\n"
+#, c-format
 msgid "%s: Could not stat directory for process\n"
-msgstr "%s: no es pot generar el directori «tcb» per a %s\n"
+msgstr ""
+"%s: No s'ha pogut fer stat al directori del procés\n"
+"\n"
 
 #, c-format
 msgid ""
 "%s: Target process is owned by a different user: uid:%lu pw_uid:%lu st_uid:"
 "%lu, gid:%lu pw_gid:%lu st_gid:%lu\n"
 msgstr ""
+"%s: El procés de destinació és propietat d'un usuari diferent: uid:%lu "
+"pw_uid:%lu st_uid:%lu, gid:%lu pw_gid:%lu st_gid:%lu\n"
 
 msgid "Usage: newgrp [-] [group]\n"
 msgstr "Forma d'ús: newgrp [-] [grup]\n"
@@ -1791,9 +1748,9 @@ msgstr "Forma d'ús: newgrp [-] [grup]\n"
 msgid "Usage: sg group [[-c] command]\n"
 msgstr "Forma d'ús: sg grup [[-c] ordre]\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: failed to crypt password with previous salt: %s\n"
-msgstr "%s: Error en escriure %s: %s\n"
+msgstr "%s: no s'ha pogut xifrar la contrasenya amb la sal prèvia: %s\n"
 
 msgid "Invalid password.\n"
 msgstr "Contrasenya no vàlida.\n"
@@ -1802,6 +1759,11 @@ msgstr "Contrasenya no vàlida.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: fallada al fer fork: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: «%s» no és un nom de grup vàlid\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: el GID »%lu« no existeix\n"
@@ -1811,23 +1773,22 @@ msgstr "hi ha massa grups\n"
 
 #, c-format
 msgid "%s: uid range [%lu-%lu) -> [%lu-%lu) not allowed\n"
-msgstr ""
+msgstr "%s: l'interval d'uid [%lu-%lu) -> [%lu-%lu) no està permès\n"
 
 #, c-format
 msgid ""
 "usage: %s [<pid>|fd:<pidfd>] <uid> <loweruid> <count> [ <uid> <loweruid> "
 "<count> ] ... \n"
 msgstr ""
+"ús: %s [<pid>|fd:<pidfd>] <uid> <uid menor> <compte> [ <uid> <uid menor> "
+"<compte> ] ... \n"
 
-#, fuzzy, c-format
-#| msgid "%s: Failed to create tcb directory for %s\n"
+#, c-format
 msgid "%s: Could not stat directory for target process\n"
-msgstr "%s: no es pot generar el directori «tcb» per a %s\n"
+msgstr "%s: No s'ha pogut fer stat al directori del procés objectiu\n"
 
-#, fuzzy
-#| msgid "  -q, --quiet                   quiet mode\n"
 msgid "  -b, --badname                 allow bad names\n"
-msgstr "  -q, --quiet                   mode silenciós\n"
+msgstr "  -b, --badname                 permet noms dolents\n"
 
 msgid "  -r, --system                  create system accounts\n"
 msgstr "  -r, --system                  genera els comptes del sistema\n"
@@ -1840,14 +1801,17 @@ msgstr "%s: el grup «%s» és un grup «shadow», però no existeix a /etc/grou
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s: l'ID d'usuari «%s» no és vàlid\n"
 
-#, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
+#, c-format
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
+msgstr "%s: el nom d'usuari no és vàlid «%s»: useu --badname per ignorar-lo\n"
+
+#, c-format
+msgid "%s: invalid user name '%s'\n"
 msgstr "%s: el nom d'usuari «%s» no és vàlid\n"
 
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
-msgstr ""
+msgstr "%s: proporciona «--crypt-method» abans del nombre de rondes\n"
 
 #, c-format
 msgid "%s: line %d: invalid line\n"
@@ -1871,20 +1835,17 @@ msgstr "%s: línia %d: no es pot generar el grup\n"
 msgid "%s: line %d: user '%s' does not exist in %s\n"
 msgstr "%s: line %d: l'usuari «%s» no existeix a %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: unlink: %s: %s\n"
+#, c-format
 msgid "%s: line %d: %s\n"
-msgstr "%s: desvincular: %s: %s\n"
+msgstr "%s: línia %d: %s\n"
 
 #, c-format
 msgid "%s: line %d: can't update password\n"
 msgstr "%s: línia %d: no es pot actualitzar la contrasenya\n"
 
-#, fuzzy, c-format
-#| msgid "%s: line %d: mkdir %s failed: %s\n"
+#, c-format
 msgid "%s: line %d: homedir must be an absolute path\n"
-msgstr ""
-"%s: línia %d: no s'ha pogut generar el directori «%s» (ordre mkdir): %s\n"
+msgstr "%s: línia %d: el directori d'usuari ha de ser un camí absolut\n"
 
 #, c-format
 msgid "%s: line %d: mkdir %s failed: %s\n"
@@ -1900,17 +1861,17 @@ msgstr ""
 msgid "%s: line %d: can't update entry\n"
 msgstr "%s: línia %d: no es pot actualitzar l'entrada\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't find subordinate user range\n"
-msgstr "%s: no es pot generar l'usuari\n"
+msgstr "%s: no es pot trobar el rang d'usuari subordinat\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: failed to prepare new %s entry\n"
-msgstr "%s: ha fallat la preparació de la nova entrada %s: «%s»\n"
+msgstr "%s: ha fallat la preparació de la nova entrada %s\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't find subordinate group range\n"
-msgstr "%s: no es pot actualitzar el fitxer de grups\n"
+msgstr "%s: no es pot trobar el rang de grups subordinat\n"
 
 msgid ""
 "  -a, --all                     report password status on all accounts\n"
@@ -1983,11 +1944,8 @@ msgstr ""
 "  -x, --maxdays DIES_MÀX        estableix els dies màxims abans del canvi\n"
 "                                de contrasenya a DIES_MÀX\n"
 
-#, fuzzy
-#| msgid "  -l, --list                    show account aging information\n"
 msgid "  -s, --stdin                   read new token from stdin\n"
-msgstr ""
-"  -l, --list                    mostra informació d'envelliment del compte\n"
+msgstr "  -s, --stdin                   llegeix el nou token de stdin\n"
 
 msgid "Old password: "
 msgstr "Contrasenya antiga: "
@@ -2009,13 +1967,11 @@ msgstr ""
 "Feu servir una combinació de lletres majúscules i minúscules i\n"
 "números.\n"
 
-#, fuzzy
-#| msgid "%s: fields too long\n"
 msgid "Password is too long.\n"
-msgstr "%s: els camps són massa llargs\n"
+msgstr "La contrasenya és massa llarga.\n"
 
 msgid "New password: "
-msgstr "Contrasenya nova:"
+msgstr "Contrasenya nova: "
 
 msgid "Try again."
 msgstr "Intenteu-ho de nou."
@@ -2038,10 +1994,11 @@ msgstr "No es pot canviar la contrasenya de %s.\n"
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "Encara no es pot canviar la contrasenya de %s.\n"
 
-#, fuzzy, c-format
-#| msgid "%s: shadow passwords required for -e\n"
+#, c-format
 msgid "%s: malformed password data obtained for user %s\n"
-msgstr "%s: les contrasenyes ombra són requerides per a «-e»\n"
+msgstr ""
+"%s: les dades de contrasenya obtingudes per l'usuari %s no estan ben "
+"formades\n"
 
 #, c-format
 msgid ""
@@ -2057,15 +2014,14 @@ msgstr ""
 msgid "%s: repository %s not supported\n"
 msgstr "%s: el dipòsit %s no és admès\n"
 
-#, fuzzy, c-format
-#| msgid "%s: only root can use the -g/--group option\n"
+#, c-format
 msgid "%s: only root can use --stdin/-s option\n"
-msgstr "%s:només l'usuari «root» pot fer servir l'opció -g/--group\n"
+msgstr "%s: només l'usuari «root» pot fer servir l'opció --stdin/-s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: %s is not authorized to change the password of %s\n"
+#, c-format
 msgid "%s: root is not authorized by SELinux to change the password of %s\n"
-msgstr "%s: %s no està autoritzat per canviar la contrasenya de %s\n"
+msgstr ""
+"%s: «root» no està autoritzat pel SELinux per canviar la contrasenya de %s\n"
 
 #, c-format
 msgid "%s: You may not view or modify password information for %s.\n"
@@ -2120,9 +2076,13 @@ msgstr "l'entrada del fitxer de contrasenyes no és vàlida"
 msgid "duplicate password entry"
 msgstr "l'entrada de contrasenya està duplicada"
 
+#, c-format
+msgid "invalid user name '%s': use --badname to ignore\n"
+msgstr "el nom d'usuari «%s» no és vàlid: useu --badname per ignorar-ho\n"
+
 #, fuzzy, c-format
 #| msgid "%s: invalid user name '%s'\n"
-msgid "invalid user name '%s': use --badname to ignore\n"
+msgid "invalid user name '%s'\n"
 msgstr "%s: el nom d'usuari «%s» no és vàlid\n"
 
 #, c-format
@@ -2219,32 +2179,18 @@ msgid "Session terminated, terminating shell..."
 msgstr "Sessió acabada, finalitzant el «shell»..."
 
 msgid " ...killed.\n"
-msgstr "...mort.\n"
+msgstr " ...matat.\n"
 
 msgid " ...waiting for child to terminate.\n"
-msgstr "...esperant al fill per acabar.\n"
+msgstr " ...esperant que el fill acabi.\n"
 
 msgid " ...terminated.\n"
-msgstr "...acabat.\n"
+msgstr " ...acabat.\n"
 
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: su [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -, -l, --login                make the shell a login shell\n"
-#| "  -m, -p,\n"
-#| "  --preserve-environment        do not reset environment variables, and\n"
-#| "                                keep the same shell\n"
-#| "  -s, --shell SHELL             use SHELL instead of the default in "
-#| "passwd\n"
-#| "\n"
 msgid ""
 "Usage: su [options] [-] [username [args]]\n"
 "\n"
@@ -2259,7 +2205,7 @@ msgid ""
 "\n"
 "If no username is given, assume root.\n"
 msgstr ""
-"Forma d'ús: su [opcions] [USUARI]\n"
+"Forma d'ús: su [opcions] [-] [USUARI [args]]\n"
 "\n"
 "Opcions:\n"
 "  -c, --command ORDRE           passa l'ORDRE a l'intèrpret d'ordres\n"
@@ -2272,6 +2218,8 @@ msgstr ""
 "  -s, --shell INTÈRPRET         fes servir INTÈRPRET en comptes del\n"
 "                                predeterminat a passwd\n"
 "\n"
+"\n"
+"Si no s'indica cap nom d'usuari, assumeix root.\n"
 
 #, c-format
 msgid ""
@@ -2284,10 +2232,13 @@ msgstr ""
 #, c-format
 msgid "Password field is empty, this is forbidden for all accounts.\n"
 msgstr ""
+"El camp de contrasenya està buit, això està prohibit per a tots els "
+"comptes.\n"
 
 #, c-format
 msgid "Password field is empty, this is forbidden for super-user.\n"
 msgstr ""
+"El camp de contrasenya està buit, això està prohibit per al superusuari.\n"
 
 #, c-format
 msgid "You are not authorized to su %s\n"
@@ -2308,10 +2259,9 @@ msgstr "%s:  No estau autoritzat a usar «su» en aquest moment\n"
 msgid "No passwd entry for user '%s'\n"
 msgstr "No hi ha entrada de contrasenya per a l'usuari «%s»\n"
 
-#, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
+#, c-format
 msgid "Overlong user name '%s'\n"
-msgstr "el nom d'usuari «%s» no és vàlid\n"
+msgstr "Nom d'usuari massa llarg «%s»\n"
 
 #, c-format
 msgid "%s: must be run from a terminal\n"
@@ -2354,26 +2304,30 @@ msgstr "S'està entrant en mode de manteniment del sistema"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: %s va ser generat, però no és possible eliminar-ho\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
-msgstr "%s: la configuració %s a %s serà ignorada\n"
-
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
-msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
-"group\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: la configuració %s a %s serà ignorada\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create new defaults file\n"
-msgid "%s: cannot create new defaults file: %s\n"
-msgstr "%s: no es pot crear un fitxer nou de preferències predeterminades\n"
+#| msgid ""
+#| "%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+#| "group\n"
+msgid ""
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
+"group\n"
+msgstr ""
+"%s: la configuració «%s» a %s té un grup no vàlid, s'ignorarà el grup "
+"erroni\n"
 
-#, fuzzy, c-format
-#| msgid "%s: cannot create new defaults file\n"
+#, c-format
+msgid "%s: cannot create new defaults file: %s\n"
+msgstr "%s: no es pot crear un fitxer nou de valors predeterminats: %s\n"
+
+#, c-format
 msgid "%s: cannot create directory for defaults file\n"
-msgstr "%s: no es pot crear un fitxer nou de preferències predeterminades\n"
+msgstr ""
+"%s: no es pot crear un directori per al fitxer de valors predeterminats\n"
 
 #, c-format
 msgid "%s: cannot open new defaults file\n"
@@ -2383,9 +2337,9 @@ msgstr "%s: no es pot obrir un fitxer nou de preferències predeterminades\n"
 msgid "%s: line too long in %s: %s..."
 msgstr "%s: línia massa llarga a %s: %s..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Cannot create backup file (%s): %s\n"
-msgstr "%s: no es pot generar l'enllaç simbòlic %s: %s\n"
+msgstr "%s: No es pot crear el fitxer de còpia de seguretat (%s): %s\n"
 
 #, c-format
 msgid "%s: rename: %s: %s\n"
@@ -2395,10 +2349,9 @@ msgstr "%s: reanomena %s: %s\n"
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s: s'han especificat massa grups (màx de %d).\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Out of memory. Cannot update %s.\n"
+#, c-format
 msgid "%s: Out of memory. Cannot find group '%s'.\n"
-msgstr "%s: s'ha exhaurit la memòria. No es pot actualitzar %s.\n"
+msgstr "%s: s'ha exhaurit la memòria. No es pot trobar el grup «%s».\n"
 
 #, c-format
 msgid ""
@@ -2414,11 +2367,8 @@ msgstr ""
 "\n"
 "Opcions:\n"
 
-#, fuzzy
-#| msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgid "      --badname                 do not check for bad names\n"
-msgstr ""
-"  -s, --shadow                  edita la base de dades «shadow» o «gshadow»\n"
+msgstr "      --badname                 do not check for bad names\n"
 
 msgid ""
 "  -b, --base-dir BASE_DIR       base directory for the home directory of "
@@ -2431,6 +2381,8 @@ msgstr ""
 msgid ""
 "      --btrfs-subvolume-home    use BTRFS subvolume for home directory\n"
 msgstr ""
+"      --btrfs-subvolume-home    utilitza el subvolum BTRFS per al directori "
+"inicial\n"
 
 msgid "  -c, --comment COMMENT         GECOS field of the new account\n"
 msgstr "  -c, --comment COMMENT         camp GECOS del nou compte\n"
@@ -2457,6 +2409,8 @@ msgid ""
 "  -F, --add-subids-for-system   add entries to sub[ud]id even when adding a "
 "system user\n"
 msgstr ""
+"  -F, --add-subids-for-system   afegeix entrades al sub[ud]id fins i tot "
+"quan s'afegeix un usuari del sistema\n"
 
 msgid ""
 "  -g, --gid GROUP               name or ID of the primary group of the new\n"
@@ -2531,16 +2485,12 @@ msgstr ""
 "  -Z, --selinux-user SEUSER     utilitzar un «SEUSER» específic per a "
 "l'assignació d'usuaris «SELinux»\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux "
-#| "user mapping\n"
 msgid ""
 "      --selinux-range SERANGE   use a specific MLS range for the SELinux "
 "user mapping\n"
 msgstr ""
-"  -Z, --selinux-user SEUSER     utilitzar un «SEUSER» específic per a "
-"l'assignació d'usuaris «SELinux»\n"
+"      --selinux-range SERANGE   utilitza un rang MLS específic per al mapeig "
+"d'usuari de SELinux\n"
 
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
@@ -2570,26 +2520,21 @@ msgstr "%s: el camp «%s» no és vàlid\n"
 msgid "%s: invalid shell '%s'\n"
 msgstr "%s: l'intèrpret «%s» no és vàlid\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Warning: %s is not executable\n"
+#, c-format
 msgid "%s: Warning: missing or non-executable shell '%s'\n"
-msgstr "%s: Advertència: %s no és executable\n"
+msgstr "%s: avís: falta l'intèrpret d'ordres «%s» o no es pot executar\n"
 
-#, fuzzy, c-format
-#| msgid "%s: cannot rewrite password file\n"
+#, c-format
 msgid "%s: -Z cannot be used with --prefix\n"
-msgstr "%s: no es pot reescriure el fitxer de contrasenyes\n"
+msgstr "%s: -Z no es pot utilitzar amb --prefix\n"
 
 #, c-format
 msgid "%s: -Z requires SELinux enabled kernel\n"
-msgstr "%s: -Z requereix nucli «SELinux» habilitat\n"
+msgstr "%s: -Z requereix nucli SELinux habilitat\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+#, c-format
 msgid "%s: failed to open the faillog file for UID %lu: %s\n"
-msgstr ""
-"%s: ha fallat el restabliment de l'entrada del registre d'errors de UID %lu: "
-"%s\n"
+msgstr "%s: no s'ha pogut obrir el fitxer faillog per l'UID %lu: %s\n"
 
 #, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
@@ -2597,92 +2542,76 @@ msgstr ""
 "%s: ha fallat el restabliment de l'entrada del registre d'errors de UID %lu: "
 "%s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+#, c-format
 msgid "%s: failed to close the faillog file for UID %lu: %s\n"
-msgstr ""
-"%s: ha fallat el restabliment de l'entrada del registre d'errors de UID %lu: "
-"%s\n"
+msgstr "%s: no s'ha pogut tancar el fitxer faillog per l'UID %lu: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+#, c-format
 msgid "%s: failed to open the lastlog file for UID %lu: %s\n"
-msgstr "%s: ha fallat el restabliment del darrer registre de UID %lu: %s\n"
+msgstr "%s: no s'ha pogut obrir el fitxer lastlog per a l'UID %lu: %s\n"
 
 #, c-format
 msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
 msgstr "%s: ha fallat el restabliment del darrer registre de UID %lu: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+#, c-format
 msgid "%s: failed to close the lastlog file for UID %lu: %s\n"
-msgstr "%s: ha fallat el restabliment del darrer registre de UID %lu: %s\n"
+msgstr "%s: no s'ha pogut tancar el fitxer lastlog per a l'UID %lu: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+#, c-format
 msgid "%s: failed to reset the tallylog entry of user \"%s\"\n"
-msgstr ""
-"%s: ha fallat el restabliment de l'entrada del registre d'errors de UID %lu: "
-"%s\n"
+msgstr "%s: no s'ha pogut restablir l'entrada a tallylog de l'usuari «%s»\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: failed to prepare the new %s entry\n"
-msgstr "%s: ha fallat la preparació de la nova entrada %s: «%s»\n"
+msgstr "%s: no s'ha pogut preparar la nova entrada %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: error updating files\n"
+#, c-format
 msgid "%s: error while duplicating string %s\n"
-msgstr "%s: s'ha produït un error en actualitzar el fitxer\n"
+msgstr "%s: s'ha produït un error al duplicar la cadena %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
+#, c-format
 msgid "%s: cannot set SELinux context for home directory %s\n"
-msgstr "%s: no es pot crear el directori %s\n"
+msgstr "%s: no es pot establir el context SELinux al directori d'usuari %s\n"
 
 #, c-format
 msgid "%s: error while duplicating string in BTRFS check %s\n"
 msgstr ""
+"%s: s'ha produït un error en duplicar la cadena a la comprovació BTRFS %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: %s home directory (%s) not found\n"
+#, c-format
 msgid "%s: home directory \"%s\" must be mounted on BTRFS\n"
-msgstr "%s: no s'ha trobat el directori personal (%s) de %s \n"
+msgstr "%s: el directori home «%s» ha d'estar muntat a BTRFS\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to allocate memory: %s\n"
+#, c-format
 msgid "%s: failed to create BTRFS subvolume: %s\n"
-msgstr "%s: no es pot assignar memòria: %s\n"
+msgstr "%s: no s'ha pogut crear el subvolum BTRFS: %s\n"
 
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s: no es pot crear el directori %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
+#, c-format
 msgid "%s: warning: chown on `%s' failed: %m\n"
-msgstr ""
-"%s: línia %d: no s'ha pogut canviar el propietari (ordre «chown»)  %s: %s\n"
+msgstr "%s: avís: ha fallat chown a «%s»: %m\n"
 
-#, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
+#, c-format
 msgid "%s: warning: chmod on `%s' failed: %m\n"
-msgstr ""
-"%s: línia %d: no s'ha pogut canviar el propietari (ordre «chown»)  %s: %s\n"
+msgstr "%s: avís: ha fallat chmod a «%s»: %m\n"
 
-#, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
+#, c-format
 msgid "%s: warning: chown on '%s' failed: %m\n"
-msgstr ""
-"%s: línia %d: no s'ha pogut canviar el propietari (ordre «chown»)  %s: %s\n"
+msgstr "%s: avís: ha fallat chown a «%s»: %m\n"
 
 #, c-format
 msgid "%s: cannot reset SELinux file creation context\n"
 msgstr ""
+"%s: no s'ha pogut reinicialitzar el context de creació de fitxers SELinux\n"
 
-#, fuzzy, c-format
-#| msgid "Cannot create SELinux login mapping for %s\n"
+#, c-format
 msgid "%s: cannot set SELinux context for mailbox file %s\n"
-msgstr "No es pot generar el mapatge d'inici de sessió SELinux per a %s\n"
+msgstr ""
+"%s: no s'ha pogut establir el context SELinux per al fitxer de bústia %s\n"
 
 msgid "Creating mailbox file"
 msgstr "S'està creant la bústia de correu"
@@ -2690,30 +2619,28 @@ msgstr "S'està creant la bústia de correu"
 msgid ""
 "Group 'mail' not found. Creating the user mailbox file with 0600 mode.\n"
 msgstr ""
-"No s'ha trobat el grup «mail». S'està creant la bústia de correu de "
-"l'usuariamb mode 0600.\n"
+"No s'ha trobat el grup «mail». S'està creant la bústia de correu de l'usuari "
+"amb mode 0600.\n"
 
 msgid "Setting mailbox file permissions"
 msgstr "S'estan establint els permisos de la bústia de correu"
 
-#, fuzzy
-#| msgid "Creating mailbox file"
 msgid "Synchronize mailbox file"
-msgstr "S'està creant la bústia de correu"
+msgstr "Sincronitza la bústia de correu"
 
-#, fuzzy
-#| msgid "Creating mailbox file"
 msgid "Closing mailbox file"
-msgstr "S'està creant la bústia de correu"
+msgstr "S'està tancant la bústia de correu"
 
 #, c-format
 msgid "%s warning: %s's uid %d is greater than SYS_UID_MAX %d\n"
-msgstr ""
+msgstr "Avís %s: l'uid de %s, %d, és més gran que el SYS_UID_MAX %d\n"
 
 #, c-format
 msgid ""
 "%s warning: %s's uid %d outside of the UID_MIN %d and UID_MAX %d range.\n"
 msgstr ""
+"Avís %s: l'uid de %s, %d, està fora de l'interval entre UID_MIN %d i UID_MAX "
+"%d.\n"
 
 #, c-format
 msgid "%s: user '%s' already exists\n"
@@ -2742,42 +2669,39 @@ msgstr "%s: no es pot generar el directori «tcb» per a %s\n"
 msgid "%s: can't create group\n"
 msgstr "%s: no es pot generar el grup\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't create subordinate user IDs\n"
-msgstr "%s: no es pot generar l'usuari\n"
+msgstr "%s: no es poden crear identificadors d'usuari subordinat\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't create subordinate group IDs\n"
-msgstr "%s: no es pot generar el grup\n"
+msgstr "%s: no es poden crear identificadors de grup subordinat\n"
 
 #, c-format
 msgid "%s: warning: the user name %s to %s SELinux user mapping failed.\n"
 msgstr ""
 "%s: avís: falla el nom d'usuari %s a %s a l'assignació d'usuaris «SELinux».\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "%s: warning: the home directory already exists.\n"
-#| "Not copying any file from skel directory into it.\n"
+#, c-format
 msgid ""
 "%s: warning: the home directory %s already exists.\n"
 "%s: Not copying any file from skel directory into it.\n"
 msgstr ""
-"%s: avís: el directori personal ja existeix.\n"
-"No s'hi copiarà cap fitxer del directori skel.\n"
+"%s: avís: el directori d'inici %s ja existeix.\n"
+"%s: no s'hi copiarà cap fitxer del directori skel\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -f, --force                   force removal of files,\n"
-#| "                                even if not owned by user\n"
 msgid ""
 "  -f, --force                   force some actions that would fail "
 "otherwise\n"
 "                                e.g. removal of user still logged in\n"
 "                                or files, even if not owned by the user\n"
 msgstr ""
-"  -f, --force                   força l'eliminació de fitxers, encara que\n"
-"                                no siguin propietat de l'usuari\n"
+"  -f, --force                   força algunes accions que altrament "
+"fallarien\n"
+"                                p.ex. eliminació d'un usuari que està encara "
+"loguejat\n"
+"                                o de fitxers, fins i tot si no son propietat "
+"de l'usuari\n"
 
 msgid "  -r, --remove                  remove home directory and mail spool\n"
 msgstr ""
@@ -2808,9 +2732,9 @@ msgstr ""
 "%s: no es pot eliminar el grup %s, que és el grup primari per un altre "
 "usuari.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: cannot remove entry %lu from %s\n"
-msgstr "%s: no es pot eliminar l'entrada «%s» de %s\n"
+msgstr "%s: no es pot eliminar l'entrada %lu de %s\n"
 
 #, c-format
 msgid "%s: %s mail spool (%s) not found\n"
@@ -2851,10 +2775,9 @@ msgstr ""
 "%s: no s'elimina el directori %s (eliminaria el directori personal de "
 "l'usuari %s)\n"
 
-#, fuzzy, c-format
-#| msgid "%s: error removing directory %s\n"
+#, c-format
 msgid "%s: error removing subvolume %s\n"
-msgstr "%s: s'ha produït un error en eliminar el directori %s\n"
+msgstr "%s: s'ha produït un error en eliminar el subvolum %s\n"
 
 #, c-format
 msgid "%s: error removing directory %s\n"
@@ -2928,22 +2851,16 @@ msgstr ""
 "  -p, --password CONTRASENYA    usa contrasenya xifrada per a la nova\n"
 "                                contrasenya\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --append                  append the user to the supplemental "
-#| "GROUPS\n"
-#| "                                mentioned by the -G option without "
-#| "removing\n"
-#| "                                the user from other groups\n"
 msgid ""
 "  -r, --remove                  remove the user from only the supplemental "
 "GROUPS\n"
 "                                mentioned by the -G option without removing\n"
 "                                the user from other groups\n"
 msgstr ""
-"  -a, --append                  afegeix l'usuari als GRUPS addicionals\n"
-"                                llistats amb la opció -G sense eliminar-los\n"
-"                                d'altres grups\n"
+"  -r, --remove                  elimina l'usuari de només els grups "
+"suplementaris GROUPS\n"
+"                                mencionats per l'opció -G sense eliminar\n"
+"                                l'usuari d'altres grups\n"
 
 msgid "  -u, --uid UID                 new UID for the user account\n"
 msgstr "  -u, --uid UID                 nou UID per al compte d'usuari\n"
@@ -2952,16 +2869,16 @@ msgid "  -U, --unlock                  unlock the user account\n"
 msgstr "  -U, --unlock                  desbloca el compte d'usuari\n"
 
 msgid "  -v, --add-subuids FIRST-LAST  add range of subordinate uids\n"
-msgstr ""
+msgstr "  -v, --add-subuids FIRST-LAST  afegeix un rang d'uids subordinats\n"
 
 msgid "  -V, --del-subuids FIRST-LAST  remove range of subordinate uids\n"
-msgstr ""
+msgstr "  -V, --del-subuids FIRST-LAST  esborra un rang d'uids subordinats\n"
 
 msgid "  -w, --add-subgids FIRST-LAST  add range of subordinate gids\n"
-msgstr ""
+msgstr "  -w, --add-subgids FIRST-LAST  afegeix un rang de gids subordinats\n"
 
 msgid "  -W, --del-subgids FIRST-LAST  remove range of subordinate gids\n"
-msgstr ""
+msgstr "  -W, --del-subgids FIRST-LAST  esborra un rang de gids subordinats\n"
 
 msgid ""
 "  -Z, --selinux-user SEUSER     new SELinux user mapping for the user "
@@ -2970,14 +2887,10 @@ msgstr ""
 "  -Z, --selinux-user SEUSER     nova assignació SELinux per al compte "
 "d'usuari\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -Z, --selinux-user SEUSER     new SELinux user mapping for the user "
-#| "account\n"
 msgid ""
 "      --selinux-range SERANGE   new SELinux MLS range for the user account\n"
 msgstr ""
-"  -Z, --selinux-user SEUSER     nova assignació SELinux per al compte "
+"      --selinux-range SERANGE   nou rang de SELinux MLS per la compta "
 "d'usuari\n"
 
 #, c-format
@@ -2987,7 +2900,7 @@ msgid ""
 msgstr ""
 "%s: el desbloqueig de la contrasenya de l'usuari deixarà el compte sense "
 "contrasenya.\n"
-"Ha d'establir una contrasenya amb «usermod-p» per desbloquejar la "
+"Heu d'establir una contrasenya amb «usermod-p» per desbloquejar la "
 "contrasenya de l'usuari.\n"
 
 #, c-format
@@ -2996,15 +2909,15 @@ msgstr "%s: l'usuari «%s» ja existeix a %s\n"
 
 #, c-format
 msgid "%s: homedir must be an absolute path\n"
-msgstr ""
+msgstr "%s: el directori d'inici ha de ser un camí absolut\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid subordinate uid range '%s'\n"
-msgstr "%s: la data «%s» no és vàlida\n"
+msgstr "%s: el rang d'UID subordinat «%s» no és vàlid\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid subordinate gid range '%s'\n"
-msgstr "%s: la data «%s» no és vàlida\n"
+msgstr "%s: el rang de GID subordinat «%s» no és vàlid\n"
 
 #, c-format
 msgid "%s: no options\n"
@@ -3012,7 +2925,7 @@ msgstr "%s: sense opcions\n"
 
 #, c-format
 msgid "%s: %s and %s are mutually exclusive flags\n"
-msgstr ""
+msgstr "%s: %s and %s son flags que s'exclouen mútuament\n"
 
 #, c-format
 msgid "%s: the -L, -p, and -U flags are exclusive\n"
@@ -3026,9 +2939,9 @@ msgstr "%s: les contrasenyes ombra són obligatòries per a «-e» i «-f»\n"
 msgid "%s: UID '%lu' already exists\n"
 msgstr "%s: UID '%lu' ja existeix\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s does not exist, you cannot use the flags %s or %s\n"
-msgstr "%s: %s no està autoritzat per canviar la contrasenya de %s\n"
+msgstr "%s: %s no existeix, no es poden utilitzar els flags %s o %s\n"
 
 #, c-format
 msgid "%s: directory %s exists\n"
@@ -3049,6 +2962,7 @@ msgstr "%s: No s'ha pogut canviar la propietat del directori d'inici"
 #, c-format
 msgid "%s: error: cannot move subvolume from %s to %s - different device\n"
 msgstr ""
+"%s: error: no es pot moure el subvolum de %s a %s - dispositiu diferent\n"
 
 #, c-format
 msgid "%s: warning: failed to completely remove old home directory %s"
@@ -3059,16 +2973,13 @@ msgstr ""
 msgid "%s: cannot rename directory %s to %s\n"
 msgstr "%s: no es pot reanomenar el directori %s a %s\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "%s: The previous home directory (%s) was not a directory. It is not "
-#| "removed and no home directories are created.\n"
+#, c-format
 msgid ""
 "%s: The previous home directory (%s) does not exist or is inaccessible. Move "
 "cannot be completed.\n"
 msgstr ""
-"%s: El directori arrel d'usuari anterior (%s) no és un directori. No s'ha "
-"eliminat i no s'han generat els directoris arrels d'usuaris.\n"
+"%s: el directori home anterior (%s) no existeix o és inaccessible. No s'ha "
+"pogut completar el move.\n"
 
 #, c-format
 msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
@@ -3076,12 +2987,11 @@ msgstr ""
 "%s: ha fallat la còpia de l'entrada del darrer registre de l'usuari %lu al "
 "usuari  %lu: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+#, c-format
 msgid "%s: failed to copy the lastlog entry of user %ju to user %ju: %s\n"
 msgstr ""
-"%s: ha fallat la còpia de l'entrada del darrer registre de l'usuari %lu al "
-"usuari  %lu: %s\n"
+"%s: no s'ha pogut copiar l'entrada de lastlog de l'usuari %ju a l'usuari "
+"%ju: %s\n"
 
 #, c-format
 msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
@@ -3089,12 +2999,11 @@ msgstr ""
 "%s: ha fallat la còpia de l'entrada del registre d'errors del usuari %lu al "
 "usuari  %lu: %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+#, c-format
 msgid "%s: failed to copy the faillog entry of user %ju to user %ju: %s\n"
 msgstr ""
-"%s: ha fallat la còpia de l'entrada del registre d'errors del usuari %lu al "
-"usuari  %lu: %s\n"
+"%s: ha fallat la còpia de l'entrada de lastlog de l'usuari %ju a l'usuari "
+"%ju: %s\n"
 
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
@@ -3107,20 +3016,24 @@ msgid "failed to rename mailbox"
 msgstr "no s'ha pogut reanomenar la bústia de correu"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
-msgstr "%s: ha fallat la preparació de la nova entrada %s: «%s»\n"
+#| msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
+msgstr "%s: failed to remove uid range %lu-%lu from '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
-msgstr "%s: ha fallat la preparació de la nova entrada %s: «%s»\n"
+#| msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
+msgstr "%s: no s'ha pogut afegir el rang d'uids %lu-%lu a «%s»\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
-msgstr "%s: ha fallat la preparació de la nova entrada %s: «%s»\n"
+#| msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
+msgstr "%s: no s'ha pogut treure el rang d'uids %lu-%lu de «%s»\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
-msgstr "%s: ha fallat la preparació de la nova entrada %s: «%s»\n"
+#| msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
+msgstr "%s: no s'ha pogut afegir el rang de gids %lu-%lu a «%s»\n"
 
 #, c-format
 msgid ""
@@ -3177,31 +3090,29 @@ msgstr "No s'ha pogut blocar el fitxer"
 msgid "Couldn't make backup"
 msgstr "No s'ha pogut fer una còpia de seguretat"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s: %s\n"
-msgstr "%s: PAM: %s\n"
+msgstr "%s: %s: %s\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s: %s returned with status %d\n"
-msgstr "%s: «nscd» ha sortit amb l'estat %d"
+msgstr "%s: %s ha retornat amb estat %d\n"
 
 #, c-format
 msgid "%s: %s killed by signal %d\n"
-msgstr ""
+msgstr "%s: %s ha estat matat pel senyal %d\n"
 
 msgid "failed to open scratch file"
 msgstr "no s'ha pogut obrir el fitxer de treball («scratch file»)"
 
 msgid "failed to unlink scratch file"
-msgstr "no s'ha pogut desvincular el fitxer de treball "
+msgstr "no s'ha pogut desvincular el fitxer de treball"
 
 msgid "failed to stat edited file"
 msgstr "no s'ha pogut comptabilitzar el fitxer editat"
 
-#, fuzzy
-#| msgid "%s: can't open file\n"
 msgid "asprintf(3) failed"
-msgstr "%s: no es pot obrir el fitxer\n"
+msgstr "ha fallat asprintf(3)"
 
 msgid "failed to create backup file"
 msgstr "no es pot generar el fitxer de còpia de seguretat"
@@ -3214,6 +3125,24 @@ msgstr "%s: no es pot restaurar %s: %s (els seus canvis estan a %s)\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s: no es pot trobar el directori «tcb» per %s\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: enllaç simbòlic sospitosament llarg:  %s\n"
+
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: usuari %s desconegut\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Forma d'ús: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " grups="
+
+#, c-format
+#~ msgid "       %s [-p] -r host\n"
+#~ msgstr "       %s [-p] -r ordinador\n"
+
 #~ msgid "Environment overflow\n"
 #~ msgstr "Desbordament d'entorn\n"
 
@@ -3237,10 +3166,6 @@ msgstr "%s: no es pot trobar el directori «tcb» per %s\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: el grup %s no és un grup NIS\n"
 
-#, c-format
-#~ msgid "       %s [-p] -r host\n"
-#~ msgstr "       %s [-p] -r ordinador\n"
-
 #, c-format
 #~ msgid "%s: cannot create new defaults file\n"
 #~ msgstr "%s: no es pot crear un fitxer nou de preferències predeterminades\n"
@@ -3262,7 +3187,6 @@ msgstr "%s: no es pot trobar el directori «tcb» per %s\n"
 #~ "baix"
 
 #, fuzzy, c-format
-#~| msgid "%s: failed to find tcb directory for %s\n"
 #~ msgid "%s: Could not open proc directory for target %u\n"
 #~ msgstr "%s: no es pot trobar el directori «tcb» per %s\n"
 
@@ -3276,10 +3200,6 @@ msgstr "%s: no es pot trobar el directori «tcb» per %s\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Última accés: %.19s a %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: el nom d'usuari «%s» no és vàlid\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: la informació de caducitat de la contrasenya ha canviat.\n"
@@ -3624,16 +3544,6 @@ msgstr "%s: no es pot trobar el directori «tcb» per %s\n"
 #~ msgid "%s: no flags given\n"
 #~ msgstr "%s: no s'han especificat assenyaladors\n"
 
-#~| msgid ""
-#~| "Usage: vipw [options]\n"
-#~| "\n"
-#~| "Options:\n"
-#~| "  -g, --group                   edit group database\n"
-#~| "  -h, --help                    display this help message and exit\n"
-#~| "  -p, --passwd                  edit passwd database\n"
-#~| "  -q, --quiet                   quiet mode\n"
-#~| "  -s, --shadow                  edit shadow or gshadow database\n"
-#~| "\n"
 #~ msgid ""
 #~ "Usage: vipw [options]\n"
 #~ "\n"
@@ -3657,7 +3567,6 @@ msgstr "%s: no es pot trobar el directori «tcb» per %s\n"
 #~ "gshadow\n"
 #~ "\n"
 
-#~| msgid "Usage: %s [input]\n"
 #~ msgid ""
 #~ "Usage: useradd [options] LOGIN\n"
 #~ "\n"
@@ -3670,25 +3579,6 @@ msgstr "%s: no es pot trobar el directori «tcb» per %s\n"
 #~ msgid "%s: can't chown %s\n"
 #~ msgstr "%s: no es pot fer canviar el propietari a %s\n"
 
-#~| msgid ""
-#~| "Usage: faillog [options]\n"
-#~| "\n"
-#~| "Options:\n"
-#~| "  -a, --all                     display faillog records for all users\n"
-#~| "  -h, --help                    display this help message and exit\n"
-#~| "  -l, --lock-time SEC           after failed login lock accout to SEC "
-#~| "seconds\n"
-#~| "  -m, --maximum MAX             set maximum failed login counters to "
-#~| "MAX\n"
-#~| "  -r, --reset                   reset the counters of login failures\n"
-#~| "  -t, --time DAYS               display faillog records more recent than "
-#~| "DAYS\n"
-#~| "  -u, --user LOGIN              display faillog record or maintains "
-#~| "failure\n"
-#~| "                                counters and limits (if used with -r, -m "
-#~| "or -l\n"
-#~| "                                options) only for user with LOGIN\n"
-#~| "\n"
 #~ msgid ""
 #~ "Usage: faillog [options]\n"
 #~ "\n"
diff --git a/po/cs.gmo b/po/cs.gmo
index 350362cb..38f389fa 100644
Binary files a/po/cs.gmo and b/po/cs.gmo differ
diff --git a/po/cs.po b/po/cs.po
index c1ee4655..8cd9e573 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.2\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2014-08-24 15:07+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -531,10 +531,6 @@ msgstr "%s: %s není ani adresář, ani symbolický odkaz.\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: Nelze číst symbolický odkaz %s: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: Podezřele dlouhý symbolický odkaz: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: Nelze vytvořit adresář %s: %s\n"
@@ -876,6 +872,11 @@ msgstr "%s: „%s“ obsahuje jiné znaky než ASCII\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: „%s“ obsahuje nepovolené znaky\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: „%s“ není platným jménem skupiny\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: uživatel „%s“ neexistuje\n"
@@ -1392,10 +1393,6 @@ msgstr "  -p, --password HESLO          změní heslo na (šifrované) HESLO\n"
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: neplatné jméno skupiny „%s“\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: neznámý uživatel %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1505,12 +1502,6 @@ msgstr "%s: žádné změny nebyly provedeny\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: nelze smazat %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Použití: id [-a]\n"
-
-msgid " groups="
-msgstr " skupiny="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1744,6 +1735,11 @@ msgstr "Neplatné heslo.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: chyba rozdvojení: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: „%s“ není platným jménem skupiny\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: GID „%lu“ neexistuje\n"
@@ -1792,6 +1788,10 @@ msgstr "%s: chybné uživatelské ID „%s“\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: chybné uživatelské jméno „%s“\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: chybné uživatelské jméno „%s“\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2056,6 +2056,11 @@ msgstr "duplikovaná položka v souboru s hesly"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: chybné uživatelské jméno „%s“\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: chybné uživatelské jméno „%s“\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "chybné uživatelské ID „%lu“\n"
@@ -2284,14 +2289,15 @@ msgstr "Vstupuji do režimu údržby systému"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: %s byl vytvořen, ale nemůže být odstraněn\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: nastavení %s v %s bude ignorováno\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s: nastavení %s v %s bude ignorováno\n"
 
@@ -3010,22 +3016,24 @@ msgstr "chyba při změně vlastníka poštovní schránky"
 msgid "failed to rename mailbox"
 msgstr "chyba při přejmenovávání poštovní schránky"
 
-#, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: odebrání rozsahu uid %lu-%lu z „%s“ selhalo\n"
 
 #, fuzzy, c-format
 #| msgid "%s: failed to add uid range %lu-%lu from '%s'\n"
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: přidání rozsahu uid %lu-%lu z „%s“ selhalo\n"
 
-#, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: odebrání rozsahu gid %lu-%lu z „%s“ selhalo\n"
 
 #, fuzzy, c-format
 #| msgid "%s: failed to add gid range %lu-%lu from '%s'\n"
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: přidání rozsahu gid %lu-%lu z „%s“ selhalo\n"
 
 #, c-format
@@ -3119,6 +3127,10 @@ msgstr "%s: nepodařilo se nalézt tcb adresář uživatele %s\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "Přetečení prostředí\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: Podezřele dlouhý symbolický odkaz: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: uživatele „%s“ nelze na NIS klientu změnit.\n"
@@ -3139,6 +3151,16 @@ msgstr "%s: nepodařilo se nalézt tcb adresář uživatele %s\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: skupina %s je NIS skupinou\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: neznámý uživatel %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Použití: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " skupiny="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "         %s [-p] -r počítač\n"
@@ -3179,10 +3201,6 @@ msgstr "%s: nepodařilo se nalézt tcb adresář uživatele %s\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Poslední přihlášení: %.19s na %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: chybné uživatelské jméno „%s“\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: informace o vypršení platnosti hesla byly změněny.\n"
diff --git a/po/da.gmo b/po/da.gmo
index 7b9a7cac..e11480bf 100644
Binary files a/po/da.gmo and b/po/da.gmo differ
diff --git a/po/da.po b/po/da.po
index 9e0f6bcb..856e2873 100644
--- a/po/da.po
+++ b/po/da.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2012-01-26 23:57+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -548,10 +548,6 @@ msgstr "%s: %s er hverken en mappe eller en symbolsk henvisning.\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: Kan ikke omdøbe symbolsk henvisning %s: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: Mistænkelig lang symbolsk henvisning: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: Kan ikke oprette mappen %s: %s\n"
@@ -894,6 +890,11 @@ msgstr "%s: »%s« indeholder ikke-ASCII-tegn\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: »%s« indeholder ugyldige tegn\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: »%s« er ikke et gyldigt gruppenavn\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: Brugeren »%s« findes ikke\n"
@@ -1422,10 +1423,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: Ugyldigt gruppenavn »%s«\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: Ukendt bruger %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1535,12 +1532,6 @@ msgstr "%s: Ingen ændringer\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: Kan ikke slette %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Brug: id [-a]\n"
-
-msgid " groups="
-msgstr " grupper="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1767,6 +1758,11 @@ msgstr "Ugyldig adgangskode.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: fejl under forgrening: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: »%s« er ikke et gyldigt gruppenavn\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: GID »%lu« findes ikke\n"
@@ -1810,6 +1806,10 @@ msgstr "%s: Ugyldigt bruger-id »%s«\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: Ugyldigt brugernavn »%s«\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: Ugyldigt brugernavn »%s«\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2077,6 +2077,11 @@ msgstr "adgangskodepunkt er en dublet"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: Ugyldigt brugernavn »%s«\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: Ugyldigt brugernavn »%s«\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "ugyldigt bruger-id »%lu«\n"
@@ -2305,14 +2310,15 @@ msgstr "Går i systemvedligeholdelsestilstand"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: %s blev oprettet, men kunne ikke fjernes\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: Konfigurationen %s i %s vil blive ignoreret\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s: Konfigurationen %s i %s vil blive ignoreret\n"
 
@@ -3040,19 +3046,19 @@ msgid "failed to rename mailbox"
 msgstr "kunne ikke omdøbe postkasse"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: Kunne ikke forberede det nye %s-punkt »%s«\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: Kunne ikke forberede det nye %s-punkt »%s«\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: Kunne ikke forberede det nye %s-punkt »%s«\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: Kunne ikke forberede det nye %s-punkt »%s«\n"
 
 #, c-format
@@ -3146,6 +3152,10 @@ msgstr "%s: Kunne ikke finde tcb-mappe for %s\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "Miljøoverløb\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: Mistænkelig lang symbolsk henvisning: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: Kan ikke ændre brugeren »%s« på NIS-klienten.\n"
@@ -3166,6 +3176,16 @@ msgstr "%s: Kunne ikke finde tcb-mappe for %s\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: Gruppen %s er en NIS-gruppe\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: Ukendt bruger %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Brug: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " grupper="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r vært\n"
@@ -3203,10 +3223,6 @@ msgstr "%s: Kunne ikke finde tcb-mappe for %s\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Sidst logget på: %.19s på %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: Ugyldigt brugernavn »%s«\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: Information om udløb af adgangskode blev ændret.\n"
diff --git a/po/de.gmo b/po/de.gmo
index 5654589e..742ee3c1 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 7b3103da..d65431c4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.2-2\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2020-09-22 15:10+0200\n"
 "Last-Translator: Björn Esser <besser82@fedoraproject.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -547,10 +547,6 @@ msgstr "%s: %s ist weder ein Verzeichnis noch eine symbolische Verknüpfung.\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: Symbolische Verknüpfung %s kann nicht gelesen werden: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: Verdächtig lange symbolische Verknüpfung: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: Verzeichnis %s kann nicht erstellt werden: %s\n"
@@ -903,6 +899,11 @@ msgstr "%s: »%s« enthält Zeichen, die nicht zum ASCII-Zeichensatz gehören.\n
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: »%s« enthält ungültige Zeichen.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: »%s« ist kein gültiger Gruppenname.\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: Benutzer »%s« ist nicht vorhanden.\n"
@@ -1449,10 +1450,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: Ungültiger Gruppenname »%s«\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: Unbekannter Benutzer %s\n"
-
 # NOTE: group is a file (/etc/group)
 #, c-format
 msgid ""
@@ -1564,12 +1561,6 @@ msgstr "%s: Keine Änderungen\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: %s kann nicht gelöscht werden.\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Aufruf: id [-a]\n"
-
-msgid " groups="
-msgstr " Gruppen="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1802,6 +1793,11 @@ msgstr "Ungültiges Passwort.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: Fehler bei Prozessaufspaltung (fork): %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: »%s« ist kein gültiger Gruppenname.\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: GID »%lu« existiert nicht.\n"
@@ -1846,6 +1842,10 @@ msgstr "%s: Ungültige Benutzer-ID »%s«\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: Ungültiger Benutzername »%s«\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: Ungültiger Benutzername »%s«\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2121,6 +2121,11 @@ msgstr "Doppelter Passworteintrag"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: Ungültiger Benutzername »%s«\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: Ungültiger Benutzername »%s«\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "Ungültige Benutzer-ID »%lu«\n"
@@ -2349,14 +2354,15 @@ msgstr "Wechsel in den Systemwartungsmodus"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: %s wurde erstellt, konnte aber nicht entfernt werden\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: die %s-Konfiguration in %s wird ignoriert.\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s: die %s-Konfiguration in %s wird ignoriert.\n"
 
@@ -3111,19 +3117,19 @@ msgid "failed to rename mailbox"
 msgstr "Fehler beim Umbenennen von mailbox"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: Vorbereiten des neuen %s-Eintrags »%s« fehlgeschlagen.\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: Vorbereiten des neuen %s-Eintrags »%s« fehlgeschlagen.\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: Vorbereiten des neuen %s-Eintrags »%s« fehlgeschlagen.\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: Vorbereiten des neuen %s-Eintrags »%s« fehlgeschlagen.\n"
 
 #, c-format
@@ -3220,6 +3226,10 @@ msgstr "%s: tcb-Verzeichnis für %s konnte nicht gefunden werden\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "Umgebungsüberlauf\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: Verdächtig lange symbolische Verknüpfung: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr ""
@@ -3241,6 +3251,16 @@ msgstr "%s: tcb-Verzeichnis für %s konnte nicht gefunden werden\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: Gruppe %s ist eine NIS-Gruppe.\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: Unbekannter Benutzer %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Aufruf: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " Gruppen="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r Rechner\n"
@@ -3284,10 +3304,6 @@ msgstr "%s: tcb-Verzeichnis für %s konnte nicht gefunden werden\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Letztes Login: %.19s auf %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: Ungültiger Benutzername »%s«\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: Passwortablauf-Informationen geändert.\n"
diff --git a/po/dz.gmo b/po/dz.gmo
index 91afd64f..1921466b 100644
Binary files a/po/dz.gmo and b/po/dz.gmo differ
diff --git a/po/dz.po b/po/dz.po
index 6651f39b..c4a45aa7 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2006-06-01 15:28+0530\n"
 "Last-Translator: Jurmey Rabgay <jur_gay@yahoo.com>\n"
 "Language-Team: dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -511,10 +511,6 @@ msgstr "%s: ནུས་མེད་ཁྱིམ་གྱི་སྣོད་
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: སྣོད་ཐོ་ %s འདི་ %s ལུ་ བསྐྱར་མིང་བཏགས་མི་ཚུགས།\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: སྣོད་ཐོ་ %s གསར་བསྐྲུན་འབད་མི་ཚུགས།\n"
@@ -832,6 +828,10 @@ msgstr "%s:  '%s' ནང་ལུ་ ཁྲིམས་འགལ་ཡིག་
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s:  '%s' ནང་ལུ་ ཁྲིམས་འགལ་ཡིག་ཆ་ཚུ་ཡོད།\n"
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: %s འདི་ ནུས་ཅན་གྱི་སྡེ་ཚན་མིང་མེན་པས།\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
@@ -1286,10 +1286,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "ནུས་མེད་སྡེཚན་གྱི་མིང་ '%s'\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: མ་ཤེས་པའི་ལག་ལེན་པ་%s\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1389,12 +1385,6 @@ msgstr "%s: སོར་ནི་མེད།\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: ཡིག་སྣོད་ %sའདི་ དུས་མཐུན་བཟོ་མི་ཚུགས།\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "ལག་ལེནཔ་:id [-a]\n"
-
-msgid " groups="
-msgstr "སྡེ་ཚན་="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1612,6 +1602,10 @@ msgstr "ཆོག་ཡིག་རྙིངམ་:"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: ཁ་སྤེལ་བ་འཐུས་ཤོར་:%s"
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: %s འདི་ ནུས་ཅན་གྱི་སྡེ་ཚན་མིང་མེན་པས།\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: ལག་ལེན་པ་  %sའདི་ མེད།\n"
@@ -1652,6 +1646,10 @@ msgstr "%s: ནུས་མེད་ལག་ལེན་པའི་མིང
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'།\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'།\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1886,6 +1884,11 @@ msgstr "ཆོག་ཡིག་ཐོ་བཀོད་རྫུན་མ།"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'།\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'།\n"
+
 #, fuzzy, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'\n"
@@ -2099,12 +2102,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2716,19 +2719,19 @@ msgid "failed to rename mailbox"
 msgstr "ཡིག་སྒྲོམ་གྱི་བསྐྱར་མིང་བཏགས་ནི་ལུ་ འཛོལ་བ།"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: ཁེ་དབང་(%s)ཚུ་བཀོག་ནིའི་འཐུས་ཤོར་བྱུང་ཡོདཔ།\n"
 
 #, c-format
@@ -2849,6 +2852,16 @@ msgstr "%s: ནུས་མེད་གཞི་རྟེན་སྣོད་
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: སྡེ་ཚན་ %s འདི་ ཨེན་ཇི་ཨེསི་ སྡེ་ཚན་ཨིན།\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: མ་ཤེས་པའི་ལག་ལེན་པ་%s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "ལག་ལེནཔ་:id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr "སྡེ་ཚན་="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r host\n"
@@ -2887,10 +2900,6 @@ msgstr "%s: ནུས་མེད་གཞི་རྟེན་སྣོད་
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "མཇུག་གི་ནང་བསྐྱོད་: %.19s གུ་ %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: ནུས་མེད་ལག་ལེན་པའི་མིང་ '%s'།\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "ཆོག་ཡིག་དུས་ཡོལ་ཉེན་བརྡ།"
diff --git a/po/el.gmo b/po/el.gmo
index 4514d4d0..79da4c7f 100644
Binary files a/po/el.gmo and b/po/el.gmo differ
diff --git a/po/el.po b/po/el.po
index 3a383cc4..c8562d9e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow_po_el\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2012-01-21 00:22+0200\n"
 "Last-Translator: Thomas Vasileiou <thomas-v@wildmail.com>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -545,10 +545,6 @@ msgstr "%s: το %s δεν είναι ούτε κατάλογος ούτε συ
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: Αδυναμία ανάγνωσης του συμβολικού συνδέσμου %s: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: Ύποπτα μεγάλος συμβολικός σύνδεσμος: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: Αδυναμία δημιουργίας καταλόγου %s: %s\n"
@@ -910,6 +906,11 @@ msgstr "%s: '%s' περιέχει μη-ASCII χαρακτήρες\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' περιέχει μη έγκυρους χαρακτήρες\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: Το '%s' δεν είναι έγκυρο όνομα ομάδας\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: Ο χρήστης '%s' δεν υπάρχει\n"
@@ -1450,10 +1451,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: μη έγκυρο όνομα ομάδας '%s'\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: άγνωστος χρήστης %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1563,12 +1560,6 @@ msgstr "%s: καμιά αλλαγή\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: αδυναμία διαγραφής του %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Χρήση: id [-a]\n"
-
-msgid " groups="
-msgstr " ομάδες="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1801,6 +1792,11 @@ msgstr "Λάθος συνθηματικό.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: αποτυχία διχάλωσης: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: Το '%s' δεν είναι έγκυρο όνομα ομάδας\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: Ο GID '%lu' δεν υπάρχει\n"
@@ -1845,6 +1841,10 @@ msgstr "%s: μη έγκυρο ID χρήστη '%s'\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: μη έγκυρο όνομα χρήστη '%s'\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: μη έγκυρο όνομα χρήστη '%s'\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2135,6 +2135,11 @@ msgstr "διπλότυπη καταχώριση στο αρχείο συνθημ
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: μη έγκυρο όνομα χρήστη '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: μη έγκυρο όνομα χρήστη '%s'\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "Μη έγκυρο ID χρήστη '%lu'\n"
@@ -2365,14 +2370,15 @@ msgstr "Έναρξη Κατάστασης Συντήρησης Συστήματ
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: το %s δημιουργήθηκε, αλλά δεν μπορεί να διαγραφεί\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: η %s διαμόρφωση στο %s θα αγνοηθεί\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s: η %s διαμόρφωση στο %s θα αγνοηθεί\n"
 
@@ -3123,19 +3129,19 @@ msgid "failed to rename mailbox"
 msgstr "αποτυχία μετονομασίας γραμματοκιβωτίου"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: αποτυχία προετοιμασίας της νέας εγγραφής %s '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: αποτυχία προετοιμασίας της νέας εγγραφής %s '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: αποτυχία προετοιμασίας της νέας εγγραφής %s '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: αποτυχία προετοιμασίας της νέας εγγραφής %s '%s'\n"
 
 #, c-format
@@ -3233,6 +3239,10 @@ msgstr "%s: αποτυχία εύρεσης καταλόγου tcb %s\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "Υπερχείλιση περιβάλλοντος\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: Ύποπτα μεγάλος συμβολικός σύνδεσμος: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: αδυναμία αλλαγής χρήστη '%s' στον εξυπηρετητή NIS.\n"
@@ -3254,6 +3264,16 @@ msgstr "%s: αποτυχία εύρεσης καταλόγου tcb %s\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: Η ομάδα %s είναι NIS ομάδα\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: άγνωστος χρήστης %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Χρήση: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " ομάδες="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r σύστημα\n"
@@ -3293,10 +3313,6 @@ msgstr "%s: αποτυχία εύρεσης καταλόγου tcb %s\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Τελευταία είσοδος: %.19s στο %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: μη έγκυρο όνομα χρήστη '%s'\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: αλλαγή πληροφοριών λήξης συνθηματικού.\n"
diff --git a/po/es.gmo b/po/es.gmo
index 53cb782e..1f1d30e8 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 3bee8095..849d8356 100644
--- a/po/es.po
+++ b/po/es.po
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.1.4.2\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2011-11-23 23:56+0100\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -564,10 +564,6 @@ msgstr "%s: %s no es ni un directorio ni un enlace simbólico.\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: no se pudo leer el enlace simbólico %s: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: enlace simbólico sospechosamente largo: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: no se pudo crear el directorio %s: %s\n"
@@ -751,7 +747,7 @@ msgid "future"
 msgstr ""
 
 msgid "Last password change\t\t\t\t\t: "
-msgstr "Último cambio de contraseña\t\t\t\t\t:"
+msgstr "Último cambio de contraseña\t\t\t\t\t: "
 
 msgid "password must be changed"
 msgstr "se debe cambiar la contraseña"
@@ -921,6 +917,11 @@ msgstr "%s: «%s» contiene caracteres ilegales (que no son ASCII)\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: «%s» contiene caracteres ilegales\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: «%s» no es un nombre de grupo válido\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: el usuario «%s» no existe\n"
@@ -1454,10 +1455,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: nombre del grupo «%s» incorrecto\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: usuario desconocido %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1565,12 +1562,6 @@ msgstr "%s: sin cambios\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: no se pudo borrar %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Modo de uso: id [-a]\n"
-
-msgid " groups="
-msgstr "grupos="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1803,6 +1794,11 @@ msgstr "Contraseña incorrecta.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: se produjo un fallo al realizar el «fork»: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: «%s» no es un nombre de grupo válido\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: el GID «%lu» no existe\n"
@@ -1846,6 +1842,10 @@ msgstr "%s: identificador de usuario «%s» incorrecto\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: nombre de usuario «%s» incorrecto\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: nombre de usuario «%s» incorrecto\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2128,6 +2128,11 @@ msgstr "entrada de contraseña duplicada"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: nombre de usuario «%s» incorrecto\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: nombre de usuario «%s» incorrecto\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "identificador «%lu» de usuario incorrecto\n"
@@ -2359,14 +2364,15 @@ msgstr "Entrando en el modo de mantenimiento del sistema"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: se creó %s, pero no se pudo eliminar\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: se ignorará la configuración %s en %s\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s: se ignorará la configuración %s en %s\n"
 
@@ -3110,19 +3116,19 @@ msgid "failed to rename mailbox"
 msgstr "se produjo un fallo al cambiar el nombre del buzón de correo"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: se produjo un fallo al preparar la nueva %s entrada «%s»\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: se produjo un fallo al preparar la nueva %s entrada «%s»\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: se produjo un fallo al preparar la nueva %s entrada «%s»\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: se produjo un fallo al preparar la nueva %s entrada «%s»\n"
 
 #, c-format
@@ -3220,6 +3226,10 @@ msgstr "%s: se produjo un fallo al buscar el directorio tcb de %s\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "Desbordamiento de entorno\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: enlace simbólico sospechosamente largo: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: no se pudo cambiar el usuario «%s» en el cliente NIS.\n"
@@ -3240,6 +3250,16 @@ msgstr "%s: se produjo un fallo al buscar el directorio tcb de %s\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: el grupo %s es un grupo NIS\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: usuario desconocido %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Modo de uso: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr "grupos="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r máquina\n"
@@ -3279,10 +3299,6 @@ msgstr "%s: se produjo un fallo al buscar el directorio tcb de %s\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Último acceso: %.19s en %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: nombre de usuario «%s» incorrecto\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: información de caducidad de la contraseña cambiada.\n"
diff --git a/po/eu.gmo b/po/eu.gmo
index 3d3d2719..837e70d1 100644
Binary files a/po/eu.gmo and b/po/eu.gmo differ
diff --git a/po/eu.po b/po/eu.po
index f069c9aa..ec186797 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2011-11-26 19:42+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-eu@lists.debian.org>\n"
@@ -521,10 +521,6 @@ msgstr "%s: %s etxe-direktorioa (%s) ez dago\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: ezin da '%s' sarrera %s-tik kendu\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: ezin da %s direktorioa sortu\n"
@@ -864,6 +860,11 @@ msgstr "%s: '%s'(e)k ASCII ez diren karaktereak ditu\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s'(e)k karaktere baliogabeak ditu\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: '%s' ez da baliozko talde-izena\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: '%s' erabiltzailea ez da existitzen\n"
@@ -1388,10 +1389,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: '%s' talde izen baliogabea\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: %s erabiltzaile ezezaguna\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1499,12 +1496,6 @@ msgstr "%s: aldaketarik gabe\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: ezin da %s ezabatu\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Erabilera: id [-a]\n"
-
-msgid " groups="
-msgstr " taldeak="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1735,6 +1726,11 @@ msgstr "Pasahitz baliogabea.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: huts zatitzerakoan: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: '%s' ez da baliozko talde-izena\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: `%lu' GIDa ez da existitzen\n"
@@ -1777,6 +1773,10 @@ msgstr "%s: '%s' erabiltzaile ID baliogabea\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: '%s' erabiltzaile-izen baliogabea\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: '%s' erabiltzaile-izen baliogabea\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2048,6 +2048,11 @@ msgstr "bikoiztutako pasahitz sarrera"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: '%s' erabiltzaile-izen baliogabea\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: '%s' erabiltzaile-izen baliogabea\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "'%lu' erabiltzaile ID baliogabea\n"
@@ -2276,14 +2281,15 @@ msgstr "Sistemaren mantentze-lanetako moduan sartzen"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: %s konfigurazioa %s-n dagoena alde batetara utziko da\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s: %s konfigurazioa %s-n dagoena alde batetara utziko da\n"
 
@@ -2983,19 +2989,19 @@ msgid "failed to rename mailbox"
 msgstr "huts egin du postontzia izenez aldatzean"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: huts %s sarrera  berria prestatzean '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: huts %s sarrera  berria prestatzean '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: huts %s sarrera  berria prestatzean '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: huts %s sarrera  berria prestatzean '%s'\n"
 
 #, c-format
@@ -3113,6 +3119,16 @@ msgstr "%s: oinarrizko '%s' direktorio baliogabea\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: %s taldea NIS talde bat da\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: %s erabiltzaile ezezaguna\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Erabilera: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " taldeak="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r ostalaria\n"
@@ -3152,10 +3168,6 @@ msgstr "%s: oinarrizko '%s' direktorio baliogabea\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Azken saio-hasiera: %.19s  %s(e)n"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: '%s' erabiltzaile-izen baliogabea\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: pasahitz iraungitzea informazioa aldatua.\n"
diff --git a/po/fi.gmo b/po/fi.gmo
index 6ba69269..cfe6c92d 100644
Binary files a/po/fi.gmo and b/po/fi.gmo differ
diff --git a/po/fi.po b/po/fi.po
index 64539f15..68c2dc90 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.18.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2007-11-24 22:54+0100\n"
 "Last-Translator: Tommi Vainikainen <thv+debian@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -505,10 +505,6 @@ msgstr "%s: virheellinen kotihakemisto \"%s\"\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: hakemistoa %s ei voi uudelleennimetä hakemistoksi %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: hakemistoa %s ei voi luoda\n"
@@ -828,6 +824,10 @@ msgstr "%s: \"%s\" sisältää ei-sallittuja merkkejä\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: \"%s\" sisältää ei-sallittuja merkkejä\n"
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: %s ei ole kelpo ryhmänimi\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: käyttäjää %s ei ole olemassa\n"
@@ -1282,10 +1282,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "virheellinen ryhmänimi \"%s\"\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: Tuntematon käyttäjä %s\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1385,12 +1381,6 @@ msgstr "%s: ei muutoksia\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: tiedostoa %s ei voi päivittää\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Käyttö: id [-a]\n"
-
-msgid " groups="
-msgstr " ryhmät="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1609,6 +1599,10 @@ msgstr "Vanha salasana: "
 msgid "%s: failure forking: %s\n"
 msgstr "%s: fork-kutsu epäonnistui: %s"
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: %s ei ole kelpo ryhmänimi\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: käyttäjää %s ei ole olemassa\n"
@@ -1649,6 +1643,10 @@ msgstr "%s: virheellinen käyttäjätunnus \"%s\"\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: virheellinen käyttäjätunnus \"%s\"\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: virheellinen käyttäjätunnus \"%s\"\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1887,6 +1885,11 @@ msgstr "kaksinkertainen salasanatietue"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: virheellinen käyttäjätunnus \"%s\"\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: virheellinen käyttäjätunnus \"%s\"\n"
+
 #, fuzzy, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "virheellinen käyttäjätunnus \"%s\"\n"
@@ -2114,12 +2117,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2735,19 +2738,19 @@ msgid "failed to rename mailbox"
 msgstr "postilaatikon uudelleennimeäminen epäonnistui"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: Oikeuksien pudottaminen epäonnistui (%s)\n"
 
 #, c-format
@@ -2869,6 +2872,16 @@ msgstr "%s: virheellinen perushakemisto \"%s\"\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: ryhmä %s on NIS-ryhmä\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: Tuntematon käyttäjä %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Käyttö: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " ryhmät="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r isäntä\n"
@@ -2906,10 +2919,6 @@ msgstr "%s: virheellinen perushakemisto \"%s\"\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Edellinen kirjautuminen: %.19s päätteellä %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: virheellinen käyttäjätunnus \"%s\"\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "Salasanan vanhenemisvaroitus"
diff --git a/po/fr.gmo b/po/fr.gmo
index ecb9ce77..1a5200c3 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 9ef16148..25697477 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow-man-pages 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2023-04-26 20:04+0200\n"
 "Last-Translator: bubu <bubub@no-log.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -571,10 +571,6 @@ msgstr "%s : %s n'est ni un répertoire, ni un lien symbolique.\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s : Impossible de lire le lien symbolique %s : %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s : Lien symbolique suspicieusement long : %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s : Impossible de créer le répertoire %s : %s\n"
@@ -935,6 +931,11 @@ msgstr "%s : '%s' contient des caractères non-ASCII\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s : '%s' contient des caractères illégaux\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s : '%s' n'est pas un nom de groupe valable\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s : l'utilisateur '%s' n'existe pas\n"
@@ -1478,10 +1479,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s : nom de groupe '%s' non valable\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s : utilisateur inconnu %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1593,12 +1590,6 @@ msgstr "%s : aucun changement\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s : impossible d'effacer %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Utilisation : id [-a]\n"
-
-msgid " groups="
-msgstr " groupes ="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1847,6 +1838,11 @@ msgstr "Mot de passe non valable.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s : échec du fourchage : %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s : '%s' n'est pas un nom de groupe valable\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s : le GID '%lu' n'existe pas\n"
@@ -1894,6 +1890,11 @@ msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr ""
 "%s : nom d'utilisateur '%s' non valable ; utilisez --badname pour l'ignorer\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user ID '%s'\n"
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s : IDentification d'utilisateur '%s' non valable\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2189,6 +2190,11 @@ msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr ""
 "Nom d'utilisateur '%s' non valable ; utilisez --badname pour l'ignorer\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "nom de groupe '%s' non valable\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "ID utilisateur '%lu' non valable\n"
@@ -2413,14 +2419,15 @@ msgstr "Commencement du mode de maintenance du système"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s : %s a été créé, mais n'a pas pu être supprimé\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s : le paramétrage %s dans %s sera ignoré \n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s : le paramétrage %s dans %s sera ignoré \n"
 
@@ -3177,20 +3184,24 @@ msgstr "impossible de changer le proriétaire du fichier mailbox"
 msgid "failed to rename mailbox"
 msgstr "impossible de renommer le fichier mailbox"
 
-#, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s : échec de la suppression de la gamme d'uid %lu-%lu de '%s'\n"
 
-#, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s : échec de l'ajout de la gamme d'uid %lu-%lu à '%s'\n"
 
-#, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s : échec de la suppression de la gamme de gid %lu-%lu de '%s'\n"
 
-#, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s : échec de l'ajout de la gamme de gid %lu-%lu à '%s'\n"
 
 #, c-format
@@ -3293,6 +3304,10 @@ msgstr ""
 #~ msgid "Environment overflow\n"
 #~ msgstr "Débordement de l'environnement\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s : Lien symbolique suspicieusement long : %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s : impossible de changer l'utilisateur '%s' sur le client NIS.\n"
@@ -3315,6 +3330,16 @@ msgstr ""
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s : le groupe %s est un groupe NIS\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s : utilisateur inconnu %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Utilisation : id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " groupes ="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r host\n"
diff --git a/po/gl.gmo b/po/gl.gmo
index e2af0b95..f523cac3 100644
Binary files a/po/gl.gmo and b/po/gl.gmo differ
diff --git a/po/gl.po b/po/gl.po
index 11e64d95..2ba00ec9 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2006-07-18 23:27+0200\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -507,10 +507,6 @@ msgstr "%s: directorio inicial \"%s\" non válido\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: non se pode cambiar o nome do directorio %s a %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: non se pode crear o directorio %s\n"
@@ -828,6 +824,10 @@ msgstr "%s: \"%s\" contén caracteres non válidos\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: \"%s\" contén caracteres non válidos\n"
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: %s non é un nome de grupo válido\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: o usuario %s non existe\n"
@@ -1282,10 +1282,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "nome de grupo \"%s\" non válido\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: usuario %s descoñecido\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1385,12 +1381,6 @@ msgstr "%s: non hai cambios\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: non se pode actualizar o ficheiro %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Emprego: id [-a]\n"
-
-msgid " groups="
-msgstr " grupos="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1608,6 +1598,10 @@ msgstr "Contrasinal antigo: "
 msgid "%s: failure forking: %s\n"
 msgstr "%s: fallo ao lanzar o proceso: %s"
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: %s non é un nome de grupo válido\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: o usuario %s non existe\n"
@@ -1648,6 +1642,10 @@ msgstr "%s: nome de usuario \"%s\" non válido\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: nome de usuario \"%s\" non válido\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: nome de usuario \"%s\" non válido\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1885,6 +1883,11 @@ msgstr "entrada de contrasinal duplicada"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: nome de usuario \"%s\" non válido\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: nome de usuario \"%s\" non válido\n"
+
 #, fuzzy, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "nome de usuario \"%s\" non válido\n"
@@ -2098,12 +2101,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2719,19 +2722,19 @@ msgid "failed to rename mailbox"
 msgstr "non se puido cambiar o nome da caixa do correo"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: non se puido deixar os privilexios (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: non se puido deixar os privilexios (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: non se puido deixar os privilexios (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: non se puido deixar os privilexios (%s)\n"
 
 #, c-format
@@ -2852,6 +2855,16 @@ msgstr "%s: directorio base \"%s\" non válido\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: o grupo %s é un grupo NIS\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: usuario %s descoñecido\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Emprego: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " grupos="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "         %s [-p] -r servidor\n"
@@ -2891,10 +2904,6 @@ msgstr "%s: directorio base \"%s\" non válido\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Última entrada: %.19s en %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: nome de usuario \"%s\" non válido\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "Aviso de caducidade de contrasinal"
diff --git a/po/he.gmo b/po/he.gmo
index 61b8e663..d0790108 100644
Binary files a/po/he.gmo and b/po/he.gmo differ
diff --git a/po/he.po b/po/he.po
index 0f18ceb4..179b8b20 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2004-07-21 23:59+0300\n"
 "Last-Translator: Lior Kaplan <webmaster@guides.co.il>\n"
 "Language-Team: Hebrew <en@li.org>\n"
@@ -496,10 +496,6 @@ msgstr "ספרית שורש לא חוקית \"%s\"\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: לא יכול לשנות משתמש `%s' על לקוח NIS.\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: לא יכול לשנות משתמש `%s' על לקוח NIS.\n"
@@ -821,6 +817,10 @@ msgstr "%s: \"%s\" מכיל תווים לא חוקיים\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: \"%s\" מכיל תווים לא חוקיים\n"
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
@@ -1271,10 +1271,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr ""
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1378,12 +1374,6 @@ msgstr ""
 msgid "%s: cannot delete %s\n"
 msgstr "%s: לא יכול לנעול קובץ צל\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "שימוש: id [-a]\n"
-
-msgid " groups="
-msgstr ""
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1591,6 +1581,10 @@ msgstr "סיסמה לא טובה: %s.  "
 msgid "%s: failure forking: %s\n"
 msgstr "%s: מספר טלפון בעבודה לא חוקי: \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
@@ -1630,6 +1624,10 @@ msgstr "%s: שם לא חוקי: \"%s\"\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1861,6 +1859,10 @@ msgstr "שגיאה בעדכון רשומת הסיסמה."
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
 
+#, fuzzy, c-format
+msgid "invalid user name '%s'\n"
+msgstr "%s: שם לא חוקי: \"%s\"\n"
+
 #, fuzzy, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "%s: שם לא חוקי: \"%s\"\n"
@@ -2059,12 +2061,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2657,19 +2659,19 @@ msgid "failed to rename mailbox"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: מספר טלפון בעבודה לא חוקי: \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: שדות ארוכים מידי\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: מספר טלפון בעבודה לא חוקי: \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "ספרית שורש לא חוקית \"%s\"\n"
 
 #, c-format
@@ -2768,6 +2770,9 @@ msgstr "ספרית שורש לא חוקית \"%s\"\n"
 #~ msgid "%s: group '%s' is a NIS group\n"
 #~ msgstr "%s: שם לא חוקי: \"%s\"\n"
 
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "שימוש: id [-a]\n"
+
 #, fuzzy, c-format
 #~ msgid "%s: Could not open proc directory for target %u\n"
 #~ msgstr "ספרית שורש לא חוקית \"%s\"\n"
diff --git a/po/hu.gmo b/po/hu.gmo
index 2099ec19..297c3673 100644
Binary files a/po/hu.gmo and b/po/hu.gmo differ
diff --git a/po/hu.po b/po/hu.po
index 06e00cf4..87271952 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2007-11-25 20:56+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <gnome@gnome.hu>\n"
@@ -502,10 +502,6 @@ msgstr "%s: érvénytelen saját könyvtár: \"%s\"\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: nem tudom átnevezni %s könyvtárat erre: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: %s könyvtár nem hozható létre\n"
@@ -823,6 +819,10 @@ msgstr "%s: \"%s\" illegális karaktereket tartalmaz\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: \"%s\" illegális karaktereket tartalmaz\n"
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: %s rossz csoport név\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: %s felhasználó nem létezik\n"
@@ -1277,10 +1277,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "érvénytelen csoportnév: `%s'\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: ismeretlen %s felhasználó\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1380,12 +1376,6 @@ msgstr "%s: nincs változás\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: %s fájl nem frissíthető\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Használat: id [-a]\n"
-
-msgid " groups="
-msgstr " csoportok="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1603,6 +1593,10 @@ msgstr "Régi jelszó: "
 msgid "%s: failure forking: %s\n"
 msgstr "%s: hiba a következő indításakor: %s"
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: %s rossz csoport név\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: %s felhasználó nem létezik\n"
@@ -1643,6 +1637,10 @@ msgstr "%s: érvénytelen '%s' felhasználónév\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: érvénytelen '%s' felhasználónév\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: érvénytelen '%s' felhasználónév\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1880,6 +1878,11 @@ msgstr "dupla jelszó bejegyzés"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: érvénytelen '%s' felhasználónév\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: érvénytelen '%s' felhasználónév\n"
+
 #, fuzzy, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "érvénytelen '%s' felhasználó név\n"
@@ -2108,12 +2111,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2726,19 +2729,19 @@ msgid "failed to rename mailbox"
 msgstr "a postafiók átnevezése sikertelen"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: a jogosultságok eldobása meghiúsult (%s)\n"
 
 #, c-format
@@ -2859,6 +2862,16 @@ msgstr "%s: érvénytelen alapkönyvtár: \"%s\"\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: %s egy NIS csoport\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: ismeretlen %s felhasználó\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Használat: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " csoportok="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r host\n"
@@ -2898,10 +2911,6 @@ msgstr "%s: érvénytelen alapkönyvtár: \"%s\"\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Utolsó bejelentkezés: %.19s ide: %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: érvénytelen '%s' felhasználónév\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "Jelszó elévülési figyelmeztetés"
diff --git a/po/id.gmo b/po/id.gmo
index b201cdc4..8901d464 100644
Binary files a/po/id.gmo and b/po/id.gmo differ
diff --git a/po/id.po b/po/id.po
index 12a1d891..8180d4b1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2007-11-25 20:58+0100\n"
 "Last-Translator: Parlin Imanuel Toh <parlin_i@yahoo.com>\n"
 "Language-Team: Debian Indonesia <debid@yahoogroups.com>\n"
@@ -501,10 +501,6 @@ msgstr "%s: direktori rumah `%s' tak sah\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: tak dapat mengubah nama direktori %s menjadi %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: tak dapat membuat direktori %s\n"
@@ -822,6 +818,10 @@ msgstr "%s: \"%s\" berisi karakter-karakter ilegal\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: \"%s\" berisi karakter-karakter ilegal\n"
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: nama grup %s tidak sah\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: pengguna %s tak ada\n"
@@ -1276,10 +1276,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "nama grup `%s' tidak sah\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: pengguna %s tak dikenal\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1379,12 +1375,6 @@ msgstr "%s: tak ada perubahan\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: tidak dapat memperbaharui berkas %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Penggunaan: id [-a]\n"
-
-msgid " groups="
-msgstr " grup="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1602,6 +1592,10 @@ msgstr "Kata sandi lama: "
 msgid "%s: failure forking: %s\n"
 msgstr "%s: gagal membuat proses: %s"
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: nama grup %s tidak sah\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: pengguna %s tak ada\n"
@@ -1642,6 +1636,10 @@ msgstr "%s: nama pengguna `%s' tak sah\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: nama pengguna `%s' tak sah\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: nama pengguna `%s' tak sah\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1879,6 +1877,11 @@ msgstr "entri kata sandi berduplikat"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: nama pengguna `%s' tak sah\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: nama pengguna `%s' tak sah\n"
+
 #, fuzzy, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "nama pengguna tak sah '%s'\n"
@@ -2094,12 +2097,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2705,19 +2708,19 @@ msgid "failed to rename mailbox"
 msgstr "gagal mengubah nama kotak-surat"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: gagal membuang hak (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: gagal membuang hak (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: gagal membuang hak (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: gagal membuang hak (%s)\n"
 
 #, c-format
@@ -2838,6 +2841,16 @@ msgstr "%s: direktori awal `%s' tak sah\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: grup %s merupakan sebuah grup NIS\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: pengguna %s tak dikenal\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Penggunaan: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " grup="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "            %s [-p] -r host\n"
@@ -2877,10 +2890,6 @@ msgstr "%s: direktori awal `%s' tak sah\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Login terakhir: %.19s pada %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: nama pengguna `%s' tak sah\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "Peringatan Kadaluarsanya Kata Sandi"
diff --git a/po/it.gmo b/po/it.gmo
index 30ceae14..868b31b6 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index 733debec..fd8a6670 100644
--- a/po/it.po
+++ b/po/it.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2008-03-27 14:40+0100\n"
 "Last-Translator: Danilo Piazzalunga <danilopiazza@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -531,10 +531,6 @@ msgstr "%s: directory home «%s» non valida\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: impossibile rinominare la directory %s in %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: impossibile creare la directory %s\n"
@@ -861,6 +857,10 @@ msgstr "%s: «%s» contiene caratteri non ammessi\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: «%s» contiene caratteri non ammessi\n"
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: %s non è un nome di gruppo valido\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: l'utente «%s» non esiste\n"
@@ -1346,10 +1346,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: nome di gruppo «%s» non valido\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: utente «%s» sconosciuto\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1452,12 +1448,6 @@ msgstr "%s: nessuna modifica\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: impossibile aggiornare il file %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Uso: id [-a]\n"
-
-msgid " groups="
-msgstr " gruppi="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1676,6 +1666,10 @@ msgstr "Password non valida.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: impossibile eseguire fork(): %s\n"
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: %s non è un nome di gruppo valido\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: l'utente «%s» non esiste\n"
@@ -1716,6 +1710,10 @@ msgstr "%s: nome utente «%s» non valido\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: nome utente «%s» non valido\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: nome utente «%s» non valido\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1968,6 +1966,11 @@ msgstr "voce duplicata nel file delle password"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: nome utente «%s» non valido\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: nome utente «%s» non valido\n"
+
 #, fuzzy, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "nome utente «%s» non valido\n"
@@ -2195,12 +2198,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2858,19 +2861,19 @@ msgid "failed to rename mailbox"
 msgstr "impossibile rinominare la casella di posta"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: impossibile abbandonare i privilegi (%s)\n"
 
 #, fuzzy, c-format
@@ -2995,6 +2998,16 @@ msgstr "%s: directory di base «%s» non valida\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: il gruppo «%s» è un gruppo NIS\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: utente «%s» sconosciuto\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Uso: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " gruppi="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "     %s [-p] -r HOST\n"
@@ -3033,10 +3046,6 @@ msgstr "%s: directory di base «%s» non valida\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Ultimo accesso: %.19s su %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: nome utente «%s» non valido\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "Avviso di scadenza della password"
diff --git a/po/ja.gmo b/po/ja.gmo
index 37867866..1a4934a5 100644
Binary files a/po/ja.gmo and b/po/ja.gmo differ
diff --git a/po/ja.po b/po/ja.po
index 7b5adab9..336b025d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.1.5\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2012-05-21 02:52+0900\n"
 "Last-Translator: NAKANO Takeo <nakano@webmasters.gr.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -535,10 +535,6 @@ msgstr "%s: %s はディレクトリでもシンボリックリンクでもあ
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: シンボリックリンク %s を読めません: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: シンボリックリンクが長すぎるようです: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: ディレクトリ %s を作成できません: %s\n"
@@ -878,6 +874,11 @@ msgstr "%s: '%s' には非 ASCII 文字が含まれています\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' には利用できない文字が含まれています\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: '%s' はグループ名として正しくありません\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: ユーザ '%s' は存在しません\n"
@@ -1398,10 +1399,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s '%s' はグループ名として正しくありません\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: ユーザ %s は不明です\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1511,12 +1508,6 @@ msgstr "%s: 変更はありません\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: %s を削除できません\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "使い方: id [-a]\n"
-
-msgid " groups="
-msgstr " グループ="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1742,6 +1733,11 @@ msgstr "そのパスワードは使えません。\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: fork に失敗しました: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: '%s' はグループ名として正しくありません\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: GID '%lu' は存在しません\n"
@@ -1786,6 +1782,10 @@ msgstr "%s: '%s' はユ−ザ ID に使えません\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: '%s' はユーザ名に使えません\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: '%s' はユーザ名に使えません\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2053,6 +2053,11 @@ msgstr "パスワードエントリが重複しています"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: '%s' はユーザ名に使えません\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: '%s' はユーザ名に使えません\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "'%lu' はユーザ ID に使えません\n"
@@ -2280,14 +2285,15 @@ msgstr "システムメンテナンスモードへ入ります"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: %s を作成しましたが、削除できません\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%1$s: %3$s 中の設定 %2$s は無視されます\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%1$s: %3$s 中の設定 %2$s は無視されます\n"
 
@@ -2994,19 +3000,19 @@ msgid "failed to rename mailbox"
 msgstr "mailbox の名前変更に失敗しました"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: %s の新しいエントリ '%s' を準備できませんでした。\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: %s の新しいエントリ '%s' を準備できませんでした。\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: %s の新しいエントリ '%s' を準備できませんでした。\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: %s の新しいエントリ '%s' を準備できませんでした。\n"
 
 #, c-format
@@ -3098,6 +3104,10 @@ msgstr "%s: %s の tcb ディレクトリが見付かりませんでした\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "環境変数領域のオーバーフロー\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: シンボリックリンクが長すぎるようです: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: NIS クライアントではユーザ '%s' を変更できません。\n"
@@ -3118,6 +3128,16 @@ msgstr "%s: %s の tcb ディレクトリが見付かりませんでした\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: グループ %s は NIS のグループです\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: ユーザ %s は不明です\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "使い方: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " グループ="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r ホスト\n"
@@ -3157,10 +3177,6 @@ msgstr "%s: %s の tcb ディレクトリが見付かりませんでした\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "最近のログイン: %.19s on %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: '%s' はユーザ名に使えません\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: パスワード期限切れ情報を変更しました\n"
diff --git a/po/ka.gmo b/po/ka.gmo
index 53208d6b..15536b7c 100644
Binary files a/po/ka.gmo and b/po/ka.gmo differ
diff --git a/po/ka.po b/po/ka.po
index 743d5b03..3da44846 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow-utils\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2024-02-08 06:13+0100\n"
 "Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <(nothing)>\n"
@@ -528,10 +528,6 @@ msgstr "%s: %s არც საქაღალდეა, არც სიმბ
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: სიმბმულის წაკითხვის შეცდომა %s: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: საეჭვოდ გრძელი სიმბმული %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s საქაღალდის (%s) შექმნის შეცდომა: %s\n"
@@ -874,6 +870,11 @@ msgstr "%s: %s: არა-ASCII სიმბოლოებს შეიცა
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' არასწორ სიმბოლოებს შეიცავს\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: %s ჯგუფის სწორ სახელს არ წარმოადგენს\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: მომხმარებელი \"%s\" არ არსებობს\n"
@@ -1393,10 +1394,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: არასწორი ჯგუფის სახელი \"%s\"\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: უცნობი მომხმარებელი %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1508,12 +1505,6 @@ msgstr "%s: ცვლილებების გარეშე\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: %s-ის წაშლა შეუძლებელია\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "გამოყენება: id [-a]\n"
-
-msgid " groups="
-msgstr " ჯგუფები="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1747,6 +1738,11 @@ msgstr "არასწორი პაროლი.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: განტოტვის შეცდომა: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: %s ჯგუფის სწორ სახელს არ წარმოადგენს\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: GID '%lu' არ არსებობს\n"
@@ -1789,6 +1785,11 @@ msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr ""
 "%s: მომხმარებლის არასწორი სახელი '%s': დასაიგნორებლად გამოიყენეთ --badname\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user ID '%s'\n"
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: მომხმარებლის არასწორი ID \"%s\"\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr "%s: მიაწოდეთ '--crypt-method', წრეების რაოდენობამდე\n"
@@ -2058,6 +2059,11 @@ msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr ""
 "მომხმარებლის არასწორი სახელი '%s': დასაიგნორებლად გამოიყენეთ --badname\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "ჯგუფის არასწორი სახელი: '%s'\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "მომხმარებლის არასწორი ID \"%lu\"\n"
@@ -2275,13 +2281,17 @@ msgstr "მიმდინარეობს სისტემის სარ
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: %s შეიქმნა, მაგრამ ვერ ვშლი\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: %s-ის კონფიგურაცია %s-ში იგნორირებული იქნება\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+#| "group\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 "%s: '%s'-ის კონფიგურაციას %s-ში არასწორი ჯგუფი აქვს. არასწორი ჯგუფების "
@@ -2984,20 +2994,24 @@ msgstr "საფოსტო ყუთის მფლობელის შე
 msgid "failed to rename mailbox"
 msgstr "საფოსტო ყუთის სახელის გადარქმევა ვერ მოხერხდა"
 
-#, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: UID-ის დიაპაზონის %lu-%lu '%s'-დან წაშლის შეცდომა\n"
 
-#, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: UID-ის დიაპაზონის %lu-%lu '%s'-ში ჩამატების შეცდომა\n"
 
-#, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: GID-ის დიაპაზონის %lu-%lu '%s'-დან წაშლის შეცდომა\n"
 
-#, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: GID-ის დიაპაზონის %lu-%lu '%s'-ში ჩამატების შეცდომა\n"
 
 #, c-format
@@ -3091,6 +3105,10 @@ msgstr "%s: %s-სთვის tcb საქაღალდის პოვნ
 #~ msgid "Environment overflow\n"
 #~ msgstr "გარემო გადავსებულია\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: საეჭვოდ გრძელი სიმბმული %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: მომხმარებლის '%s' შეცვლა NIS კლიენტზე შეუძლებელია.\n"
@@ -3111,6 +3129,16 @@ msgstr "%s: %s-სთვის tcb საქაღალდის პოვნ
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: ჯგუფი '%s' NIS ჯგუფია\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: უცნობი მომხმარებელი %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "გამოყენება: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " ჯგუფები="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r ჰოსტი\n"
diff --git a/po/kk.gmo b/po/kk.gmo
index fee301e9..924bb3d3 100644
Binary files a/po/kk.gmo and b/po/kk.gmo differ
diff --git a/po/kk.po b/po/kk.po
index 02546c9d..d7970aa4 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadowutils\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2017-02-07 17:09+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk_KZ@googlegroups.com>\n"
@@ -534,10 +534,6 @@ msgstr "%s: %s бума да, сілтеме де емес.\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: %s символдық сілтемесін оқу мүмкін емес: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: Күдіктілі ұзын символдық сілтеме: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: %s бумасын жасау мүмкін емес: %s\n"
@@ -886,6 +882,11 @@ msgstr "%s: '%s' құрамында ASCII-емес таңбалар бар\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' құрамында қате таңбалар бар\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: '%s' дұрыс топ аты емес\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: пайдаланушы '%s' жоқ болып тұр\n"
@@ -1413,10 +1414,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: қате топ аты '%s'\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: белгісіз пайдаланушы %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1526,12 +1523,6 @@ msgstr "%s: өзгерістер жоқ\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: %s өшіру мүмкін емес\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Қолданылуы: id [-a]\n"
-
-msgid " groups="
-msgstr " топтар="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1766,6 +1757,11 @@ msgstr "пароль қате.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: үрдісті бастау қатесі: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: '%s' дұрыс топ аты емес\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: '%lu' GID-і жоқ болып тұр\n"
@@ -1810,6 +1806,10 @@ msgstr "%s: пайдаланушы ID-і '%s' қате\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: '%s' пайдаланушы аты қате\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: '%s' пайдаланушы аты қате\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2085,6 +2085,11 @@ msgstr "қайталанатын пароль жазбасы"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: '%s' пайдаланушы аты қате\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: '%s' пайдаланушы аты қате\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "пайдаланушы ID-і '%lu' қате\n"
@@ -2314,14 +2319,15 @@ msgstr "Жүйені жөндеу режиміне өту"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: %s жасалды, бірақ оны өшіру мүмкін емес\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: %s баптауы,  ол %s ішінде, есепке алынбайды\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s: %s баптауы,  ол %s ішінде, есепке алынбайды\n"
 
@@ -3038,22 +3044,24 @@ msgstr "mailbox иесін ауыстыру қатемен аяқталды"
 msgid "failed to rename mailbox"
 msgstr "mailbox атын ауыстыру қатемен аяқталды"
 
-#, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: %lu-%lu uid-тар ауқымын '%s' ішінен өшіру сәтсіз аяқталды\n"
 
 #, fuzzy, c-format
 #| msgid "%s: failed to add uid range %lu-%lu from '%s'\n"
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: %lu-%lu uid ауқымын '%s' ішіне қосу сәтсіз аяқталды\n"
 
-#, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: %lu-%lu gid-тар ауқымын '%s' ішінен өшіру сәтсіз аяқталды\n"
 
 #, fuzzy, c-format
 #| msgid "%s: failed to add gid range %lu-%lu from '%s'\n"
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: %lu-%lu gid ауқымын '%s' ішіне қосу сәтсіз аяқталды\n"
 
 #, c-format
@@ -3147,6 +3155,10 @@ msgstr "%s: %s үшін tcb бумасын табу сәтсіз\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "Орындалу орта айнымалыларының шектен көп саны\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: Күдіктілі ұзын символдық сілтеме: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: NIS клиентінде '%s' пайдаланушыны ауыстыруға мүмкін емес.\n"
@@ -3167,6 +3179,16 @@ msgstr "%s: %s үшін tcb бумасын табу сәтсіз\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: %s тобы NIS тобы болып тұр\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: белгісіз пайдаланушы %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Қолданылуы: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " топтар="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r хост\n"
@@ -3206,10 +3228,6 @@ msgstr "%s: %s үшін tcb бумасын табу сәтсіз\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Жүйеге соңғы кіру: %.19s, терминал %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: '%s' пайдаланушы аты қате\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: пароль мерзімі туралы ақпарат өзгертілді.\n"
diff --git a/po/km.gmo b/po/km.gmo
index 21d93846..88aa9062 100644
Binary files a/po/km.gmo and b/po/km.gmo differ
diff --git a/po/km.po b/po/km.po
index 323b9253..c35def95 100644
--- a/po/km.po
+++ b/po/km.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow_po_km\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2006-06-28 10:08+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -515,10 +515,6 @@ msgstr "%s ៖ ថត​ផ្ទះ​មិន​ត្រឹមត្រូ
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s ៖ មិនអាចប្ដូរឈ្មោះ​ថត​ %s ទៅ​ជា​ %s បានឡើយ\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s ៖ មិន​​អាច​បង្កើត​ថត​ %s បានឡើយ\n"
@@ -839,6 +835,10 @@ msgstr "%s ៖ '%s' មាន​តួអក្សរ​មិន​ត្រ
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s ៖ '%s' មាន​តួអក្សរ​មិន​ត្រឹមត្រូវ​\n"
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s  ៖ %s ជា​ឈ្មោះ​ក្រុម​មិន​ត្រឹមត្រូវ​\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
@@ -1293,10 +1293,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "ឈ្មោះ​ក្រុម​ '%s' មិនត្រឹមត្រូវ\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s ៖ មិន​ស្គាល់​អ្នកប្រើ​ %s\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1400,12 +1396,6 @@ msgstr "%s ៖គ្មាន​ការផ្លាស់ប្ដូរ​\n
 msgid "%s: cannot delete %s\n"
 msgstr "%s ៖ មិនអាច​ធ្វើឲ្យឯកសារ %s ទាន់សម័យ​បានទេ\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "របៀបប្រើ ៖ លេខសម្គាល់ [-a]\n"
-
-msgid " groups="
-msgstr " ក្រុម​="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1627,6 +1617,10 @@ msgstr "ពាក្យ​សម្ងាត់​ចាស់ ៖ "
 msgid "%s: failure forking: %s\n"
 msgstr "%s ៖ ការចែកជាពីរវិធី​​បានបរាជ័យ​ ៖ %s"
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s  ៖ %s ជា​ឈ្មោះ​ក្រុម​មិន​ត្រឹមត្រូវ​\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s ៖ មិនទាន់មានអ្នក​ប្រើ​ %s ទេ​\n"
@@ -1667,6 +1661,10 @@ msgstr "%s ៖ឈ្មោះ​អ្នក​ប្រើ​មិន​ត
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s ៖ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s ៖ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1908,6 +1906,11 @@ msgstr "ធាតុបញ្ចូល​ពាក្យ​សម្ងាត់
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s ៖ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s ៖ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
+
 #, fuzzy, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
@@ -2126,12 +2129,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2738,19 +2741,19 @@ msgid "failed to rename mailbox"
 msgstr "​បរាជ័យ​ក្នុងការប្ដូរឈ្មោះប្រអប់"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s ៖ បរាជ័យ​ក្នុងការ​ទម្លាក់​សិទ្ធ (%s)\n"
 
 #, c-format
@@ -2871,6 +2874,16 @@ msgstr "%s  ៖ ថត​មូលដ្ឋាន​មិន​ត្រឹ
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s ៖ ក្រុម​ %s គឺជា​ក្រុម NIS\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s ៖ មិន​ស្គាល់​អ្នកប្រើ​ %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "របៀបប្រើ ៖ លេខសម្គាល់ [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " ក្រុម​="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r ម៉ាស៊ីន​\n"
@@ -2908,10 +2921,6 @@ msgstr "%s  ៖ ថត​មូលដ្ឋាន​មិន​ត្រឹ
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "ចូល​ចុងក្រោយ​ ៖ %.19s លើ​ %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s ៖ឈ្មោះ​អ្នក​ប្រើ​មិន​ត្រឹមត្រូវ​ '%s'\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "ការព្រមាន​ការផុត​កំណត់​នៃ​ពាក្យ​សម្ងាត់​"
diff --git a/po/ko.gmo b/po/ko.gmo
index 2bfc5d61..4d8b2708 100644
Binary files a/po/ko.gmo and b/po/ko.gmo differ
diff --git a/po/ko.po b/po/ko.po
index 5bab7b42..ac4f6a15 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2009-04-19 21:32+0900\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -509,10 +509,6 @@ msgstr "%s: 홈 디렉터리 '%s'은(는) 잘못되었습니다\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: '%s' 항목을 %s에서 제거할 수 없습니다\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: 디렉터리 %s을(를) 만들 수 없습니다\n"
@@ -832,6 +828,11 @@ msgstr "%s: '%s'에 ASCII가 아닌 문자가 들어 있습니다\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s'에 사용할 수 없는 글자가 들어 있습니다\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: '%s'은(는) 사용할 수 없는 그룹 이름입니다\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: '%s' 사용자가 없습니다\n"
@@ -1300,10 +1301,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: '%s' 그룹 이름은 쓸 수 없습니다\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: 알 수 없는 사용자 %s\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1404,12 +1401,6 @@ msgstr "%s: 바뀐 점이 없음\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: '%s'을(를) 삭제할 수 없습니다\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "사용법: id [-a]\n"
-
-msgid " groups="
-msgstr " 그룹 목록="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1627,6 +1618,11 @@ msgstr "쓸 수 없는 암호입니다.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: 프로세스 만들기 실패: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: '%s'은(는) 사용할 수 없는 그룹 이름입니다\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: '%lu' GID가 없습니다\n"
@@ -1667,6 +1663,10 @@ msgstr "%s: 사용할 수 없는 사용자 ID '%s'\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: 쓸 수 없는 사용자 이름 '%s'\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: 쓸 수 없는 사용자 이름 '%s'\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1913,6 +1913,11 @@ msgstr "암호 입력값 복제"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: 쓸 수 없는 사용자 이름 '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: 쓸 수 없는 사용자 이름 '%s'\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "올바르지 않은 사용자 ID '%lu'\n"
@@ -2139,12 +2144,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2786,19 +2791,19 @@ msgid "failed to rename mailbox"
 msgstr "메일함의 이름을 바꾸는 데 실패했습니다"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: 새 %s 항목 '%s'을(를) 준비하는데 실패했습니다\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: 새 %s 항목 '%s'을(를) 준비하는데 실패했습니다\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: 새 %s 항목 '%s'을(를) 준비하는데 실패했습니다\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: 새 %s 항목 '%s'을(를) 준비하는데 실패했습니다\n"
 
 #, c-format
@@ -2918,6 +2923,16 @@ msgstr "%s: 기본 디렉터리 '%s' 잘못되었습니다\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: %s 그룹은 NIS 그룹입니다\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: 알 수 없는 사용자 %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "사용법: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " 그룹 목록="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r 호스트\n"
@@ -2956,10 +2971,6 @@ msgstr "%s: 기본 디렉터리 '%s' 잘못되었습니다\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "마지막 로그인: %.19s on %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: 쓸 수 없는 사용자 이름 '%s'\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "암호 사용만료 예고"
diff --git a/po/nb.gmo b/po/nb.gmo
index fc6dd11f..946ac066 100644
Binary files a/po/nb.gmo and b/po/nb.gmo differ
diff --git a/po/nb.po b/po/nb.po
index 184fbe1a..83d93a1c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2018-03-05 12:33+0100\n"
 "Last-Translator: Åka Sikrom <a4@hush.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -557,10 +557,6 @@ msgstr "%s: %s er hverken en mappe eller symbolsk lenke.\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: Klarte ikke å lese symbolsk lenke %s: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: Mistenkelig lang symlenke: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: Klarte ikke å opprette mappa %s: %s\n"
@@ -910,6 +906,12 @@ msgstr "%s: «%s» inneholder tegn som ikke er ASCII\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: «%s» inneholder ugyldige tegn\n"
 
+# , c-format
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: «%s» er et ugyldig gruppenavn\n"
+
 # , c-format
 #, c-format
 msgid "%s: user '%s' does not exist\n"
@@ -1467,10 +1469,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: ugyldig gruppenavn «%s»\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: ukjent bruker %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1583,12 +1581,6 @@ msgstr "%s: ingen endringer\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: klarte ikke å slette %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Bruk: id [-a]\n"
-
-msgid " groups="
-msgstr " grupper="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1824,6 +1816,12 @@ msgstr "Ugyldig passord.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: mislykket utspalting: %s\n"
 
+# , c-format
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: «%s» er et ugyldig gruppenavn\n"
+
 # , c-format
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
@@ -1870,6 +1868,10 @@ msgstr "%s: ugyldig bruker-ID «%s»\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: ugyldig brukernavn «%s»\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: ugyldig brukernavn «%s»\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2144,6 +2146,11 @@ msgstr "duplisert oppføring i passordfil"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: ugyldig brukernavn «%s»\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: ugyldig brukernavn «%s»\n"
+
 # , c-format
 #, c-format
 msgid "invalid user ID '%lu'\n"
@@ -2379,14 +2386,15 @@ msgstr "Starter systemvedlikeholds-modus"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: %s ble opprettet, men ikke fjernet\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: oppsettet for %s i %s blir ignorert\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s: oppsettet for %s i %s blir ignorert\n"
 
@@ -3122,25 +3130,27 @@ msgid "failed to rename mailbox"
 msgstr "klarte ikke å gi nytt navn til e-postboks"
 
 # , c-format
-#, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: klarte ikke å fjerne uid-rekkevidde %lu-%lu fra «%s»\n"
 
 # , c-format
 #, fuzzy, c-format
 #| msgid "%s: failed to add uid range %lu-%lu from '%s'\n"
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: klarte ikke å legge til uid-rekkevidde %lu-%lu fra «%s»\n"
 
 # , c-format
-#, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: klarte ikke å fjerne gid-rekkevidde %lu-%lu fra «%s»\n"
 
 # , c-format
 #, fuzzy, c-format
 #| msgid "%s: failed to add gid range %lu-%lu from '%s'\n"
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: klarte ikke å legge til gid-rekkevidde %lu-%lu fra «%s»\n"
 
 #, c-format
@@ -3237,6 +3247,10 @@ msgstr "%s: fant ikke tcb-mappe for %s\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "Miljøet er fullt\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: Mistenkelig lang symlenke: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: klarte ikke å endre bruker «%s» på NIS-klient.\n"
@@ -3258,6 +3272,16 @@ msgstr "%s: fant ikke tcb-mappe for %s\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: gruppa %s er en NIS-gruppe\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: ukjent bruker %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Bruk: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " grupper="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "      %s [-p] -r host\n"
@@ -3296,10 +3320,6 @@ msgstr "%s: fant ikke tcb-mappe for %s\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Forrige login: %.19s på %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: ugyldig brukernavn «%s»\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: informasjon om utløp av passord er endret.\n"
diff --git a/po/ne.gmo b/po/ne.gmo
index 6eac5d1e..45a9c92c 100644
Binary files a/po/ne.gmo and b/po/ne.gmo differ
diff --git a/po/ne.po b/po/ne.po
index fed58470..9d787f6e 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2006-06-16 14:30+0545\n"
 "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -508,10 +508,6 @@ msgstr "%s: अवैध गृह डाइरेक्ट्री '%s'\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: डाइरेक्ट्री %s लाई %s मा पुन:नामकरण गर्न सकिदैन\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: डाइरेकट्री सिर्जना गर्न सकिएन %s\n"
@@ -829,6 +825,10 @@ msgstr "%s: '%s' ले गैरकानूनी क्यारेक्ट
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' ले गैरकानूनी क्यारेक्टरहरू समाविष्ट गर्दछ\n"
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: %s वैध समूह नाम होइन\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
@@ -1283,10 +1283,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "अवैध समूह नाम '%s'\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: अज्ञात प्रयोगकर्ता %s\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1386,12 +1382,6 @@ msgstr "%s: कुनै परिवर्तनहरू छैन\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: फाइल %s अद्यावधिक गर्न सकिएन\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "उपयोग: id [-a]\n"
-
-msgid " groups="
-msgstr " समूहहरू="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1609,6 +1599,10 @@ msgstr "पुरानो पासवर्ड: "
 msgid "%s: failure forking: %s\n"
 msgstr "%s: फोर्क गर्दा असफल: %s"
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: %s वैध समूह नाम होइन\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: प्रयोगकर्ता %s अवस्थित छैन\n"
@@ -1649,6 +1643,10 @@ msgstr "%s: अवैध प्रयोगकर्ता नाम '%s'\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: अवैध प्रयोगकर्ता नाम '%s'\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: अवैध प्रयोगकर्ता नाम '%s'\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1887,6 +1885,11 @@ msgstr "नक्कली पासवर्ड प्रविष्टि"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: अवैध प्रयोगकर्ता नाम '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: अवैध प्रयोगकर्ता नाम '%s'\n"
+
 #, fuzzy, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "अवैध प्रयोगकर्ता नाम '%s'\n"
@@ -2100,12 +2103,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2714,19 +2717,19 @@ msgid "failed to rename mailbox"
 msgstr "मेल बक्सलाई पुन:नामकरण गर्न असफल भयो"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: विशेषधिकारहरू छोड्न असफल भयो (%s)\n"
 
 #, c-format
@@ -2847,6 +2850,16 @@ msgstr "%s: अवैध डाइरेक्ट्री '%s'\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: समूह %s NIS समूह हो\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: अज्ञात प्रयोगकर्ता %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "उपयोग: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " समूहहरू="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r host\n"
@@ -2886,10 +2899,6 @@ msgstr "%s: अवैध डाइरेक्ट्री '%s'\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "अन्तिम लगइन: %s मा %.19s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: अवैध प्रयोगकर्ता नाम '%s'\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "पासवर्ड समाप्ति चेतावनी"
diff --git a/po/nl.gmo b/po/nl.gmo
index 13890bd2..4814a0ec 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index f665cf33..49f9d59e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.15.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2024-05-09 12:30+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -536,10 +536,6 @@ msgstr "%s: %s is geen map en ook geen symbolische koppeling.\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: kan symbolische koppeling %s niet lezen: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: verdacht lange symbolische koppeling: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: kan map %s niet aanmaken: %s\n"
@@ -886,6 +882,11 @@ msgstr "%s: '%s' bevat niet-ASCII tekens\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' bevat ongeldige tekens\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: '%s' is geen geldige groepsnaam\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: gebruiker '%s' bestaat niet\n"
@@ -1405,10 +1406,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: ongeldige groepsnaam '%s'\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: onbekende gebruiker %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1521,12 +1518,6 @@ msgstr "%s: geen aanpassingen\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: kan %s niet verwijderen\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Gebruik: id [-a]\n"
-
-msgid " groups="
-msgstr " groepen="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1759,6 +1750,11 @@ msgstr "Ongeldig wachtwoord.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: nieuw proces beginnen is mislukt: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: '%s' is geen geldige groepsnaam\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: GID '%lu' bestaat niet\n"
@@ -1800,6 +1796,11 @@ msgstr "%s: ongeldig gebruikers-ID '%s'\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: ongeldige gebruikersnaam '%s': gebruik --badname om te negeren\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user ID '%s'\n"
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: ongeldig gebruikers-ID '%s'\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr "%s: Geef '--crypt-method' op vóór het aantal rondes\n"
@@ -2072,6 +2073,11 @@ msgstr "identieke regel in wachtwoordbestand"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "ongeldige gebruikersnaam '%s': gebruik --badname om te negeren\n"
 
+#, fuzzy, c-format
+#| msgid "invalid group name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "ongeldige groepsnaam '%s'\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "ongeldig gebruikers-ID '%lu'\n"
@@ -2286,13 +2292,17 @@ msgstr "Systeemonderhoudsmodus wordt opgestart"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: %s was aangemaakt, maar kon niet verwijderd worden\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: de %s-instellingen in %s zullen genegeerd worden\n"
 
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+#| "group\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 "%s: de configuratie van '%s' in %s heeft een ongeldige groep, deze groep "
@@ -3005,20 +3015,24 @@ msgstr "aanpassen van de postvak-eigenaar is mislukt"
 msgid "failed to rename mailbox"
 msgstr "hernoemen van het postvak is mislukt"
 
-#, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: verwijderen van UID-bereik %lu-%lu van '%s' is mislukt\n"
 
-#, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: toevoegen van UID-bereik %lu-%lu aan '%s' is mislukt\n"
 
-#, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: verwijderen van GID-bereik %lu-%lu van '%s' is mislukt\n"
 
-#, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: toevoegen van GID-bereik %lu-%lu aan '%s' is mislukt\n"
 
 #, c-format
@@ -3113,6 +3127,10 @@ msgstr "%s: tcb-map van %s vinden is mislukt\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "Omgeving wordt te groot\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: verdacht lange symbolische koppeling: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: kan gebruiker '%s' niet veranderen op NIS-client.\n"
@@ -3133,6 +3151,16 @@ msgstr "%s: tcb-map van %s vinden is mislukt\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: groep %s is een NIS-groep\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: onbekende gebruiker %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Gebruik: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " groepen="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r computer\n"
diff --git a/po/nn.gmo b/po/nn.gmo
index 754e0f7a..5c3bfba1 100644
Binary files a/po/nn.gmo and b/po/nn.gmo differ
diff --git a/po/nn.po b/po/nn.po
index 91b342c0..9f56399d 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2004-06-03 21:41+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian (Nynorsk) <i18n-nn@lister.ping.uio.no>\n"
@@ -502,10 +502,6 @@ msgstr "%s: ugyldig heimemappe «%s»\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: klarte ikkje endra namn på mappa %s til %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: kan ikkje oppretta mappa %s\n"
@@ -829,6 +825,10 @@ msgstr "%s: «%s» inneheld ulovlege teikn\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: «%s» inneheld ulovlege teikn\n"
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: %s er ikkje eit gyldig gruppenamn\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: brukar %s finst ikkje\n"
@@ -1283,10 +1283,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "ugyldig gruppenamn «%s»\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: ukjend brukar %s\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1386,12 +1382,6 @@ msgstr "%s: ingen endringar\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: klarer ikkje oppdatere fila %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Bruk: id [-a]\n"
-
-msgid " groups="
-msgstr " grupper="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1612,6 +1602,10 @@ msgstr "Gamalt passord:"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: ugyldig telefonnummer, arbeid: «%s»\n"
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: %s er ikkje eit gyldig gruppenamn\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: brukar %s finst ikkje\n"
@@ -1652,6 +1646,10 @@ msgstr "%s: ugyldig brukarnamn «%s»\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: ugyldig brukarnamn «%s»\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: ugyldig brukarnamn «%s»\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1889,6 +1887,11 @@ msgstr "duplisert oppføring i passordfila"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: ugyldig brukarnamn «%s»\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: ugyldig brukarnamn «%s»\n"
+
 #, fuzzy, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "ugyldig brukarnamn «%s»\n"
@@ -2090,12 +2093,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2696,19 +2699,19 @@ msgid "failed to rename mailbox"
 msgstr "klarte ikkje endra namn på mailbox"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: ugyldig telefonnummer, arbeid: «%s»\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: felta er for lange\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: ugyldig telefonnummer, arbeid: «%s»\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: ugyldig startmappe «%s»\n"
 
 #, c-format
@@ -2828,6 +2831,16 @@ msgstr "%s: ugyldig startmappe «%s»\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: gruppe %s er ei NIS-gruppe\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: ukjend brukar %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Bruk: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " grupper="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "      %s [-p] -r vert\n"
@@ -2859,10 +2872,6 @@ msgstr "%s: ugyldig startmappe «%s»\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Førre inlogging: %.19s på %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: ugyldig brukarnamn «%s»\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "Åtvaring for utgått passord"
diff --git a/po/pl.gmo b/po/pl.gmo
index f7833926..68ad796b 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index b40c2700..cdf1439c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2007-11-25 20:53+0100\n"
 "Last-Translator: Tomasz Kłoczko <kloczek@pld.org.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -512,10 +512,6 @@ msgstr "%s: nieprawidłowy katalog domowy '%s'\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: nie można zmienić nazwy katalogu z %s na %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: nie można utworzyć katalogu %s\n"
@@ -833,6 +829,10 @@ msgstr "%s: '%s' zawiera nieprawidłowe znaki\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' zawiera nieprawidłowe znaki\n"
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: %s: nie jest prawidłową nazwą grupy\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: użytkownik %s nie istnieje\n"
@@ -1287,10 +1287,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "nieprawidłowa nazwa grupy '%s'\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: nieznany użytkownik %s\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1392,12 +1388,6 @@ msgstr "%s: bez zmian\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: nie można zaktualizować pliku %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Użycie: id [-a]\n"
-
-msgid " groups="
-msgstr " grupy="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1615,6 +1605,10 @@ msgstr "Stare hasło: "
 msgid "%s: failure forking: %s\n"
 msgstr "%s: failure forking: %s"
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: %s: nie jest prawidłową nazwą grupy\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: użytkownik %s nie istnieje\n"
@@ -1655,6 +1649,10 @@ msgstr "%s: nieprawidłowa nazwa użytkownika '%s'\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: nieprawidłowa nazwa użytkownika '%s'\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: nieprawidłowa nazwa użytkownika '%s'\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1892,6 +1890,11 @@ msgstr "powtórzony wpis w pliku z hasłami"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: nieprawidłowa nazwa użytkownika '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: nieprawidłowa nazwa użytkownika '%s'\n"
+
 #, fuzzy, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "nieprawidłowa nazwa użytkownika '%s'\n"
@@ -2117,12 +2120,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2736,19 +2739,19 @@ msgid "failed to rename mailbox"
 msgstr "zmiana nazwy skrzynki pocztowej nie powiodła się"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: niepowiodło się porzucenie uprawnień (%s)\n"
 
 #, c-format
@@ -2869,6 +2872,16 @@ msgstr "%s: nieprawidłowy katalog bazowy '%s'\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: grupa %s jest grupą NIS\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: nieznany użytkownik %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Użycie: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " grupy="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "        %s [-p] -r host\n"
@@ -2907,10 +2920,6 @@ msgstr "%s: nieprawidłowy katalog bazowy '%s'\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Ostatnie logowanie: %s na %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: nieprawidłowa nazwa użytkownika '%s'\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "Ostrzeżenie o utracie ważności hasła"
diff --git a/po/pt.gmo b/po/pt.gmo
index d0904100..fab7a7d8 100644
Binary files a/po/pt.gmo and b/po/pt.gmo differ
diff --git a/po/pt.po b/po/pt.po
index 489fa053..8d8e679d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2012-01-14 12:41+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -548,10 +548,6 @@ msgstr "%s: %s não é nem um directório, nem um symlink.\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: não é possível ler o link simbólico %s: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: link simbólico longo suspeito: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: não é possível criar o directório %s: %s\n"
@@ -903,6 +899,11 @@ msgstr "%s: '%s' contém caracteres não-ASCII\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' contém caracteres não permitidos.\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: '%s' não é um nome válido para o grupo\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: o utilizador '%s' não existe\n"
@@ -1435,10 +1436,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: nome de grupo '%s' inválido\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: utilizador desconhecido %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1548,12 +1545,6 @@ msgstr "%s: sem alterações\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: não é possível apagar %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Utilização: id [-a]\n"
-
-msgid " groups="
-msgstr " grupos="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1784,6 +1775,11 @@ msgstr "Palavra-passe inválida.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: falhou a bifurcação de: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: '%s' não é um nome válido para o grupo\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: o GID '%lu' não existe\n"
@@ -1827,6 +1823,10 @@ msgstr "%s: ID '%s' de utilizador inválido\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: o nome de utilizador '%s' é inválido\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: o nome de utilizador '%s' é inválido\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2110,6 +2110,11 @@ msgstr "entrada de palavra-passe duplicada"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: o nome de utilizador '%s' é inválido\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: o nome de utilizador '%s' é inválido\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "ID '%lu' de utilizador inválido\n"
@@ -2337,14 +2342,15 @@ msgstr "A Entrar no Modo de Manutenção do Sistema"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: foi criado %s, mas não pode ser removido\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: a configuração %s em %s será ignorada\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s: a configuração %s em %s será ignorada\n"
 
@@ -3082,19 +3088,19 @@ msgid "failed to rename mailbox"
 msgstr "falha ao renomear a caixa do correio"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: falhou a preparação para a nova %s entrada '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: falhou a preparação para a nova %s entrada '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: falhou a preparação para a nova %s entrada '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: falhou a preparação para a nova %s entrada '%s'\n"
 
 #, c-format
@@ -3189,6 +3195,10 @@ msgstr "%s: falhou encontrar o directório tcb para %s\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "Overflow do ambiente\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: link simbólico longo suspeito: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: não é possível alterar o utilizador '%s' no cliente NIS.\n"
@@ -3209,6 +3219,16 @@ msgstr "%s: falhou encontrar o directório tcb para %s\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: o grupo %s é um grupo NIS\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: utilizador desconhecido %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Utilização: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " grupos="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "            %s [-p] -r máquina\n"
@@ -3249,10 +3269,6 @@ msgstr "%s: falhou encontrar o directório tcb para %s\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Última entrada no sistema: %.19s em %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: o nome de utilizador '%s' é inválido\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: informação de caducidade da palavra-passe alterada.\n"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 059e012c..93255ea1 100644
Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ff6d4fd2..39d7ae9f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2011-11-25 20:20+0100\n"
 "Last-Translator: Fred Ulisses Maranhão <fred.maranhao@gmail.com>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@ -535,10 +535,6 @@ msgstr "%s: %s não é diretório, nem link simbólico.\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: Não foi possível ler o link simbólico %s: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: link simbólico longo suspeito: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: não foi possível criar o diretório %s: %s\n"
@@ -882,6 +878,11 @@ msgstr "%s: '%s' contém caracteres não-ASCII\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' contém caracteres ilegais\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: '%s' não é um nome de grupo válido\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: usuário '%s' não existe\n"
@@ -1405,10 +1406,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: nome de grupo '%s' inválido\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s : usuário %s desconhecido\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1516,12 +1513,6 @@ msgstr "%s : nenhuma mudança\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: não é possível apagar %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Uso : id [-a]\n"
-
-msgid " groups="
-msgstr " grupos="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1753,6 +1744,11 @@ msgstr "Senha inválida.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: falha ramificando: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: '%s' não é um nome de grupo válido\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: GID '%lu' não existe\n"
@@ -1796,6 +1792,10 @@ msgstr "%s: ID de usuário '%s' inválido\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s : nome de usuário '%s' inválido\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s : nome de usuário '%s' inválido\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2071,6 +2071,11 @@ msgstr "entrada de senha duplicada"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s : nome de usuário '%s' inválido\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s : nome de usuário '%s' inválido\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "ID de usuário '%lu' inválido\n"
@@ -2298,14 +2303,15 @@ msgstr "Entrando em Modo de Manutenção do Sistema"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: %s foi criado, mas não pode ser removido\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: a configuração %s em %s será ignorada\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s: a configuração %s em %s será ignorada\n"
 
@@ -3031,19 +3037,19 @@ msgid "failed to rename mailbox"
 msgstr "falha ao renomear caixa-postal"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: falha ao preparar a nova entrada %s '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: falha ao preparar a nova entrada %s '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: falha ao preparar a nova entrada %s '%s'\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: falha ao preparar a nova entrada %s '%s'\n"
 
 #, c-format
@@ -3139,6 +3145,10 @@ msgstr "%s: falha ao procurar o diretório tcb para %s\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "Overflow de ambiente\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: link simbólico longo suspeito: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: não foi possível mudar o usuário '%s' no cliente NIS.\n"
@@ -3159,6 +3169,16 @@ msgstr "%s: falha ao procurar o diretório tcb para %s\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s : grupo %s é um grupo NIS\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s : usuário %s desconhecido\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Uso : id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " grupos="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "      %s [-p] -r host\n"
@@ -3198,10 +3218,6 @@ msgstr "%s: falha ao procurar o diretório tcb para %s\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Último login : %.19s em %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s : nome de usuário '%s' inválido\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: informação de expiração de senha alterada.\n"
diff --git a/po/ro.gmo b/po/ro.gmo
index bf931f58..448f52fa 100644
Binary files a/po/ro.gmo and b/po/ro.gmo differ
diff --git a/po/ro.po b/po/ro.po
index 633e2b48..8f55df91 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2007-11-26 18:18+0100\n"
 "Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -508,10 +508,6 @@ msgstr "%s: director personal nevalid '%s'\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: nu pot redenumi directorul %s în %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: nu pot crea directorul %s\n"
@@ -829,6 +825,10 @@ msgstr "%s: '%s' conţine caractere ilegale\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' conţine caractere ilegale\n"
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: %s nu este un nume de grup valid\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: utilizatorul %s nu există\n"
@@ -1283,10 +1283,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "nume de grup nevalid '%s'\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: utilizator necunoscut %s\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1386,12 +1382,6 @@ msgstr "%s: nici o schimbare\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: nu pot actualiza fişierul %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Utilizare: id [-a]\n"
-
-msgid " groups="
-msgstr " grupuri="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1609,6 +1599,10 @@ msgstr "Parola veche: "
 msgid "%s: failure forking: %s\n"
 msgstr "%s : eşuare la bifurcare: %s"
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: %s nu este un nume de grup valid\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: utilizatorul %s nu există\n"
@@ -1649,6 +1643,10 @@ msgstr "%s: nume utilizator nevalid '%s'\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: nume utilizator nevalid '%s'\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: nume utilizator nevalid '%s'\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1887,6 +1885,11 @@ msgstr "intrare duplicată în passwd"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: nume utilizator nevalid '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: nume utilizator nevalid '%s'\n"
+
 #, fuzzy, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "nume de utilizator nevalid '%s'\n"
@@ -2101,12 +2104,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2721,19 +2724,19 @@ msgid "failed to rename mailbox"
 msgstr "eşuare în redenumirea căsuţei poştale"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s : eşuare în abandonarea privilegiilor (%s)\n"
 
 #, c-format
@@ -2854,6 +2857,16 @@ msgstr "%s: director de bază nevalid '%s'\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: grupul %s este un grup NIS\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: utilizator necunoscut %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Utilizare: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " grupuri="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r gazdă\n"
@@ -2893,10 +2906,6 @@ msgstr "%s: director de bază nevalid '%s'\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Ultima autentificare: %.19s în %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: nume utilizator nevalid '%s'\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "Avertisment de expirare a parolei"
diff --git a/po/ru.gmo b/po/ru.gmo
index c8372a11..5e4a4adc 100644
Binary files a/po/ru.gmo and b/po/ru.gmo differ
diff --git a/po/ru.po b/po/ru.po
index 2e288ad9..d77917cb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.1.5.1-1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2017-03-05 11:14+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -553,10 +553,6 @@ msgstr "%s: %s не является каталогом или символьн
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: не удалось прочитать символьную ссылку %s: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: вероятно, слишком длинная символьная ссылка: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: не удалось создать каталог %s: %s\n"
@@ -909,6 +905,11 @@ msgstr "%s: в «%s» содержатся не ASCII-символы\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: в «%s» содержатся недопустимые символы\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: «%s» не может быть именем группы\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: пользователь «%s» не существует\n"
@@ -1443,10 +1444,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: неверное имя группы «%s»\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: неизвестный пользователь %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1554,12 +1551,6 @@ msgstr "%s: изменения не внесены\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: не удалось удалить %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Использование: id [-a]\n"
-
-msgid " groups="
-msgstr " группы="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1794,6 +1785,11 @@ msgstr "Неправильный пароль.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: ошибка при вызове fork: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: «%s» не может быть именем группы\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: GID «%lu» не существует\n"
@@ -1839,6 +1835,10 @@ msgstr "%s: неверный пользовательский ID «%s»\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: неверное имя пользователя «%s»\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: неверное имя пользователя «%s»\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2115,6 +2115,11 @@ msgstr "повторяющаяся запись в файле паролей"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: неверное имя пользователя «%s»\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: неверное имя пользователя «%s»\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "неверный пользовательский ID «%lu»\n"
@@ -2343,14 +2348,15 @@ msgstr "Вход в режим системного обслуживания"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: каталог %s создан, но не может быть удалён\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: настройка %s в %s будет проигнорирована\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s: настройка %s в %s будет проигнорирована\n"
 
@@ -3094,22 +3100,24 @@ msgstr "не удалось сменить владельца почтового
 msgid "failed to rename mailbox"
 msgstr "не удалось переименовать почтовый ящик"
 
-#, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: не удалось удалить диапазон uid %lu-%lu из «%s»\n"
 
 #, fuzzy, c-format
 #| msgid "%s: failed to add uid range %lu-%lu from '%s'\n"
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: не удалось добавить диапазон uid %lu-%lu в «%s»\n"
 
-#, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: не удалось удалить диапазон gid %lu-%lu из «%s»\n"
 
 #, fuzzy, c-format
 #| msgid "%s: failed to add gid range %lu-%lu from '%s'\n"
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: не удалось добавить диапазон gid %lu-%lu в «%s»\n"
 
 #, c-format
@@ -3206,6 +3214,10 @@ msgstr "%s: не удалось найти каталог tcb для %s\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "Слишком большое количество переменных окружения\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: вероятно, слишком длинная символьная ссылка: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: невозможно изменить пользователя «%s» в клиенте NIS.\n"
@@ -3226,6 +3238,16 @@ msgstr "%s: не удалось найти каталог tcb для %s\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: группа %s является группой NIS\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: неизвестный пользователь %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Использование: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " группы="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "                    %s [-p] -r узел\n"
@@ -3265,10 +3287,6 @@ msgstr "%s: не удалось найти каталог tcb для %s\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Последний вход в систему: %.19s на %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: неверное имя пользователя «%s»\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: информация об истечении срока действия пароля изменена.\n"
diff --git a/po/shadow.pot b/po/shadow.pot
index e2f64eeb..45efee96 100644
--- a/po/shadow.pot
+++ b/po/shadow.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: shadow 4.16.0\n"
+"Project-Id-Version: shadow 4.17.0-rc1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -493,10 +493,6 @@ msgstr ""
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr ""
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr ""
@@ -812,6 +808,10 @@ msgstr ""
 msgid "%s: '%s' contains illegal characters\n"
 msgstr ""
 
+#, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr ""
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr ""
@@ -1262,10 +1262,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr ""
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr ""
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1365,12 +1361,6 @@ msgstr ""
 msgid "%s: cannot delete %s\n"
 msgstr ""
 
-msgid "Usage: id [-a]\n"
-msgstr ""
-
-msgid " groups="
-msgstr ""
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1576,6 +1566,10 @@ msgstr ""
 msgid "%s: failure forking: %s\n"
 msgstr ""
 
+#, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr ""
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr ""
@@ -1615,6 +1609,10 @@ msgstr ""
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr ""
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr ""
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1842,6 +1840,10 @@ msgstr ""
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr ""
 
+#, c-format
+msgid "invalid user name '%s'\n"
+msgstr ""
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr ""
@@ -2037,12 +2039,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2634,19 +2636,19 @@ msgid "failed to rename mailbox"
 msgstr ""
 
 #, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr ""
 
 #, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr ""
 
 #, c-format
diff --git a/po/sk.gmo b/po/sk.gmo
index a1347789..43291ff1 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index 15c432c5..f9237a9b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.17\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2011-11-26 22:06+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -515,10 +515,6 @@ msgstr "%s: chybný domovský adresár „%s“\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: nie je možné odstrániť položku „%s“ z %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: nedá sa vytvoriť adresár %s\n"
@@ -857,6 +853,11 @@ msgstr "%s: „%s“ obsahuje znaky, ktoré nie sú v ASCII\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: „%s“ obsahuje chybné znaky\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: „%s“ nie je platným názvom skupiny\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: používateľ „%s“ neexistuje\n"
@@ -1364,10 +1365,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: chybné pomenovanie skupiny „%s“\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: používateľ %s je neznámy\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1473,12 +1470,6 @@ msgstr "%s: bezo zmien\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: nie je možné zmazať %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Použitie: id [-a]\n"
-
-msgid " groups="
-msgstr " skupiny="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1703,6 +1694,11 @@ msgstr "Neplatné heslo.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: chybné vetvenie: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: „%s“ nie je platným názvom skupiny\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: GID „%lu“ neexistuje\n"
@@ -1745,6 +1741,10 @@ msgstr "%s: chybný ID používateľa „%s“\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: chybné používateľské meno „%s“\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: chybné používateľské meno „%s“\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2006,6 +2006,11 @@ msgstr "duplikovaná položka v súbore s heslami"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: chybné používateľské meno „%s“\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: chybné používateľské meno „%s“\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "chybný ID používateľa „%lu“\n"
@@ -2233,12 +2238,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2918,19 +2923,19 @@ msgid "failed to rename mailbox"
 msgstr "chyba pri premenovaní schránky"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: zlyhalo pripravenie novej položky %s „%s“\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: zlyhalo pripravenie novej položky %s „%s“\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: zlyhalo pripravenie novej položky %s „%s“\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: zlyhalo pripravenie novej položky %s „%s“\n"
 
 #, c-format
@@ -3051,6 +3056,16 @@ msgstr "%s: chybný základný adresár „%s“\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: skupina %s je NIS skupinou\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: používateľ %s je neznámy\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Použitie: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " skupiny="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "          %s [-p] -r počítač\n"
@@ -3089,10 +3104,6 @@ msgstr "%s: chybný základný adresár „%s“\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Posledné prihlásenie: %.19s na %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: chybné používateľské meno „%s“\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "Upozornenie o uplynutí doby platnosti hesla"
diff --git a/po/sq.po b/po/sq.po
index 17a9e2d6..fde7ee38 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.3\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2004-11-20 03:28+0100\n"
 "Last-Translator: Elian Myftiu <pinguini AT fastwebnet DOT it>\n"
 "Language-Team: Albanian <gnome-albanian-perkthyesit@lists.sourceforge.net>\n"
@@ -495,10 +495,6 @@ msgstr ""
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "Kujdes: grup i panjohur %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "Kujdes: grup i panjohur %s\n"
@@ -815,6 +811,10 @@ msgstr ""
 msgid "%s: '%s' contains illegal characters\n"
 msgstr ""
 
+#, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr ""
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr ""
@@ -1265,10 +1265,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr ""
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr ""
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1369,12 +1365,6 @@ msgstr ""
 msgid "%s: cannot delete %s\n"
 msgstr "Kujdes: grup i panjohur %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr ""
-
-msgid " groups="
-msgstr ""
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1581,6 +1571,10 @@ msgstr "   Zgjidh një fjalëkalim të ri.\n"
 msgid "%s: failure forking: %s\n"
 msgstr ""
 
+#, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr ""
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr ""
@@ -1620,6 +1614,10 @@ msgstr ""
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "Kujdes: grup i panjohur %s\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1849,6 +1847,10 @@ msgstr ""
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "invalid user name '%s'\n"
+msgstr "Kujdes: grup i panjohur %s\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr ""
@@ -2045,12 +2047,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2642,19 +2644,19 @@ msgid "failed to rename mailbox"
 msgstr ""
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "Kujdes: grup i panjohur %s\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "Kujdes: grup i panjohur %s\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "Kujdes: grup i panjohur %s\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "Kujdes: grup i panjohur %s\n"
 
 #, c-format
diff --git a/po/sv.gmo b/po/sv.gmo
index 56f88740..479fa7f2 100644
Binary files a/po/sv.gmo and b/po/sv.gmo differ
diff --git a/po/sv.po b/po/sv.po
index 76adaa82..f12c6737 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.1.1\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2011-11-25 22:08+0100\n"
 "Last-Translator: Daniel Nylander <yeager@ubuntu.com>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -529,10 +529,6 @@ msgstr "%s: %s är varken en katalog eller symbolisk länk.\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: Kan inte läsa symboliska länken %s: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: Misstänkt lång symbolisk länk: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: Kan inte skapa katalogen %s: %s\n"
@@ -877,6 +873,11 @@ msgstr "%s: \"%s\" innehåller icke-ASCII-tecken\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: \"%s\" innehåller ogiltiga tecken\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: \"%s\" är inte ett giltigt gruppnamn\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: användaren \"%s\" finns inte\n"
@@ -1399,10 +1400,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: ogiltigt gruppnamn \"%s\"\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: okänd användare %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1510,12 +1507,6 @@ msgstr "%s: inga ändringar\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: kan inte ta bort %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Usage: id [-a]\n"
-
-msgid " groups="
-msgstr " grupper="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1746,6 +1737,11 @@ msgstr "Ogiltigt lösenord.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: fel vid processgrening: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: \"%s\" är inte ett giltigt gruppnamn\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: GID \"%lu\" finns inte\n"
@@ -1789,6 +1785,10 @@ msgstr "%s: ogiltigt användar-id \"%s\"\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: ogiltigt användarnamn \"%s\"\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: ogiltigt användarnamn \"%s\"\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2063,6 +2063,11 @@ msgstr "duplikata lösenordsposter"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: ogiltigt användarnamn \"%s\"\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: ogiltigt användarnamn \"%s\"\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "ogiltigt användar-id \"%lu\"\n"
@@ -2291,14 +2296,15 @@ msgstr "Går över till läge för systemunderhåll"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: %s skapades men kunde inte tas bort\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: %s-konfigurationen i %s kommer att ignoreras\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s: %s-konfigurationen i %s kommer att ignoreras\n"
 
@@ -3017,19 +3023,19 @@ msgid "failed to rename mailbox"
 msgstr "misslyckades med att byta namn på postlåda"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: misslyckades med att förbereda den nya %s-posten \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: misslyckades med att förbereda den nya %s-posten \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: misslyckades med att förbereda den nya %s-posten \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: misslyckades med att förbereda den nya %s-posten \"%s\"\n"
 
 #, c-format
@@ -3124,6 +3130,10 @@ msgstr "%s: misslyckades med att hitta tcb-katalog för %s\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "Överskott av miljövariabler\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: Misstänkt lång symbolisk länk: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: kan inte ändra användare \"%s\" på en NIS-klient.\n"
@@ -3144,6 +3154,16 @@ msgstr "%s: misslyckades med att hitta tcb-katalog för %s\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: gruppen %s är en NIS-grupp\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: okänd användare %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Usage: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " grupper="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r värd\n"
@@ -3182,10 +3202,6 @@ msgstr "%s: misslyckades med att hitta tcb-katalog för %s\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Senast inloggad: %.19s på %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: ogiltigt användarnamn \"%s\"\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: information om lösenordets utgång har ändrats.\n"
diff --git a/po/tl.gmo b/po/tl.gmo
index cb7ba291..49300ede 100644
Binary files a/po/tl.gmo and b/po/tl.gmo differ
diff --git a/po/tl.po b/po/tl.po
index 67072e76..04bfa09c 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2007-11-26 21:34+0100\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -515,10 +515,6 @@ msgstr "%s: hindi tanggap na directory na tahanan '%s'\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: hindi mapalitan ng pangalan ang directory %s sa %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: hindi malikha ang directory %s\n"
@@ -836,6 +832,10 @@ msgstr "%s: '%s' ay may hindi legal na mga karakter\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' ay may hindi legal na mga karakter\n"
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: hindi tanggap na pangalan ng grupo ang %s\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: walang gumagamit na nagngangalang %s\n"
@@ -1290,10 +1290,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "hindi tanggap na pangalan ng grupo '%s'\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: di kilalang gumagamit %s\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1393,12 +1389,6 @@ msgstr "%s: walang pagbabago\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: hindi ma-apdeyt ang talaksang %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Pag-gamit: id [-a]\n"
-
-msgid " groups="
-msgstr " mga grupo="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1616,6 +1606,10 @@ msgstr "Lumang kontrasenyas:"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: bigo sa pag-fork: %s"
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: hindi tanggap na pangalan ng grupo ang %s\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: walang gumagamit na nagngangalang %s\n"
@@ -1656,6 +1650,10 @@ msgstr "%s: hindi tanggap na pangalan `%s'\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: hindi tanggap na pangalan `%s'\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: hindi tanggap na pangalan `%s'\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1894,6 +1892,11 @@ msgstr "nadobleng ipinasok sa password"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: hindi tanggap na pangalan `%s'\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: hindi tanggap na pangalan `%s'\n"
+
 #, fuzzy, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "hindi tanggap na pangalan '%s'\n"
@@ -2122,12 +2125,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2741,19 +2744,19 @@ msgid "failed to rename mailbox"
 msgstr "bigo sa pagpalit ng pangalan ng mailbox"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: bigo sa pagtanggal ng mga pribilehiyo (%s)\n"
 
 #, c-format
@@ -2874,6 +2877,16 @@ msgstr "%s: hindi tanggap na batayang directory '%s'\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: ang grupong %s ay grupong NIS\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: di kilalang gumagamit %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Pag-gamit: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " mga grupo="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r host\n"
@@ -2913,10 +2926,6 @@ msgstr "%s: hindi tanggap na batayang directory '%s'\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Huling pagpasok: %.19s sa %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: hindi tanggap na pangalan `%s'\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "Babala ng Paglipas ng Taning ng Password"
diff --git a/po/tr.gmo b/po/tr.gmo
index d9be4e4a..50cc1be0 100644
Binary files a/po/tr.gmo and b/po/tr.gmo differ
diff --git a/po/tr.po b/po/tr.po
index fde24b82..753cca29 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2008-03-29 20:31+0200\n"
 "Last-Translator: Mehmet Türker <mturker@innova.com.tr>\n"
 "Language-Team: Türkçe <tr@li.org>\n"
@@ -509,10 +509,6 @@ msgstr "%s: geçersiz ev dizini '%s'\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: %s dizini %s olarak yeniden adlandırılamıyor\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr ""
-
 #, fuzzy, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: %s dizini yaratılamıyor\n"
@@ -839,6 +835,10 @@ msgstr "%s: '%s' geçersiz karakterler içeriyor\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: '%s' geçersiz karakterler içeriyor\n"
 
+#, fuzzy, c-format
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: %s geçerli bir grup adı değil\n"
+
 #, fuzzy, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: kullanıcı `%s' mevcut değil\n"
@@ -1320,10 +1320,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: geçersiz grup adı `%s'\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: bilinmeyen kullanıcı %s\n"
-
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1426,12 +1422,6 @@ msgstr "%s: değişiklik yok\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: %s dosyası güncellenemiyor\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Kullanım: id [-a]\n"
-
-msgid " groups="
-msgstr ".gruplar="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1648,6 +1638,10 @@ msgstr "Geçersiz parola.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: çatallama (fork) hatası: %s\n"
 
+#, fuzzy, c-format
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: %s geçerli bir grup adı değil\n"
+
 #, fuzzy, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: kullanıcı `%s' mevcut değil\n"
@@ -1688,6 +1682,10 @@ msgstr "%s: geçersiz kullanıcı adı '%s'\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: geçersiz kullanıcı adı '%s'\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: geçersiz kullanıcı adı '%s'\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1940,6 +1938,11 @@ msgstr "mükerrer parola kaydı"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: geçersiz kullanıcı adı '%s'\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: geçersiz kullanıcı adı '%s'\n"
+
 #, fuzzy, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "geçersiz kullanıcı adı '%s'\n"
@@ -2167,12 +2170,12 @@ msgid "%s: %s was created, but could not be removed\n"
 msgstr ""
 
 #, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr ""
 
 #, c-format
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr ""
 
@@ -2826,19 +2829,19 @@ msgid "failed to rename mailbox"
 msgstr "postakutusu isim değişikliği başarısız"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
 
 #, fuzzy, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: ayrıcalıklar iptal edilemedi (%s)\n"
 
 #, fuzzy, c-format
@@ -2962,6 +2965,16 @@ msgstr "%s: geçersiz ana dizin '%s'\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: grup %s bir NIS grubudur\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: bilinmeyen kullanıcı %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Kullanım: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr ".gruplar="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "          %s [-p] -r host\n"
@@ -3001,10 +3014,6 @@ msgstr "%s: geçersiz ana dizin '%s'\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Son giriş: %s üzerinden %.19s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: geçersiz kullanıcı adı '%s'\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "Parola Kullanım Süresi Bitti Uyarısı"
diff --git a/po/uk.gmo b/po/uk.gmo
index b90ff37c..9c3dc87c 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index dea93c7e..f330628f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.18\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2022-05-16 19:32+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -538,10 +538,6 @@ msgstr "%s: %s не є ні каталогом, ні символічним по
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: не вдалося прочитати символічне посилання %s: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: підозріливо довге символічне посилання: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: не вдалося створити каталог %s: %s\n"
@@ -889,6 +885,11 @@ msgstr "%s: «%s» містить символи поза ASCII\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: «%s» містить заборонені символи\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: «%s» є некоректною назвою групи\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: запису користувача «%s» не існує\n"
@@ -1410,10 +1411,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: некоректна назва групи «%s»\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: невідомий користувач %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1525,12 +1522,6 @@ msgstr "%s: без змін\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: не вдалося вилучити %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Користування: id [-a]\n"
-
-msgid " groups="
-msgstr " групи="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1776,6 +1767,11 @@ msgstr "Некоректний пароль.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: помилка відгалуження: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: «%s» є некоректною назвою групи\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: GID «%lu» не існує\n"
@@ -1824,6 +1820,10 @@ msgstr ""
 "%s: некоректне ім'я користувача «%s»: скористайтеся --badname, щоб "
 "проігнорувати\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: невірне ім'я користувача '%s'\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2104,6 +2104,11 @@ msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr ""
 "некоректне ім'я користувача «%s»: скористайтеся --badname, щоб ігнорувати\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: невірне ім'я користувача '%s'\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "некоректний ідентифікатор користувача «%lu»\n"
@@ -2318,14 +2323,15 @@ msgstr "Входимо у режим відновлення системи"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: було створено %s, але його не вдалося вилучити\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: налаштування %s у %s буде проігноровано\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s: налаштування %s у %s буде проігноровано\n"
 
@@ -3058,20 +3064,24 @@ msgstr "не вдалося змінити власника поштової с
 msgid "failed to rename mailbox"
 msgstr "не вдалося перейменувати поштову скриньку"
 
-#, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: не вдалося вилучити діапазон UID %lu-%lu з «%s»\n"
 
-#, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: не вдалося додати діапазон UID %lu-%lu до «%s»\n"
 
-#, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: не вдалося вилучити діапазон GID %lu-%lu з «%s»\n"
 
-#, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: не вдалося додати діапазон GID %lu-%lu до «%s»\n"
 
 #, c-format
@@ -3168,6 +3178,10 @@ msgstr "%s: не вдалося знайти каталог tcb для %s\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "Переповнення середовища\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: підозріливо довге символічне посилання: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: не вдалося змінити користувача «%s» у клієнті NIS.\n"
@@ -3188,6 +3202,16 @@ msgstr "%s: не вдалося знайти каталог tcb для %s\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: група %s є групою NIS\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: невідомий користувач %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Користування: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " групи="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "                %s [-p] -r вузол\n"
@@ -3241,10 +3265,6 @@ msgstr "%s: не вдалося знайти каталог tcb для %s\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Останній вхід в систему: %.19s на %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: невірне ім'я користувача '%s'\n"
-
 #, fuzzy, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "Застереження про прострочення пароля"
diff --git a/po/vi.gmo b/po/vi.gmo
index 5abb12ba..c71e3cc3 100644
Binary files a/po/vi.gmo and b/po/vi.gmo differ
diff --git a/po/vi.po b/po/vi.po
index 8b636d59..62e8836c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow master\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2016-10-04 07:07+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <debian-l10n-vietnamese@lists.debian.org>\n"
@@ -543,10 +543,6 @@ msgstr "%s: %s không phải là thư mục mà cũng không phải là liên k
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s: Không thể đọc liên kết mềm %s: %s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s: Liên kết mềm dài một cách điên rồ: %s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s: Không thể tạo thư mục %s: %s\n"
@@ -896,6 +892,11 @@ msgstr "%s: “%s” chứa ký tự không thuộc bảng mã ASCII\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s: “%s” chứa ký tự bị cấm\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s: “%s” không phải là tên nhóm hợp lệ\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s: người dùng “%s” không tồn tại\n"
@@ -1425,10 +1426,6 @@ msgstr ""
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s: tên nhóm không hợp lệ “%s”\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s: không rõ người dùng %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1538,12 +1535,6 @@ msgstr "%s: chưa thay đổi gì\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s: không thể xóa %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "Cách dùng: id [-a]\n"
-
-msgid " groups="
-msgstr " nhóm="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr ""
@@ -1781,6 +1772,11 @@ msgstr "Mật khẩu không hợp lệ.\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s: lỗi tạo tiến trình con: %s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s: “%s” không phải là tên nhóm hợp lệ\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s: GID “%lu” không tồn tại\n"
@@ -1825,6 +1821,10 @@ msgstr "%s: mã số người dùng không hợp lệ “%s”\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: tên dùng không hợp lệ “%s”\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s: tên dùng không hợp lệ “%s”\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2101,6 +2101,11 @@ msgstr "mục tin mật khẩu trùng"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s: tên dùng không hợp lệ “%s”\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s: tên dùng không hợp lệ “%s”\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "mã số người dùng không hợp lệ “%lu”\n"
@@ -2333,14 +2338,15 @@ msgstr "Đang vào Chế độ Bảo dưỡng Hệ thống"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: %s đã được tạo, nhưng không thể bị gỡ bỏ\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s: cấu hình %s trong %s sẽ bị bỏ qua\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s: cấu hình %s trong %s sẽ bị bỏ qua\n"
 
@@ -3058,22 +3064,24 @@ msgstr "gặp lỗi khi đổi chủ sở hữu hộp thư"
 msgid "failed to rename mailbox"
 msgstr "gặp lỗi khi đổi tên của hộp thư"
 
-#, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%s: gặp lỗi khi xóa bỏ vùng mã người dùng %lu-%lu khỏi “%s”\n"
 
 #, fuzzy, c-format
 #| msgid "%s: failed to add uid range %lu-%lu from '%s'\n"
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s: gặp lỗi khi thêm vùng mã người dùng %lu-%lu vào “%s”\n"
 
-#, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%s: gặp lỗi khi gỡ bỏ vùng mã số nhóm %lu-%lu khỏi “%s”\n"
 
 #, fuzzy, c-format
 #| msgid "%s: failed to add gid range %lu-%lu from '%s'\n"
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s: gặp lỗi khi thêm vùng mã số nhóm %lu-%lu vào “%s”\n"
 
 #, c-format
@@ -3166,6 +3174,10 @@ msgstr "%s: gặp lỗi khi tìm thư mục tcb cho %s\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "Tràn môi trường\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s: Liên kết mềm dài một cách điên rồ: %s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s: không thể thay đổi người dùng “%s” trên ứng dụng khách NIS.\n"
@@ -3186,6 +3198,16 @@ msgstr "%s: gặp lỗi khi tìm thư mục tcb cho %s\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s: nhóm %s là một nhóm kiểu NIS\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s: không rõ người dùng %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "Cách dùng: id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " nhóm="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r máy\n"
@@ -3225,10 +3247,6 @@ msgstr "%s: gặp lỗi khi tìm thư mục tcb cho %s\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "Đang nhập cuối cùng: %.19s vào %s"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s: tên dùng không hợp lệ “%s”\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s: thông tin đã thay đổi về sự hết hạn sử dụng mật khẩu.\n"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 4de71f88..681fd7c2 100644
Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a9add44b..8b1e8ff3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2022-07-27 23:04+0800\n"
 "Last-Translator: Celeste Liu <coelacanthus@outlook.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -510,10 +510,6 @@ msgstr "%s：%s 既不是目录也不是符号链接。\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s：无法读取符号链接 %s：%s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s：可疑的长符合链接：%s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s：无法创建目录 %s：%s\n"
@@ -845,6 +841,11 @@ msgstr "%s：“%s”包含非 ASCII 字符\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s：“%s”包含非法字符\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s：“%s”不是有效的组名\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s：用户“%s”不存在\n"
@@ -1325,10 +1326,6 @@ msgstr "  -p, --password PASSWORD       将密码更改为(加密过的) PASSWOR
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s：无效的组名“%s”\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s：未知用户 %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1434,12 +1431,6 @@ msgstr "%s：无改变\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s：无法删除 %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "用法：id [-a]\n"
-
-msgid " groups="
-msgstr " 组="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr "  -b, --before DAYS             仅打印早于 DAYS 的最近登录记录\n"
@@ -1660,6 +1651,11 @@ msgstr "无效的密码。\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s：fork 失败：%s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s：“%s”不是有效的组名\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s：GID“%lu”不存在\n"
@@ -1700,6 +1696,10 @@ msgstr "%s：无效的用户 ID“%s”\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s：无效的用户名“%s”: 使用 --badname 忽略\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s：无效的用户名“%s”\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -1951,6 +1951,11 @@ msgstr "重复的用户条目"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "无效的用户名'%s'：使用 --badname 忽略\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s：无效的用户名“%s”\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "无效的用户 ID“%lu”\n"
@@ -2162,14 +2167,15 @@ msgstr "正在进入系统维护模式"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s：%s 已经创建，但是不能删除\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%s：%s 配置(位于 %s) 将被忽略\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%s：%s 配置(位于 %s) 将被忽略\n"
 
@@ -2807,22 +2813,24 @@ msgstr "改变信箱所有者失败"
 msgid "failed to rename mailbox"
 msgstr "信箱改名失败"
 
-#, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%1$s：从“%4$s”移除 UID 范围 %2$lu~%3$lu 失败\n"
 
 #, fuzzy, c-format
 #| msgid "%s: failed to add uid range %lu-%lu from '%s'\n"
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%1$s：向“%4$s”添加 UID 范围 %2$lu~%3$lu 失败\n"
 
-#, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%1$s：从“%4$s”移除 GID 范围 %2$lu~%3$lu 失败\n"
 
 #, fuzzy, c-format
 #| msgid "%s: failed to add gid range %lu-%lu from '%s'\n"
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%1$s：向“%4$s”添加 GID 范围 %2$lu~%3$lu 失败\n"
 
 #, c-format
@@ -2916,6 +2924,10 @@ msgstr "%s：无法为“%s”找到 tcb 目录\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "环境溢出\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s：可疑的长符合链接：%s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s：不能在 NIS 客户端上修改用户“%s”。\n"
@@ -2936,6 +2948,16 @@ msgstr "%s：无法为“%s”找到 tcb 目录\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s：%s 组是一个 NIS 组\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s：未知用户 %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "用法：id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " 组="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r 主机\n"
@@ -2977,10 +2999,6 @@ msgstr "%s：无法为“%s”找到 tcb 目录\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "上次登录：%.19s 在 %s 上"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s：无效的用户名“%s”\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s：密码过期信息已更改。\n"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 2d3fcd42..f8f10f83 100644
Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e2b020d4..fece60dd 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.9\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2024-06-18 16:40-0500\n"
+"POT-Creation-Date: 2024-12-05 23:57-0600\n"
 "PO-Revision-Date: 2022-07-27 23:04+0800\n"
 "Last-Translator: Celeste Liu <coelacanthus@outlook.com>\n"
 "Language-Team: Chinese <chinese-l10n@googlegroups.com>\n"
@@ -527,10 +527,6 @@ msgstr "%s：%s 既不是目錄，也不是符號連結。\n"
 msgid "%s: Cannot read symbolic link %s: %s\n"
 msgstr "%s：無法讀取 %s 符號連結：%s\n"
 
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s：符號連結過長：%s\n"
-
 #, c-format
 msgid "%s: Cannot create directory %s: %s\n"
 msgstr "%s：無法建立 %s 目錄：%s\n"
@@ -862,6 +858,11 @@ msgstr "%s：「%s」有非 ASCII 字元\n"
 msgid "%s: '%s' contains illegal characters\n"
 msgstr "%s：「%s」包含無效字元\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: Provided user name is not a valid name\n"
+msgstr "%s：「%s」非有效群組名稱\n"
+
 #, c-format
 msgid "%s: user '%s' does not exist\n"
 msgstr "%s：使用者「%s」不存在\n"
@@ -1359,10 +1360,6 @@ msgstr "  -p, --password 密碼          將密碼變更成此（已加密）<
 msgid "%s: invalid group name '%s'\n"
 msgstr "%s：群組名稱「%s」無效\n"
 
-#, c-format
-msgid "%s: unknown user %s\n"
-msgstr "%s：未知使用者 %s\n"
-
 #, c-format
 msgid ""
 "Usage: %s [options] [group [gshadow]]\n"
@@ -1471,12 +1468,6 @@ msgstr "%s：無改變\n"
 msgid "%s: cannot delete %s\n"
 msgstr "%s：無法刪除 %s\n"
 
-msgid "Usage: id [-a]\n"
-msgstr "用法：id [-a]\n"
-
-msgid " groups="
-msgstr " 群組="
-
 msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr "  -b, --before DAYS             僅輸出舊於 DAYS 天的 lastlog 記錄\n"
@@ -1708,6 +1699,11 @@ msgstr "密碼無效。\n"
 msgid "%s: failure forking: %s\n"
 msgstr "%s：fork 失敗：%s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: '%s' is not a valid group name\n"
+msgid "%s: provided group is not a valid group name\n"
+msgstr "%s：「%s」非有效群組名稱\n"
+
 #, c-format
 msgid "%s: GID '%lu' does not exist\n"
 msgstr "%s：「%lu」群組 ID 不存在\n"
@@ -1751,6 +1747,10 @@ msgstr "%s：使用者 ID「%s」無效\n"
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
 msgstr "%s：無效使用者名稱「%s」\n"
 
+#, c-format
+msgid "%s: invalid user name '%s'\n"
+msgstr "%s：無效使用者名稱「%s」\n"
+
 #, c-format
 msgid "%s: Provide '--crypt-method' before number of rounds\n"
 msgstr ""
@@ -2004,6 +2004,11 @@ msgstr "重復的密碼項目"
 msgid "invalid user name '%s': use --badname to ignore\n"
 msgstr "%s：無效使用者名稱「%s」\n"
 
+#, fuzzy, c-format
+#| msgid "%s: invalid user name '%s'\n"
+msgid "invalid user name '%s'\n"
+msgstr "%s：無效使用者名稱「%s」\n"
+
 #, c-format
 msgid "invalid user ID '%lu'\n"
 msgstr "使用者 ID '%lu' 無效\n"
@@ -2219,14 +2224,15 @@ msgstr "正在進入系統維護模式"
 msgid "%s: %s was created, but could not be removed\n"
 msgstr "%s: %s 已經建立，但是無法移除\n"
 
-#, c-format
-msgid "%s: the %s configuration in %s will be ignored\n"
+#, fuzzy, c-format
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid "%s: the %s= configuration in %s will be ignored\n"
 msgstr "%1$s: 會忽略 %3$s 中的 %2$s 組態設定檔\n"
 
 #, fuzzy, c-format
 #| msgid "%s: the %s configuration in %s will be ignored\n"
 msgid ""
-"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"%s: the '%s=' configuration in %s has an invalid group, ignoring the bad "
 "group\n"
 msgstr "%1$s: 會忽略 %3$s 中的 %2$s 組態設定檔\n"
 
@@ -2888,20 +2894,24 @@ msgstr "改變信箱所有者失敗"
 msgid "failed to rename mailbox"
 msgstr "無法為信箱改名"
 
-#, c-format
-msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove uid range %ju-%ju from '%s'\n"
 msgstr "%1$s：無法從「%4$s」移除 UID 範圍 %2$lu-%3$lu\n"
 
-#, c-format
-msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add uid range %ju-%ju to '%s'\n"
 msgstr "%s：無法新增 UID 範圍 %lu-%lu 至「%s」\n"
 
-#, c-format
-msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to remove gid range %ju-%ju from '%s'\n"
 msgstr "%1$s：無法從「%4$s」移除 GID 範圍 %2$lu-%3$lu\n"
 
-#, c-format
-msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+#, fuzzy, c-format
+#| msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgid "%s: failed to add gid range %ju-%ju to '%s'\n"
 msgstr "%s：無法新增 GID 範圍 %lu-%lu 至「%s」\n"
 
 #, c-format
@@ -2995,6 +3005,10 @@ msgstr "%s：找不到 %s 的 tcb 目錄\n"
 #~ msgid "Environment overflow\n"
 #~ msgstr "環境溢位\n"
 
+#, c-format
+#~ msgid "%s: Suspiciously long symlink: %s\n"
+#~ msgstr "%s：符號連結過長：%s\n"
+
 #, c-format
 #~ msgid "%s: cannot change user '%s' on NIS client.\n"
 #~ msgstr "%s：無法在 NIS 客戶端變更使用者「%s」。\n"
@@ -3015,6 +3029,16 @@ msgstr "%s：找不到 %s 的 tcb 目錄\n"
 #~ msgid "%s: group %s is a NIS group\n"
 #~ msgstr "%s：%s 群組是 NIS 群組\n"
 
+#, c-format
+#~ msgid "%s: unknown user %s\n"
+#~ msgstr "%s：未知使用者 %s\n"
+
+#~ msgid "Usage: id [-a]\n"
+#~ msgstr "用法：id [-a]\n"
+
+#~ msgid " groups="
+#~ msgstr " 群組="
+
 #, c-format
 #~ msgid "       %s [-p] -r host\n"
 #~ msgstr "       %s [-p] -r 主機\n"
@@ -3052,10 +3076,6 @@ msgstr "%s：找不到 %s 的 tcb 目錄\n"
 #~ msgid "Last login: %.19s on %s"
 #~ msgstr "上次登入：%.19s 在 %s 上"
 
-#, c-format
-#~ msgid "%s: invalid user name '%s'\n"
-#~ msgstr "%s：無效使用者名稱「%s」\n"
-
 #, c-format
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s：已變更密碼過期資訊。\n"
diff --git a/src/Makefile.am b/src/Makefile.am
index b6cb09ef..d4e6f3ab 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,7 @@ AM_CFLAGS = $(LIBBSD_CFLAGS)
 # and installation would be much simpler (just two directories,
 # $prefix/bin and $prefix/sbin, no install-data hacks...)
 
-bin_PROGRAMS   = groups login
+bin_PROGRAMS   = login
 sbin_PROGRAMS  = nologin
 ubin_PROGRAMS  = faillog chage chfn chsh expiry gpasswd newgrp passwd
 if ENABLE_SUBIDS
@@ -58,8 +58,8 @@ usbin_PROGRAMS = \
 	usermod \
 	vipw
 
-# id and groups are from gnu, sulogin from sysvinit
-noinst_PROGRAMS = id sulogin
+# sulogin from sysvinit
+noinst_PROGRAMS = sulogin
 
 suidusbins     =
 suidbins       =
diff --git a/src/Makefile.in b/src/Makefile.in
index 9f26971e..36be81bd 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -88,8 +88,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = groups$(EXEEXT) login$(EXEEXT) $(am__EXEEXT_1) \
-	$(am__EXEEXT_2)
+bin_PROGRAMS = login$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2)
 sbin_PROGRAMS = nologin$(EXEEXT)
 ubin_PROGRAMS = faillog$(EXEEXT) chage$(EXEEXT) chfn$(EXEEXT) \
 	chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) newgrp$(EXEEXT) \
@@ -104,7 +103,7 @@ usbin_PROGRAMS = chgpasswd$(EXEEXT) chpasswd$(EXEEXT) \
 	pwck$(EXEEXT) pwconv$(EXEEXT) pwunconv$(EXEEXT) \
 	useradd$(EXEEXT) userdel$(EXEEXT) usermod$(EXEEXT) \
 	vipw$(EXEEXT)
-noinst_PROGRAMS = id$(EXEEXT) sulogin$(EXEEXT) $(am__EXEEXT_3)
+noinst_PROGRAMS = sulogin$(EXEEXT) $(am__EXEEXT_3)
 @WITH_SU_TRUE@am__append_4 = su
 @WITH_TCB_FALSE@am__append_5 = passwd
 @ACCT_TOOLS_SETUID_TRUE@am__append_6 = chgpasswd chpasswd groupadd groupdel groupmod newusers useradd userdel usermod
@@ -250,11 +249,6 @@ groupmod_OBJECTS = groupmod.$(OBJEXT)
 groupmod_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-groups_SOURCES = groups.c
-groups_OBJECTS = groups.$(OBJEXT)
-groups_LDADD = $(LDADD)
-groups_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/lib/libshadow.la $(am__DEPENDENCIES_1)
 grpck_SOURCES = grpck.c
 grpck_OBJECTS = grpck.$(OBJEXT)
 grpck_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
@@ -267,11 +261,6 @@ grpunconv_SOURCES = grpunconv.c
 grpunconv_OBJECTS = grpunconv.$(OBJEXT)
 grpunconv_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-id_SOURCES = id.c
-id_OBJECTS = id.$(OBJEXT)
-id_LDADD = $(LDADD)
-id_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(top_builddir)/lib/libshadow.la $(am__DEPENDENCIES_1)
 lastlog_SOURCES = lastlog.c
 lastlog_OBJECTS = lastlog.$(OBJEXT)
 lastlog_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
@@ -386,10 +375,10 @@ am__depfiles_remade = ./$(DEPDIR)/chage.Po \
 	./$(DEPDIR)/getsubids-getsubids.Po ./$(DEPDIR)/gpasswd.Po \
 	./$(DEPDIR)/groupadd.Po ./$(DEPDIR)/groupdel.Po \
 	./$(DEPDIR)/groupmems.Po ./$(DEPDIR)/groupmod.Po \
-	./$(DEPDIR)/groups.Po ./$(DEPDIR)/grpck.Po \
-	./$(DEPDIR)/grpconv.Po ./$(DEPDIR)/grpunconv.Po \
-	./$(DEPDIR)/id.Po ./$(DEPDIR)/lastlog.Po ./$(DEPDIR)/login.Po \
-	./$(DEPDIR)/login_nopam.Po ./$(DEPDIR)/logoutd.Po \
+	./$(DEPDIR)/grpck.Po ./$(DEPDIR)/grpconv.Po \
+	./$(DEPDIR)/grpunconv.Po ./$(DEPDIR)/lastlog.Po \
+	./$(DEPDIR)/login.Po ./$(DEPDIR)/login_nopam.Po \
+	./$(DEPDIR)/logoutd.Po \
 	./$(DEPDIR)/new_subid_range-new_subid_range.Po \
 	./$(DEPDIR)/newgidmap.Po ./$(DEPDIR)/newgrp.Po \
 	./$(DEPDIR)/newuidmap.Po ./$(DEPDIR)/newusers.Po \
@@ -421,18 +410,18 @@ am__v_CCLD_1 =
 SOURCES = chage.c check_subid_range.c chfn.c chgpasswd.c chpasswd.c \
 	chsh.c expiry.c faillog.c free_subid_range.c \
 	get_subid_owners.c getsubids.c gpasswd.c groupadd.c groupdel.c \
-	groupmems.c groupmod.c groups.c grpck.c grpconv.c grpunconv.c \
-	id.c lastlog.c $(login_SOURCES) logoutd.c new_subid_range.c \
-	newgidmap.c newgrp.c newuidmap.c newusers.c nologin.c passwd.c \
-	pwck.c pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c \
+	groupmems.c groupmod.c grpck.c grpconv.c grpunconv.c lastlog.c \
+	$(login_SOURCES) logoutd.c new_subid_range.c newgidmap.c \
+	newgrp.c newuidmap.c newusers.c nologin.c passwd.c pwck.c \
+	pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c \
 	userdel.c usermod.c vipw.c
 DIST_SOURCES = chage.c check_subid_range.c chfn.c chgpasswd.c \
 	chpasswd.c chsh.c expiry.c faillog.c free_subid_range.c \
 	get_subid_owners.c getsubids.c gpasswd.c groupadd.c groupdel.c \
-	groupmems.c groupmod.c groups.c grpck.c grpconv.c grpunconv.c \
-	id.c lastlog.c $(login_SOURCES) logoutd.c new_subid_range.c \
-	newgidmap.c newgrp.c newuidmap.c newusers.c nologin.c passwd.c \
-	pwck.c pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c \
+	groupmems.c groupmod.c grpck.c grpconv.c grpunconv.c lastlog.c \
+	$(login_SOURCES) logoutd.c new_subid_range.c newgidmap.c \
+	newgrp.c newuidmap.c newusers.c nologin.c passwd.c pwck.c \
+	pwconv.c pwunconv.c $(su_SOURCES) sulogin.c useradd.c \
 	userdel.c usermod.c vipw.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -1063,10 +1052,6 @@ groupmod$(EXEEXT): $(groupmod_OBJECTS) $(groupmod_DEPENDENCIES) $(EXTRA_groupmod
 	@rm -f groupmod$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(groupmod_OBJECTS) $(groupmod_LDADD) $(LIBS)
 
-groups$(EXEEXT): $(groups_OBJECTS) $(groups_DEPENDENCIES) $(EXTRA_groups_DEPENDENCIES) 
-	@rm -f groups$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(groups_OBJECTS) $(groups_LDADD) $(LIBS)
-
 grpck$(EXEEXT): $(grpck_OBJECTS) $(grpck_DEPENDENCIES) $(EXTRA_grpck_DEPENDENCIES) 
 	@rm -f grpck$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(grpck_OBJECTS) $(grpck_LDADD) $(LIBS)
@@ -1079,10 +1064,6 @@ grpunconv$(EXEEXT): $(grpunconv_OBJECTS) $(grpunconv_DEPENDENCIES) $(EXTRA_grpun
 	@rm -f grpunconv$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(grpunconv_OBJECTS) $(grpunconv_LDADD) $(LIBS)
 
-id$(EXEEXT): $(id_OBJECTS) $(id_DEPENDENCIES) $(EXTRA_id_DEPENDENCIES) 
-	@rm -f id$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(id_OBJECTS) $(id_LDADD) $(LIBS)
-
 lastlog$(EXEEXT): $(lastlog_OBJECTS) $(lastlog_DEPENDENCIES) $(EXTRA_lastlog_DEPENDENCIES) 
 	@rm -f lastlog$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(lastlog_OBJECTS) $(lastlog_LDADD) $(LIBS)
@@ -1181,11 +1162,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groupdel.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groupmems.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groupmod.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/groups.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grpck.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grpconv.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grpunconv.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lastlog.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/login.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/login_nopam.Po@am__quote@ # am--include-marker
@@ -1455,11 +1434,9 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/groupdel.Po
 	-rm -f ./$(DEPDIR)/groupmems.Po
 	-rm -f ./$(DEPDIR)/groupmod.Po
-	-rm -f ./$(DEPDIR)/groups.Po
 	-rm -f ./$(DEPDIR)/grpck.Po
 	-rm -f ./$(DEPDIR)/grpconv.Po
 	-rm -f ./$(DEPDIR)/grpunconv.Po
-	-rm -f ./$(DEPDIR)/id.Po
 	-rm -f ./$(DEPDIR)/lastlog.Po
 	-rm -f ./$(DEPDIR)/login.Po
 	-rm -f ./$(DEPDIR)/login_nopam.Po
@@ -1542,11 +1519,9 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/groupdel.Po
 	-rm -f ./$(DEPDIR)/groupmems.Po
 	-rm -f ./$(DEPDIR)/groupmod.Po
-	-rm -f ./$(DEPDIR)/groups.Po
 	-rm -f ./$(DEPDIR)/grpck.Po
 	-rm -f ./$(DEPDIR)/grpconv.Po
 	-rm -f ./$(DEPDIR)/grpunconv.Po
-	-rm -f ./$(DEPDIR)/id.Po
 	-rm -f ./$(DEPDIR)/lastlog.Po
 	-rm -f ./$(DEPDIR)/login.Po
 	-rm -f ./$(DEPDIR)/login_nopam.Po
diff --git a/src/chage.c b/src/chage.c
index 1edab47f..a7933e0d 100644
--- a/src/chage.c
+++ b/src/chage.c
@@ -26,17 +26,18 @@
 #endif				/* ACCT_TOOLS_SETUID */
 #include <pwd.h>
 
-#include "alloc.h"
-#include "atoi/str2i.h"
+#include "atoi/a2i/a2s.h"
 #include "defines.h"
-#include "memzero.h"
 #include "prototypes.h"
 #include "pwio.h"
 #include "shadowio.h"
 #include "shadowlog.h"
-#include "string/sprintf.h"
+#include "string/memset/memzero.h"
+#include "string/sprintf/snprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strcpy/strtcpy.h"
+#include "string/strdup/xstrdup.h"
 #include "string/strftime.h"
-#include "string/strtcpy.h"
 #include "time/day_to_str.h"
 /*@-exitarg@*/
 #include "exitcodes.h"
@@ -171,17 +172,13 @@ static int new_fields (void)
 
 	SNPRINTF(buf, "%ld", mindays);
 	change_field (buf, sizeof buf, _("Minimum Password Age"));
-	if (   (str2sl(&mindays, buf) == -1)
-	    || (mindays < -1)) {
+	if (a2sl(&mindays, buf, NULL, 0, -1, LONG_MAX) == -1)
 		return 0;
-	}
 
 	SNPRINTF(buf, "%ld", maxdays);
 	change_field (buf, sizeof buf, _("Maximum Password Age"));
-	if (   (str2sl(&maxdays, buf) == -1)
-	    || (maxdays < -1)) {
+	if (a2sl(&maxdays, buf, NULL, 0, -1, LONG_MAX) == -1)
 		return 0;
-	}
 
 	if (-1 == lstchgdate || lstchgdate > LONG_MAX / DAY)
 		strcpy(buf, "-1");
@@ -190,7 +187,7 @@ static int new_fields (void)
 
 	change_field (buf, sizeof buf, _("Last Password Change (YYYY-MM-DD)"));
 
-	if (strcmp (buf, "-1") == 0) {
+	if (streq(buf, "-1")) {
 		lstchgdate = -1;
 	} else {
 		lstchgdate = strtoday (buf);
@@ -201,17 +198,13 @@ static int new_fields (void)
 
 	SNPRINTF(buf, "%ld", warndays);
 	change_field (buf, sizeof buf, _("Password Expiration Warning"));
-	if (   (str2sl(&warndays, buf) == -1)
-	    || (warndays < -1)) {
+	if (a2sl(&warndays, buf, NULL, 0, -1, LONG_MAX) == -1)
 		return 0;
-	}
 
 	SNPRINTF(buf, "%ld", inactdays);
 	change_field (buf, sizeof buf, _("Password Inactive"));
-	if (   (str2sl(&inactdays, buf) == -1)
-	    || (inactdays < -1)) {
+	if (a2sl(&inactdays, buf, NULL, 0, -1, LONG_MAX) == -1)
 		return 0;
-	}
 
 	if (-1 == expdate || LONG_MAX / DAY < expdate)
 		strcpy(buf, "-1");
@@ -221,7 +214,7 @@ static int new_fields (void)
 	change_field (buf, sizeof buf,
 	              _("Account Expiration Date (YYYY-MM-DD)"));
 
-	if (strcmp (buf, "-1") == 0) {
+	if (streq(buf, "-1")) {
 		expdate = -1;
 	} else {
 		expdate = strtoday (buf);
@@ -250,12 +243,16 @@ print_day_as_date(long day)
 		return;
 	}
 
-	if (gmtime_r(&date, &tm) == NULL) {
-		(void) printf ("time_t: %lu\n", (unsigned long)date);
+	if (localtime_r(&date, &tm) == NULL) {
+		puts(_("future"));
+		return;
+	}
+
+	if (STRFTIME(buf, iflg ? "%F" : "%b %d, %Y", &tm) == 0) {
+		puts(_("future"));
 		return;
 	}
 
-	STRFTIME(buf, iflg ? "%Y-%m-%d" : "%b %d, %Y", &tm);
 	(void) puts (buf);
 }
 
@@ -397,8 +394,7 @@ static void process_flags (int argc, char **argv)
 			break;
 		case 'I':
 			Iflg = true;
-			if (   (str2sl(&inactdays, optarg) == -1)
-			    || (inactdays < -1)) {
+			if (a2sl(&inactdays, optarg, NULL, 0, -1, LONG_MAX) == -1) {
 				fprintf (stderr,
 				         _("%s: invalid numeric argument '%s'\n"),
 				         Prog, optarg);
@@ -410,8 +406,7 @@ static void process_flags (int argc, char **argv)
 			break;
 		case 'm':
 			mflg = true;
-			if (   (str2sl(&mindays, optarg) == -1)
-			    || (mindays < -1)) {
+			if (a2sl(&mindays, optarg, NULL, 0, -1, LONG_MAX) == -1) {
 				fprintf (stderr,
 				         _("%s: invalid numeric argument '%s'\n"),
 				         Prog, optarg);
@@ -420,8 +415,7 @@ static void process_flags (int argc, char **argv)
 			break;
 		case 'M':
 			Mflg = true;
-			if (   (str2sl(&maxdays, optarg) == -1)
-			    || (maxdays < -1)) {
+			if (a2sl(&maxdays, optarg, NULL, 0, -1, LONG_MAX) == -1) {
 				fprintf (stderr,
 				         _("%s: invalid numeric argument '%s'\n"),
 				         Prog, optarg);
@@ -434,8 +428,7 @@ static void process_flags (int argc, char **argv)
 			break;
 		case 'W':
 			Wflg = true;
-			if (   (str2sl(&warndays, optarg) == -1)
-			    || (warndays < -1)) {
+			if (a2sl(&warndays, optarg, NULL, 0, -1, LONG_MAX) == -1) {
 				fprintf (stderr,
 				         _("%s: invalid numeric argument '%s'\n"),
 				         Prog, optarg);
@@ -574,7 +567,7 @@ static void open_files (bool readonly)
 	/*
 	 * For shadow password files we have to lock the file and read in
 	 * the entries as was done for the password file. The user entries
-	 * does not have to exist in this case; a new entry will be created
+	 * do not have to exist in this case; a new entry will be created
 	 * for this user if one does not exist already.
 	 */
 	if (!readonly) {
diff --git a/src/check_subid_range.c b/src/check_subid_range.c
index 68266f55..48226758 100644
--- a/src/check_subid_range.c
+++ b/src/check_subid_range.c
@@ -6,27 +6,32 @@
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
-#include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "atoi/str2i.h"
+#include "atoi/getnum.h"
+#include "atoi/str2i/str2u.h"
 #include "defines.h"
 #include "prototypes.h"
 #include "subordinateio.h"
 #include "idmapping.h"
 #include "shadowlog.h"
 
+
 static const char Prog[] = "check_subid_range";
 
-int main(int argc, char **argv)
+
+int
+main(int argc, char **argv)
 {
-	char *owner;
-	unsigned long start, count;
-	bool check_uids;
+	bool           check_uids;
+	char           *owner;
+	uid_t          start;
+	unsigned long  count;
+
 	log_set_progname(Prog);
 	log_set_logfd(stderr);
 
@@ -35,8 +40,7 @@ int main(int argc, char **argv)
 
 	owner = argv[1];
 	check_uids = argv[2][0] == 'u';
-	errno = 0;
-	if (str2ul(&start, argv[3]) == -1)
+	if (get_uid(argv[3], &start) == -1)
 		exit(1);
 	if (str2ul(&count, argv[4]) == -1)
 		exit(1);
diff --git a/src/chfn.c b/src/chfn.c
index 9043212a..2bb24638 100644
--- a/src/chfn.c
+++ b/src/chfn.c
@@ -18,22 +18,24 @@
 #include <sys/types.h>
 #include <getopt.h>
 
-#include "alloc.h"
+#include "chkname.h"
 #include "defines.h"
+/*@-exitarg@*/
+#include "exitcodes.h"
 #include "getdef.h"
 #include "nscd.h"
-#include "sssd.h"
 #ifdef USE_PAM
 #include "pam_defs.h"
 #endif
 #include "prototypes.h"
 #include "pwauth.h"
 #include "pwio.h"
-/*@-exitarg@*/
-#include "exitcodes.h"
 #include "shadowlog.h"
-#include "string/sprintf.h"
-#include "string/strtcpy.h"
+#include "sssd.h"
+#include "string/sprintf/snprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strcpy/strtcpy.h"
+#include "string/strdup/xstrdup.h"
 
 
 /*
@@ -150,9 +152,9 @@ static bool may_change_field (int field)
 	cp = getdef_str ("CHFN_RESTRICT");
 	if (NULL == cp) {
 		cp = "";
-	} else if (strcmp (cp, "yes") == 0) {
+	} else if (streq(cp, "yes")) {
 		cp = "rwh";
-	} else if (strcmp (cp, "no") == 0) {
+	} else if (streq(cp, "no")) {
 		cp = "frwh";
 	}
 
@@ -214,32 +216,27 @@ static void new_fields (void)
  */
 static char *copy_field (char *in, char *out, char *extra)
 {
-	char *cp = NULL;
-
 	while (NULL != in) {
-		cp = strchr (in, ',');
-		if (NULL != cp) {
-			*cp++ = '\0';
-		}
+		char  *f;
 
-		if (strchr (in, '=') == NULL) {
+		f = strsep(&in, ",");
+
+		if (strchr(f, '=') == NULL)
 			break;
-		}
 
 		if (NULL != extra) {
 			if ('\0' != extra[0]) {
 				strcat (extra, ",");
 			}
 
-			strcat (extra, in);
+			strcat(extra, f);
 		}
-		in = cp;
 	}
 	if ((NULL != in) && (NULL != out)) {
 		strcpy (out, in);
 	}
 
-	return cp;
+	return in;
 }
 
 /*
@@ -648,6 +645,10 @@ int main (int argc, char **argv)
 	 * name, or the name getlogin() returns.
 	 */
 	if (optind < argc) {
+		if (!is_valid_user_name (argv[optind])) {
+			fprintf (stderr, _("%s: Provided user name is not a valid name\n"), Prog);
+			fail_exit (E_NOPERM);
+		}
 		user = argv[optind];
 		pw = xgetpwnam (user);
 		if (NULL == pw) {
diff --git a/src/chgpasswd.c b/src/chgpasswd.c
index 1ff6776b..2d50337e 100644
--- a/src/chgpasswd.c
+++ b/src/chgpasswd.c
@@ -22,7 +22,7 @@
 #include "pam_defs.h"
 #endif				/* USE_PAM */
 #endif				/* ACCT_TOOLS_SETUID */
-#include "atoi/str2i.h"
+#include "atoi/str2i/str2s.h"
 #include "defines.h"
 #include "nscd.h"
 #include "sssd.h"
@@ -34,6 +34,8 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
+#include "string/strcmp/streq.h"
+#include "string/strtok/stpsep.h"
 
 
 /*
@@ -197,19 +199,19 @@ static void process_flags (int argc, char **argv)
 				usage (E_USAGE);
 			}
 #if defined(USE_SHA_CRYPT)
-			if (  (   ((0 == strcmp (crypt_method, "SHA256")) || (0 == strcmp (crypt_method, "SHA512")))
+			if (  (   (streq(crypt_method, "SHA256") || streq(crypt_method, "SHA512"))
 			       && (-1 == str2sl(&sha_rounds, optarg)))) {
                             bad_s = 1;
                         }
 #endif				/* USE_SHA_CRYPT */
 #if defined(USE_BCRYPT)
-                        if ((   (0 == strcmp (crypt_method, "BCRYPT"))
+                        if ((   streq(crypt_method, "BCRYPT")
 			       && (-1 == str2sl(&bcrypt_rounds, optarg)))) {
                             bad_s = 1;
                         }
 #endif				/* USE_BCRYPT */
 #if defined(USE_YESCRYPT)
-                        if ((   (0 == strcmp (crypt_method, "YESCRYPT"))
+                        if ((   streq(crypt_method, "YESCRYPT")
 			       && (-1 == str2sl(&yescrypt_cost, optarg)))) {
                             bad_s = 1;
                         }
@@ -258,18 +260,18 @@ static void check_flags (void)
 	}
 
 	if (cflg) {
-		if (   (0 != strcmp (crypt_method, "DES"))
-		    && (0 != strcmp (crypt_method, "MD5"))
-		    && (0 != strcmp (crypt_method, "NONE"))
+		if (   !streq(crypt_method, "DES")
+		    && !streq(crypt_method, "MD5")
+		    && !streq(crypt_method, "NONE")
 #ifdef USE_SHA_CRYPT
-		    && (0 != strcmp (crypt_method, "SHA256"))
-		    && (0 != strcmp (crypt_method, "SHA512"))
+		    && !streq(crypt_method, "SHA256")
+		    && !streq(crypt_method, "SHA512")
 #endif				/* USE_SHA_CRYPT */
 #ifdef USE_BCRYPT
-		    && (0 != strcmp (crypt_method, "BCRYPT"))
+		    && !streq(crypt_method, "BCRYPT")
 #endif				/* USE_BCRYPT */
 #ifdef USE_YESCRYPT
-		    && (0 != strcmp (crypt_method, "YESCRYPT"))
+		    && !streq(crypt_method, "YESCRYPT")
 #endif				/* USE_YESCRYPT */
 		    ) {
 			fprintf (stderr,
@@ -460,10 +462,7 @@ int main (int argc, char **argv)
 	 */
 	while (fgets (buf, (int) sizeof buf, stdin) != NULL) {
 		line++;
-		cp = strrchr (buf, '\n');
-		if (NULL != cp) {
-			*cp = '\0';
-		} else {
+		if (stpsep(buf, "\n") == NULL) {
 			fprintf (stderr, _("%s: line %d: line too long\n"),
 			         Prog, line);
 			errors++;
@@ -480,11 +479,8 @@ int main (int argc, char **argv)
 		 */
 
 		name = buf;
-		cp = strchr (name, ':');
-		if (NULL != cp) {
-			*cp = '\0';
-			cp++;
-		} else {
+		cp = stpsep(name, ":");
+		if (cp == NULL) {
 			fprintf (stderr,
 			         _("%s: line %d: missing new password\n"),
 			         Prog, line);
@@ -494,7 +490,7 @@ int main (int argc, char **argv)
 		newpwd = cp;
 		if (   (!eflg)
 		    && (   (NULL == crypt_method)
-		        || (0 != strcmp (crypt_method, "NONE")))) {
+		        || !streq(crypt_method, "NONE"))) {
 			void *arg = NULL;
 			const char *salt;
 			if (md5flg) {
@@ -503,18 +499,18 @@ int main (int argc, char **argv)
 #if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT)
 			if (sflg) {
 #if defined(USE_SHA_CRYPT)
-				if (   (0 == strcmp (crypt_method, "SHA256"))
-					|| (0 == strcmp (crypt_method, "SHA512"))) {
+				if (   streq(crypt_method, "SHA256")
+					|| streq(crypt_method, "SHA512")) {
 					arg = &sha_rounds;
 				}
 #endif				/* USE_SHA_CRYPT */
 #if defined(USE_BCRYPT)
-				if (0 == strcmp (crypt_method, "BCRYPT")) {
+				if (streq(crypt_method, "BCRYPT")) {
 					arg = &bcrypt_rounds;
 				}
 #endif				/* USE_BCRYPT */
 #if defined(USE_YESCRYPT)
-				if (0 == strcmp (crypt_method, "YESCRYPT")) {
+				if (streq(crypt_method, "YESCRYPT")) {
 					arg = &yescrypt_cost;
 				}
 #endif				/* USE_YESCRYPT */
@@ -553,8 +549,8 @@ int main (int argc, char **argv)
 			sg = sgr_locate (name);
 
 			if (   (NULL == sg)
-			    && (strcmp (gr->gr_passwd,
-			                SHADOW_PASSWD_STRING) == 0)) {
+			    && streq(gr->gr_passwd, SHADOW_PASSWD_STRING))
+			{
 				static char *empty = NULL;
 				/* If the password is set to 'x' in
 				 * group, but there are no entries in
@@ -581,7 +577,7 @@ int main (int argc, char **argv)
 			newsg.sg_passwd = cp;
 		}
 		if (   (NULL == sg)
-		    || (strcmp (gr->gr_passwd, SHADOW_PASSWD_STRING) != 0))
+		    || !streq(gr->gr_passwd, SHADOW_PASSWD_STRING))
 #endif
 		{
 			newgr = *gr;
@@ -604,7 +600,7 @@ int main (int argc, char **argv)
 			}
 		}
 		if (   (NULL == sg)
-		    || (strcmp (gr->gr_passwd, SHADOW_PASSWD_STRING) != 0))
+		    || !streq(gr->gr_passwd, SHADOW_PASSWD_STRING))
 #endif
 		{
 			if (gr_update (&newgr) == 0) {
diff --git a/src/chpasswd.c b/src/chpasswd.c
index 79880f56..dfe50740 100644
--- a/src/chpasswd.c
+++ b/src/chpasswd.c
@@ -20,7 +20,7 @@
 #ifdef USE_PAM
 #include "pam_defs.h"
 #endif				/* USE_PAM */
-#include "atoi/str2i.h"
+#include "atoi/str2i/str2s.h"
 #include "defines.h"
 #include "nscd.h"
 #include "sssd.h"
@@ -31,9 +31,11 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
+#include "string/strcmp/streq.h"
+#include "string/strtok/stpsep.h"
 
 
-#define IS_CRYPT_METHOD(str) ((crypt_method != NULL && strcmp(crypt_method, str) == 0) ? true : false)
+#define IS_CRYPT_METHOD(str) ((crypt_method != NULL && streq(crypt_method, str)) ? true : false)
 
 /*
  * Global variables
@@ -501,12 +503,8 @@ int main (int argc, char **argv)
 	 */
 	while (fgets (buf, sizeof buf, stdin) != NULL) {
 		line++;
-		cp = strrchr (buf, '\n');
-		if (NULL != cp) {
-			*cp = '\0';
-		} else {
+		if (stpsep(buf, "\n") == NULL) {
 			if (feof (stdin) == 0) {
-
 				// Drop all remaining characters on this line.
 				while (fgets (buf, sizeof buf, stdin) != NULL) {
 					cp = strchr (buf, '\n');
@@ -533,11 +531,8 @@ int main (int argc, char **argv)
 		 */
 
 		name = buf;
-		cp = strchr (name, ':');
-		if (NULL != cp) {
-			*cp = '\0';
-			cp++;
-		} else {
+		cp = stpsep(name, ":");
+		if (cp == NULL) {
 			fprintf (stderr,
 			         _("%s: line %d: missing new password\n"),
 			         Prog, line);
@@ -594,8 +589,8 @@ int main (int argc, char **argv)
 			sp = spw_locate (name);
 
 			if (   (NULL == sp)
-			    && (strcmp (pw->pw_passwd,
-			                SHADOW_PASSWD_STRING) == 0)) {
+			    && streq(pw->pw_passwd, SHADOW_PASSWD_STRING))
+			{
 				/* If the password is set to 'x' in
 				 * passwd, but there are no entries in
 				 * shadow, create one.
@@ -632,7 +627,7 @@ int main (int argc, char **argv)
 		}
 
 		if (   (NULL == sp)
-		    || (strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING) != 0)) {
+		    || !streq(pw->pw_passwd, SHADOW_PASSWD_STRING)) {
 			newpw = *pw;
 			newpw.pw_passwd = cp;
 		}
@@ -652,7 +647,7 @@ int main (int argc, char **argv)
 			}
 		}
 		if (   (NULL == sp)
-		    || (strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING) != 0)) {
+		    || !streq(pw->pw_passwd, SHADOW_PASSWD_STRING)) {
 			if (pw_update (&newpw) == 0) {
 				fprintf (stderr,
 				         _("%s: line %d: failed to prepare the new %s entry '%s'\n"),
diff --git a/src/chsh.c b/src/chsh.c
index c4918c1b..15bfae32 100644
--- a/src/chsh.c
+++ b/src/chsh.c
@@ -17,21 +17,24 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "alloc.h"
+#include "chkname.h"
 #include "defines.h"
+/*@-exitarg@*/
+#include "exitcodes.h"
 #include "getdef.h"
 #include "nscd.h"
-#include "sssd.h"
 #include "prototypes.h"
 #include "pwauth.h"
 #include "pwio.h"
 #ifdef USE_PAM
 #include "pam_defs.h"
 #endif
-/*@-exitarg@*/
-#include "exitcodes.h"
 #include "shadowlog.h"
-#include "string/strtcpy.h"
+#include "sssd.h"
+#include "string/strcmp/streq.h"
+#include "string/strcpy/strtcpy.h"
+#include "string/strdup/xstrdup.h"
+
 
 #ifndef SHELLS_FILE
 #define SHELLS_FILE "/etc/shells"
@@ -43,6 +46,7 @@
 #define ETCDIR "/etc"
 #endif
 
+
 /*
  * Global variables
  */
@@ -176,7 +180,7 @@ static bool shell_is_listed (const char *sh)
 	}
 
 	for (size_t i = 0; i < size; i++) {
-		if (strcmp (keys[i], sh) == 0) {
+		if (streq(keys[i], sh)) {
 			found = true;
 			break;
 		}
@@ -197,7 +201,7 @@ static bool shell_is_listed (const char *sh)
 	char *cp;
 	setusershell ();
 	while ((cp = getusershell ())) {
-		if (strcmp (cp, sh) == 0) {
+		if (streq(cp, sh)) {
 			found = true;
 			break;
 		}
@@ -218,7 +222,7 @@ static bool shell_is_listed (const char *sh)
 			continue;
 		}
 
-		if (strcmp (buf, sh) == 0) {
+		if (streq(buf, sh)) {
 			found = true;
 			break;
 		}
@@ -498,6 +502,10 @@ int main (int argc, char **argv)
 	 * name, or the name getlogin() returns.
 	 */
 	if (optind < argc) {
+		if (!is_valid_user_name (argv[optind])) {
+			fprintf (stderr, _("%s: Provided user name is not a valid name\n"), Prog);
+			fail_exit (1);
+		}
 		user = argv[optind];
 		pw = xgetpwnam (user);
 		if (NULL == pw) {
diff --git a/src/faillog.c b/src/faillog.c
index 77c25b8a..709d741c 100644
--- a/src/faillog.c
+++ b/src/faillog.c
@@ -19,14 +19,14 @@
 #include <time.h>
 #include <assert.h>
 
-#include "atoi/str2i.h"
+#include "atoi/str2i/str2s.h"
 #include "defines.h"
 #include "faillog.h"
-#include "memzero.h"
 #include "prototypes.h"
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
+#include "string/memset/memzero.h"
 #include "string/strftime.h"
 
 
@@ -154,7 +154,7 @@ static void print_one (/*@null@*/const struct passwd *pw, bool force)
 		return;
 	}
 
-	(void) time(&now);
+	now = time(NULL);
 
 	/* Filter out entries that do not match with the -t option */
 	if (tflg && ((now - fl.fail_time) > seconds)) {
@@ -557,16 +557,12 @@ int main (int argc, char **argv)
 				break;
 			case 'm':
 			{
-				long  lmax;
-
-				if (   (str2sl(&lmax, optarg) == -1)
-				    || ((long)(short) lmax != lmax)) {
+				if (str2sh(&fail_max, optarg) == -1) {
 					fprintf (stderr,
 					         _("%s: invalid numeric argument '%s'\n"),
 					         Prog, optarg);
 					exit (E_BAD_ARG);
 				}
-				fail_max = lmax;
 				mflg = true;
 				break;
 			}
diff --git a/src/free_subid_range.c b/src/free_subid_range.c
index 441c2277..bff6f7b2 100644
--- a/src/free_subid_range.c
+++ b/src/free_subid_range.c
@@ -1,12 +1,16 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 
+
 #include <stdio.h>
 #include <unistd.h>
+
+#include "atoi/str2i/str2u.h"
 #include "subid.h"
 #include "stdlib.h"
 #include "prototypes.h"
 #include "shadowlog.h"
 
+
 /* Test program for the subid freeing routine */
 
 static const char Prog[] = "free_subid_range";
@@ -38,8 +42,8 @@ int main(int argc, char *argv[])
 	if (argc < 3)
 		usage();
 	range.owner = argv[0];
-	range.start = atoi(argv[1]);
-	range.count = atoi(argv[2]);
+	str2ul(&range.start, argv[1]);
+	str2ul(&range.count, argv[2]);
 	if (group)
 		ok = subid_ungrant_gid_range(&range);
 	else
diff --git a/src/get_subid_owners.c b/src/get_subid_owners.c
index e1c1e795..abb42ba8 100644
--- a/src/get_subid_owners.c
+++ b/src/get_subid_owners.c
@@ -1,13 +1,19 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 
+
 #include <stdio.h>
-#include "subid.h"
-#include "stdlib.h"
+
+#include "atoi/getnum.h"
 #include "prototypes.h"
 #include "shadowlog.h"
+#include "stdlib.h"
+#include "string/strcmp/streq.h"
+#include "subid.h"
+
 
 static const char Prog[] = "get_subid_owners";
 
+
 static void usage(void)
 {
 	fprintf(stderr, "Usage: [-g] %s subuid\n", Prog);
@@ -18,20 +24,24 @@ static void usage(void)
 
 int main(int argc, char *argv[])
 {
-	int i, n;
-	uid_t *uids;
+	int    i, n;
+	uid_t  u;
+	uid_t  *uids;
 
 	log_set_progname(Prog);
 	log_set_logfd(stderr);
 	if (argc < 2) {
 		usage();
 	}
-	if (argc == 3 && strcmp(argv[1], "-g") == 0)
-		n = subid_get_gid_owners(atoi(argv[2]), &uids);
-	else if (argc == 2 && strcmp(argv[1], "-h") == 0)
+	if (argc == 3 && streq(argv[1], "-g")) {
+		get_uid(argv[2], &u);
+		n = subid_get_gid_owners(u, &uids);
+	} else if (argc == 2 && streq(argv[1], "-h")) {
 		usage();
-	else
-		n = subid_get_uid_owners(atoi(argv[1]), &uids);
+	} else {
+		get_gid(argv[1], &u);
+		n = subid_get_uid_owners(u, &uids);
+	}
 	if (n < 0) {
 		fprintf(stderr, "No owners found\n");
 		exit(1);
diff --git a/src/getsubids.c b/src/getsubids.c
index 871e850f..739792e9 100644
--- a/src/getsubids.c
+++ b/src/getsubids.c
@@ -1,11 +1,13 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include "subid.h"
+#include <string.h>
+
 #include "prototypes.h"
 #include "shadowlog.h"
+#include "string/strcmp/streq.h"
+#include "subid.h"
 
 static const char Prog[] = "getsubids";
 
@@ -28,10 +30,10 @@ int main(int argc, char *argv[])
 	if (argc < 2)
 		usage();
 	owner = argv[1];
-	if (argc == 3 && strcmp(argv[1], "-g") == 0) {
+	if (argc == 3 && streq(argv[1], "-g")) {
 		owner = argv[2];
 		count = subid_get_gid_ranges(owner, &ranges);
-	} else if (argc == 2 && strcmp(argv[1], "-h") == 0) {
+	} else if (argc == 2 && streq(argv[1], "-h")) {
 		usage();
 	} else {
 		count = subid_get_uid_ranges(owner, &ranges);
diff --git a/src/gpasswd.c b/src/gpasswd.c
index de6b1c4c..d129aca2 100644
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -21,22 +21,24 @@
 #include <sys/types.h>
 
 #include "agetpass.h"
-#include "alloc.h"
+#include "alloc/x/xmalloc.h"
 #include "attr.h"
 #include "defines.h"
+/*@-exitarg@*/
+#include "exitcodes.h"
 #include "groupio.h"
-#include "memzero.h"
 #include "nscd.h"
-#include "sssd.h"
 #include "prototypes.h"
 #ifdef SHADOWGRP
 #include "sgroupio.h"
 #endif
-/*@-exitarg@*/
-#include "exitcodes.h"
 #include "shadowlog.h"
-#include "string/sprintf.h"
-#include "string/strtcpy.h"
+#include "sssd.h"
+#include "string/memset/memzero.h"
+#include "string/sprintf/snprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strcpy/strtcpy.h"
+#include "string/strdup/xstrdup.h"
 
 
 /*
@@ -172,33 +174,29 @@ static void catch_signals (int killed)
  */
 static bool is_valid_user_list (const char *users)
 {
-	const char *username;
-	char *end;
 	bool is_valid = true;
-	/*@owned@*/char *tmpusers = xstrdup (users);
+	char  *dup, *tmpusers;
 
-	for (username = tmpusers;
-	     (NULL != username) && ('\0' != *username);
-	     username = end) {
-		end = strchr (username, ',');
-		if (NULL != end) {
-			*end = '\0';
-			end++;
-		}
+	tmpusers = dup = xstrdup(users);
+
+	while (NULL != tmpusers && '\0' != *tmpusers) {
+		const char  *u;
+
+		u = strsep(&tmpusers, ",");
 
 		/*
 		 * This user must exist.
 		 */
 
 		/* local, no need for xgetpwnam */
-		if (getpwnam (username) == NULL) {
+		if (getpwnam(u) == NULL) {
 			fprintf (stderr, _("%s: user '%s' does not exist\n"),
-			         Prog, username);
+			         Prog, u);
 			is_valid = false;
 		}
 	}
 
-	free (tmpusers);
+	free(dup);
 
 	return is_valid;
 }
@@ -687,30 +685,8 @@ static void check_perms (const struct group *gr)
 		}
 	} else
 #endif				/* SHADOWGRP */
-	if (!amroot) {
-		/*
-		 * The policy here for changing a group is that
-		 * 1) you must be root or
-		 * 2) you must be the first listed member of the group.
-		 * The first listed member of a group can do anything to
-		 * that group that the root user can. The rationale for
-		 * this hack is that the FIRST user is probably the most
-		 * important user in this entire group.
-		 *
-		 * This feature enabled by default could be a security
-		 * problem when installed on existing systems where the
-		 * first group member might be just a normal user.
-		 * --marekm
-		 */
-#if !defined(FIRST_MEMBER_IS_ADMIN)
+	if (!amroot)
 		failure();
-#endif
-		if (gr->gr_mem[0] == NULL)
-			failure();
-
-		if (strcmp(gr->gr_mem[0], myname) != 0)
-			failure();
-	}
 }
 
 /*
@@ -810,16 +786,8 @@ static void get_group (struct group *gr)
 
 			sg->sg_mem = dup_list (gr->gr_mem);
 
-			sg->sg_adm = XMALLOC(2, char *);
-#ifdef FIRST_MEMBER_IS_ADMIN
-			if (sg->sg_mem[0]) {
-				sg->sg_adm[0] = xstrdup (sg->sg_mem[0]);
-				sg->sg_adm[1] = NULL;
-			} else
-#endif
-			{
-				sg->sg_adm[0] = NULL;
-			}
+			sg->sg_adm = XMALLOC(1, char *);
+			sg->sg_adm[0] = NULL;
 
 		}
 		if (sgr_close () == 0) {
@@ -876,7 +844,7 @@ static void change_passwd (struct group *gr)
 			exit (1);
 		}
 
-		if (strcmp (pass, cp) == 0) {
+		if (streq(pass, cp)) {
 			erase_pass (cp);
 			break;
 		}
diff --git a/src/groupadd.c b/src/groupadd.c
index 46e6550a..9f0eb2e5 100644
--- a/src/groupadd.c
+++ b/src/groupadd.c
@@ -16,6 +16,7 @@
 #include <getopt.h>
 #include <grp.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #ifdef ACCT_TOOLS_SETUID
 #ifdef USE_PAM
@@ -23,19 +24,23 @@
 #include <pwd.h>
 #endif				/* USE_PAM */
 #endif				/* ACCT_TOOLS_SETUID */
+
+#include "atoi/getnum.h"
 #include "chkname.h"
 #include "defines.h"
 #include "getdef.h"
 #include "groupio.h"
-#include "memzero.h"
 #include "nscd.h"
 #include "sssd.h"
 #include "prototypes.h"
+#include "run_part.h"
 #ifdef	SHADOWGRP
 #include "sgroupio.h"
 #endif
 #include "shadowlog.h"
-#include "run_part.h"
+#include "string/memset/memzero.h"
+#include "string/strtok/stpsep.h"
+
 
 /*
  * exit status values
@@ -160,7 +165,8 @@ static void new_sgent (struct sgrp *sgent)
  *
  *	grp_update() writes the new records to the group files.
  */
-static void grp_update (void)
+static void
+grp_update(void)
 {
 	struct group grp;
 
@@ -192,15 +198,20 @@ static void grp_update (void)
 #endif				/* SHADOWGRP */
 
 	if (user_list) {
-		char *token;
-		token = strtok(user_list, ",");
-		while (token) {
-			if (prefix_getpwnam (token) == NULL) {
-				fprintf (stderr, _("Invalid member username %s\n"), token);
+		char  *u, *ul;
+
+		ul = user_list;
+		while (NULL != (u = strsep(&ul, ","))) {
+			if (prefix_getpwnam(u) == NULL) {
+				fprintf(stderr, _("Invalid member username %s\n"), u);
 				exit (E_GRP_UPDATE);
 			}
-			grp.gr_mem = add_list(grp.gr_mem, token);
-			token = strtok(NULL, ",");
+
+			grp.gr_mem = add_list(grp.gr_mem, u);
+#ifdef  SHADOWGRP
+			if (is_shadow_grp)
+				sgrp.sg_mem = add_list(sgrp.sg_mem, u);
+#endif
 		}
 	}
 
@@ -232,20 +243,17 @@ static void grp_update (void)
  *	check_new_name() insures that the new name doesn't contain any
  *	illegal characters.
  */
-static void check_new_name (void)
+static void
+check_new_name(void)
 {
-	if (is_valid_group_name (group_name)) {
-		return;
+	if (!is_valid_group_name(group_name)) {
+		fprintf(stderr, _("%s: '%s' is not a valid group name\n"),
+			Prog, group_name);
+
+		exit(E_BAD_ARG);
 	}
 
-	/*
-	 * All invalid group names land here.
-	 */
-
-	fprintf (stderr, _("%s: '%s' is not a valid group name\n"),
-	         Prog, group_name);
-
-	exit (E_BAD_ARG);
+	return;
 }
 
 /*
@@ -420,15 +428,13 @@ static void process_flags (int argc, char **argv)
 			 * example: -K GID_MIN=100 -K GID_MAX=499
 			 * note: -K GID_MIN=10,GID_MAX=499 doesn't work yet
 			 */
-			cp = strchr (optarg, '=');
+			cp = stpsep(optarg, "=");
 			if (NULL == cp) {
 				fprintf (stderr,
 				         _("%s: -K requires KEY=VALUE\n"),
 				         Prog);
 				exit (E_BAD_ARG);
 			}
-			/* terminate name, point to value */
-			*cp++ = '\0';
 			if (putdef_str (optarg, cp, NULL) < 0) {
 				exit (E_BAD_ARG);
 			}
@@ -481,11 +487,11 @@ static void check_flags (void)
 	check_new_name ();
 
 	/*
-	 * Check if the group already exist.
+	 * Check if the group already exists.
 	 */
 	/* local, no need for xgetgrnam */
 	if (prefix_getgrnam (group_name) != NULL) {
-		/* The group already exist */
+		/* The group already exists */
 		if (fflg) {
 			/* OK, no need to do anything */
 			exit (E_SUCCESS);
@@ -497,7 +503,7 @@ static void check_flags (void)
 	}
 
 	if (gflg && (prefix_getgrgid (group_id) != NULL)) {
-		/* A GID was specified, and a group already exist with that GID
+		/* A GID was specified, and a group already exists with that GID
 		 *  - either we will use this GID anyway (-o)
 		 *  - either we ignore the specified GID and
 		 *    we will use another one (-f)
diff --git a/src/groupmems.c b/src/groupmems.c
index a369a619..53729b76 100644
--- a/src/groupmems.c
+++ b/src/groupmems.c
@@ -19,14 +19,17 @@
 #endif				/* USE_PAM */
 #include <pwd.h>
 
-#include "alloc.h"
+#include "alloc/x/xmalloc.h"
 #include "defines.h"
-#include "prototypes.h"
 #include "groupio.h"
+#include "prototypes.h"
 #ifdef SHADOWGRP
 #include "sgroupio.h"
 #endif
 #include "shadowlog.h"
+#include "string/strcmp/streq.h"
+#include "string/strdup/xstrdup.h"
+
 
 /* Exit Status Values */
 /*@-exitarg@*/
@@ -83,7 +86,7 @@ static char *whoami (void)
 
 	if (   (NULL != usr)
 	    && (NULL != grp)
-	    && (0 == strcmp (usr->pw_name, grp->gr_name))) {
+	    && streq(usr->pw_name, grp->gr_name)) {
 		return xstrdup (usr->pw_name);
 	} else {
 		return NULL;
@@ -128,15 +131,7 @@ static void add_user (const char *user,
 			sgrent.sg_name = xstrdup (newgrp->gr_name);
 			sgrent.sg_mem = dup_list (newgrp->gr_mem);
 			sgrent.sg_adm = XMALLOC(1, char *);
-#ifdef FIRST_MEMBER_IS_ADMIN
-			if (sgrent.sg_mem[0]) {
-				sgrent.sg_adm[0] = xstrdup (sgrent.sg_mem[0]);
-				sgrent.sg_adm[1] = NULL;
-			} else
-#endif
-			{
-				sgrent.sg_adm[0] = NULL;
-			}
+			sgrent.sg_adm[0] = NULL;
 
 			/* Move any password to gshadow */
 			sgrent.sg_passwd = newgrp->gr_passwd;
@@ -211,15 +206,7 @@ static void remove_user (const char *user,
 			sgrent.sg_name = xstrdup (newgrp->gr_name);
 			sgrent.sg_mem = dup_list (newgrp->gr_mem);
 			sgrent.sg_adm = XMALLOC(1, char *);
-#ifdef FIRST_MEMBER_IS_ADMIN
-			if (sgrent.sg_mem[0]) {
-				sgrent.sg_adm[0] = xstrdup (sgrent.sg_mem[0]);
-				sgrent.sg_adm[1] = NULL;
-			} else
-#endif
-			{
-				sgrent.sg_adm[0] = NULL;
-			}
+			sgrent.sg_adm[0] = NULL;
 
 			/* Move any password to gshadow */
 			sgrent.sg_passwd = newgrp->gr_passwd;
diff --git a/src/groupmod.c b/src/groupmod.c
index 989d7ea3..7342707d 100644
--- a/src/groupmod.c
+++ b/src/groupmod.c
@@ -17,6 +17,7 @@
 #include <grp.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <string.h>
 #include <strings.h>
 #include <sys/types.h>
 #ifdef ACCT_TOOLS_SETUID
@@ -26,20 +27,25 @@
 #endif				/* USE_PAM */
 #endif				/* ACCT_TOOLS_SETUID */
 
-#include "alloc.h"
+#include "alloc/x/xmalloc.h"
+#include "atoi/getnum.h"
 #include "chkname.h"
 #include "defines.h"
 #include "groupio.h"
-#include "pwio.h"
 #include "nscd.h"
-#include "sssd.h"
 #include "prototypes.h"
+#include "pwio.h"
 #ifdef	SHADOWGRP
 #include "sgroupio.h"
 #endif
 #include "shadowlog.h"
-#include "string/stpecpy.h"
-#include "string/stpeprintf.h"
+#include "sssd.h"
+#include "string/sprintf/stpeprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strcpy/stpecpy.h"
+#include "string/strdup/xstrdup.h"
+
+
 /*
  * exit status values
  */
@@ -150,7 +156,7 @@ static void new_grent (struct group *grent)
 	if (   pflg
 #ifdef SHADOWGRP
 	    && (   (!is_shadow_grp)
-	        || (strcmp (grent->gr_passwd, SHADOW_PASSWD_STRING) != 0))
+	        || !streq(grent->gr_passwd, SHADOW_PASSWD_STRING))
 #endif
 		) {
 		/* Update the password in group if there is no gshadow
@@ -193,7 +199,8 @@ static void new_sgent (struct sgrp *sgent)
  *
  *	grp_update() updates the new records in the memory databases.
  */
-static void grp_update (void)
+static void
+grp_update(void)
 {
 	struct group grp;
 	const struct group *ogrp;
@@ -217,13 +224,13 @@ static void grp_update (void)
 	new_grent (&grp);
 #ifdef	SHADOWGRP
 	if (   is_shadow_grp
-	    && (pflg || nflg)) {
+	    && (pflg || nflg || user_list)) {
 		osgrp = sgr_locate (group_name);
 		if (NULL != osgrp) {
 			sgrp = *osgrp;
 			new_sgent (&sgrp);
 		} else if (   pflg
-		           && (strcmp (grp.gr_passwd, SHADOW_PASSWD_STRING) == 0)) {
+		           && streq(grp.gr_passwd, SHADOW_PASSWD_STRING)) {
 			static char *empty = NULL;
 			/* If there is a gshadow file with no entries for
 			 * the group, but the group file indicates a
@@ -246,7 +253,7 @@ static void grp_update (void)
 	}
 
 	if (user_list) {
-		char *token;
+		char  *u, *ul;
 
 		if (!aflg) {
 			// requested to replace the existing groups
@@ -257,15 +264,30 @@ static void grp_update (void)
 			if (NULL != grp.gr_mem[0])
 				grp.gr_mem = dup_list (grp.gr_mem);
 		}
+#ifdef	SHADOWGRP
+		if (NULL != osgrp) {
+			if (!aflg) {
+				sgrp.sg_mem = XMALLOC(1, char *);
+				sgrp.sg_mem[0] = NULL;
+			} else {
+				if (NULL != sgrp.sg_mem[0])
+					sgrp.sg_mem = dup_list(sgrp.sg_mem);
+			}
+		}
+#endif				/* SHADOWGRP */
 
-		token = strtok(user_list, ",");
-		while (token) {
-			if (prefix_getpwnam (token) == NULL) {
-				fprintf (stderr, _("Invalid member username %s\n"), token);
+		ul = user_list;
+		while (NULL != (u = strsep(&ul, ","))) {
+			if (prefix_getpwnam(u) == NULL) {
+				fprintf(stderr, _("Invalid member username %s\n"), u);
 				exit (E_GRP_UPDATE);
 			}
-			grp.gr_mem = add_list(grp.gr_mem, token);
-			token = strtok(NULL, ",");
+
+			grp.gr_mem = add_list(grp.gr_mem, u);
+#ifdef	SHADOWGRP
+			if (NULL != osgrp)
+				sgrp.sg_mem = add_list(sgrp.sg_mem, u);
+#endif				/* SHADOWGRP */
 		}
 	}
 
@@ -347,39 +369,33 @@ static void check_new_gid (void)
  *	check_new_name() insures that the new name does not exist already.
  *	You can't have the same name twice, period.
  */
-static void check_new_name (void)
+static void
+check_new_name(void)
 {
 	/*
 	 * Make sure they are actually changing the name.
 	 */
-	if (strcmp (group_name, group_newname) == 0) {
+	if (streq(group_name, group_newname)) {
 		nflg = 0;
 		return;
 	}
 
-	if (is_valid_group_name (group_newname)) {
-
-		/*
-		 * If the entry is found, too bad.
-		 */
-		/* local, no need for xgetgrnam */
-		if (prefix_getgrnam (group_newname) != NULL) {
-			fprintf (stderr,
-			         _("%s: group '%s' already exists\n"),
-			         Prog, group_newname);
-			exit (E_NAME_IN_USE);
-		}
-		return;
+	if (!is_valid_group_name(group_newname)) {
+		fprintf(stderr,
+			_("%s: invalid group name '%s'\n"),
+			Prog, group_newname);
+		exit(E_BAD_ARG);
 	}
 
-	/*
-	 * All invalid group names land here.
-	 */
+	/* local, no need for xgetgrnam */
+	if (prefix_getgrnam(group_newname) != NULL) {
+		fprintf(stderr,
+			_("%s: group '%s' already exists\n"),
+			Prog, group_newname);
+		exit(E_NAME_IN_USE);
+	}
 
-	fprintf (stderr,
-	         _("%s: invalid group name '%s'\n"),
-	         Prog, group_newname);
-	exit (E_BAD_ARG);
+	return;
 }
 
 /*
@@ -487,7 +503,7 @@ static void close_files (void)
 
 #ifdef	SHADOWGRP
 	if (   is_shadow_grp
-	    && (pflg || nflg)) {
+	    && (pflg || nflg || user_list)) {
 		if (sgr_close () == 0) {
 			fprintf (stderr,
 			         _("%s: failure while writing changes to %s\n"),
@@ -619,7 +635,7 @@ static void prepare_failure_reports (void)
 	add_cleanup (cleanup_report_mod_group, &info_group);
 #ifdef	SHADOWGRP
 	if (   is_shadow_grp
-	    && (pflg || nflg)) {
+	    && (pflg || nflg || user_list)) {
 		add_cleanup (cleanup_report_mod_gshadow, &info_gshadow);
 	}
 #endif
@@ -646,7 +662,7 @@ static void lock_files (void)
 
 #ifdef	SHADOWGRP
 	if (   is_shadow_grp
-	    && (pflg || nflg)) {
+	    && (pflg || nflg || user_list)) {
 		if (sgr_lock () == 0) {
 			fprintf (stderr,
 			         _("%s: cannot lock %s; try again later.\n"),
@@ -684,7 +700,7 @@ static void open_files (void)
 
 #ifdef	SHADOWGRP
 	if (   is_shadow_grp
-	    && (pflg || nflg)) {
+	    && (pflg || nflg || user_list)) {
 		if (sgr_open (O_CREAT | O_RDWR) == 0) {
 			fprintf (stderr,
 			         _("%s: cannot open %s\n"),
diff --git a/src/groups.c b/src/groups.c
deleted file mode 100644
index d19a80a3..00000000
--- a/src/groups.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 1991 - 1993, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2001 - 2006, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2007 - 2008, Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include <grp.h>
-#include <pwd.h>
-#include <stdio.h>
-
-#include "alloc.h"
-#include "defines.h"
-#include "prototypes.h"
-#include "shadowlog.h"
-
-/*
- * Global variables
- */
-static const char Prog[] = "groups";
-
-/* local function prototypes */
-static void print_groups (const char *member);
-
-/*
- * print_groups - print the groups which the named user is a member of
- *
- *	print_groups() scans the groups file for the list of groups which
- *	the user is listed as being a member of.
- */
-static void print_groups (const char *member)
-{
-	int groups = 0;
-	struct group *grp;
-	struct passwd *pwd;
-	bool flag = false;
-
-	pwd = getpwnam (member); /* local, no need for xgetpwnam */
-	if (NULL == pwd) {
-		(void) fprintf (stderr, _("%s: unknown user %s\n"),
-		                Prog, member);
-		exit (EXIT_FAILURE);
-	}
-
-	setgrent ();
-	while ((grp = getgrent ()) != NULL) {
-		if (is_on_list (grp->gr_mem, member)) {
-			if (0 != groups) {
-				(void) putchar (' ');
-			}
-			groups++;
-
-			(void) printf ("%s", grp->gr_name);
-			if (grp->gr_gid == pwd->pw_gid) {
-				flag = true;
-			}
-		}
-	}
-	endgrent ();
-
-	/* The user may not be in the list of members of its primary group */
-	if (!flag) {
-		grp = getgrgid (pwd->pw_gid); /* local, no need for xgetgrgid */
-		if (NULL != grp) {
-			if (0 != groups) {
-				(void) putchar (' ');
-			}
-			groups++;
-
-			(void) printf ("%s", grp->gr_name);
-		}
-	}
-
-	if (0 != groups) {
-		(void) putchar ('\n');
-	}
-}
-
-/*
- * groups - print out the groups a process is a member of
- */
-int main (int argc, char **argv)
-{
-	long sys_ngroups;
-	GETGROUPS_T *groups;
-
-	sys_ngroups = sysconf (_SC_NGROUPS_MAX);
-	groups = XMALLOC(sys_ngroups, GETGROUPS_T);
-
-	(void) setlocale (LC_ALL, "");
-	(void) bindtextdomain (PACKAGE, LOCALEDIR);
-	(void) textdomain (PACKAGE);
-
-	log_set_progname(Prog);
-	log_set_logfd(stderr);
-
-	if (argc == 1) {
-
-		/*
-		 * Called with no arguments - give the group set for the
-		 * current user.
-		 */
-
-		int i;
-		int pri_grp; /* TODO: should be GETGROUPS_T */
-		/*
-		 * This system supports concurrent group sets, so I can ask
-		 * the system to tell me which groups are currently set for
-		 * this process.
-		 */
-		int ngroups = getgroups (sys_ngroups, groups);
-		if (ngroups < 0) {
-			perror ("getgroups");
-			exit (EXIT_FAILURE);
-		}
-
-		/*
-		 * The groupset includes the primary group as well.
-		 */
-		pri_grp = getegid ();
-		for (i = 0; i < ngroups; i++) {
-			if (pri_grp == (int) groups[i]) {
-				break;
-			}
-		}
-
-		if (i != ngroups) {
-			pri_grp = -1;
-		}
-
-		/*
-		 * Print out the name of every group in the current group
-		 * set. Unknown groups are printed as their decimal group ID
-		 * values.
-		 */
-		if (-1 != pri_grp) {
-			struct group *gr;
-			/* local, no need for xgetgrgid */
-			gr = getgrgid (pri_grp);
-			if (NULL != gr) {
-				(void) printf ("%s", gr->gr_name);
-			} else {
-				(void) printf ("%d", pri_grp);
-			}
-		}
-
-		for (i = 0; i < ngroups; i++) {
-			struct group *gr;
-			if ((0 != i) || (-1 != pri_grp)) {
-				(void) putchar (' ');
-			}
-
-			/* local, no need for xgetgrgid */
-			gr = getgrgid (groups[i]);
-			if (NULL != gr) {
-				(void) printf ("%s", gr->gr_name);
-			} else {
-				(void) printf ("%ld", (long) groups[i]);
-			}
-		}
-		(void) putchar ('\n');
-	} else {
-
-		/*
-		 * The invoker wanted to know about some other user. Use
-		 * that name to look up the groups instead.
-		 */
-		print_groups (argv[1]);
-	}
-	return EXIT_SUCCESS;
-}
-
diff --git a/src/grpck.c b/src/grpck.c
index 4ef1b154..405ae6c5 100644
--- a/src/grpck.c
+++ b/src/grpck.c
@@ -15,14 +15,16 @@
 #include <pwd.h>
 #include <stdio.h>
 #include <getopt.h>
+
 #include "chkname.h"
 #include "commonio.h"
 #include "defines.h"
 #include "groupio.h"
 #include "nscd.h"
-#include "sssd.h"
 #include "prototypes.h"
 #include "shadowlog.h"
+#include "sssd.h"
+#include "string/strcmp/streq.h"
 
 #ifdef SHADOWGRP
 #include "sgroupio.h"
@@ -436,7 +438,7 @@ static void compare_members_lists (const char *groupname,
 
 	for (pmem = members; NULL != *pmem; pmem++) {
 		for (other_pmem = other_members; NULL != *other_pmem; other_pmem++) {
-			if (strcmp (*pmem, *other_pmem) == 0) {
+			if (streq(*pmem, *other_pmem)) {
 				break;
 			}
 		}
@@ -535,7 +537,7 @@ static void check_grp_file (int *errors, bool *changed)
 				continue;
 			}
 
-			if (strcmp (grp->gr_name, ent->gr_name) != 0) {
+			if (!streq(grp->gr_name, ent->gr_name)) {
 				continue;
 			}
 
@@ -647,7 +649,7 @@ static void check_grp_file (int *errors, bool *changed)
 				/* The group entry has a gshadow counterpart.
 				 * Make sure no passwords are in group.
 				 */
-				if (strcmp (grp->gr_passwd, SHADOW_PASSWD_STRING) != 0) {
+				if (!streq(grp->gr_passwd, SHADOW_PASSWD_STRING)) {
 					printf (_("group %s has an entry in %s, but its password field in %s is not set to 'x'\n"),
 					        grp->gr_name, sgr_file, grp_file);
 					*errors += 1;
@@ -737,7 +739,7 @@ static void check_sgr_file (int *errors, bool *changed)
 				continue;
 			}
 
-			if (strcmp (sgr->sg_name, ent->sg_name) != 0) {
+			if (!streq(sgr->sg_name, ent->sg_name)) {
 				continue;
 			}
 
diff --git a/src/grpconv.c b/src/grpconv.c
index 4d941cdc..16cd52c9 100644
--- a/src/grpconv.c
+++ b/src/grpconv.c
@@ -17,6 +17,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <getopt.h>
 #include <grp.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -24,18 +25,21 @@
 #include <strings.h>
 #include <time.h>
 #include <unistd.h>
-#include <getopt.h>
 
 #include "attr.h"
-#include "nscd.h"
-#include "sssd.h"
-#include "prototypes.h"
 /*@-exitarg@*/
 #include "exitcodes.h"
+#include "nscd.h"
+#include "prototypes.h"
+#include "string/strcmp/streq.h"
+
 #ifdef SHADOWGRP
 #include "groupio.h"
 #include "sgroupio.h"
 #include "shadowlog.h"
+#include "sssd.h"
+
+
 /*
  * Global variables
  */
@@ -194,10 +198,10 @@ int main (int argc, char **argv)
 		if (NULL != sg) {
 			/* update existing shadow group entry */
 			sgent = *sg;
-			if (strcmp (gr->gr_passwd, SHADOW_PASSWD_STRING) != 0)
+			if (!streq(gr->gr_passwd, SHADOW_PASSWD_STRING))
 				sgent.sg_passwd = gr->gr_passwd;
 		} else {
-			static char *empty = 0;
+			static char *empty = NULL;
 
 			/* add new shadow group entry */
 			bzero(&sgent, sizeof sgent);
diff --git a/src/grpunconv.c b/src/grpunconv.c
index d001ece7..ea65a329 100644
--- a/src/grpunconv.c
+++ b/src/grpunconv.c
@@ -26,15 +26,19 @@
 #include <getopt.h>
 
 #include "attr.h"
-#include "nscd.h"
-#include "sssd.h"
-#include "prototypes.h"
 /*@-exitarg@*/
 #include "exitcodes.h"
+#include "nscd.h"
+#include "prototypes.h"
+#include "sssd.h"
+#include "string/strcmp/streq.h"
+
 #ifdef SHADOWGRP
 #include "groupio.h"
 #include "sgroupio.h"
 #include "shadowlog.h"
+
+
 /*
  * Global variables
  */
@@ -174,7 +178,7 @@ int main (int argc, char **argv)
 	while ((gr = gr_next ()) != NULL) {
 		sg = sgr_locate (gr->gr_name);
 		if (   (NULL != sg)
-		    && (strcmp (gr->gr_passwd, SHADOW_PASSWD_STRING) == 0)) {
+		    && streq(gr->gr_passwd, SHADOW_PASSWD_STRING)) {
 			/* add password to /etc/group */
 			grent = *gr;
 			grent.gr_passwd = sg->sg_passwd;
diff --git a/src/id.c b/src/id.c
deleted file mode 100644
index 673693e0..00000000
--- a/src/id.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 1991 - 1994, Julianne Frances Haugh
- * SPDX-FileCopyrightText: 1996 - 2000, Marek Michałkiewicz
- * SPDX-FileCopyrightText: 2001 - 2006, Tomasz Kłoczko
- * SPDX-FileCopyrightText: 2007 - 2008, Nicolas François
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-/*
- * id - print current process user identification information
- *
- *	Print the current process identifiers. This includes the
- *	UID, GID, effective-UID and effective-GID. Optionally print
- *	the concurrent group set if the current system supports it.
- */
-
-#include <config.h>
-
-#ident "$Id$"
-
-#include <grp.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <sys/types.h>
-
-#include "alloc.h"
-#include "defines.h"
-
-/* local function prototypes */
-static void usage (void);
-
-static void usage (void)
-{
-	(void) fputs (_("Usage: id [-a]\n"), stderr);
-	exit (EXIT_FAILURE);
-}
-
-int
-main(int argc, char *argv[])
-{
-	uid_t ruid, euid;
-	gid_t rgid, egid;
-	long sys_ngroups;
-
-/*
- * This block of declarations is particularly strained because of several
- * different ways of doing concurrent groups. Old BSD systems used int for
- * gid's, but short for the type passed to getgroups(). Newer systems use
- * gid_t for everything. Some systems have a small and fixed NGROUPS,
- * usually about 16 or 32. Others use bigger values.
- */
-	GETGROUPS_T *groups;
-	int ngroups;
-	bool aflg = 0;
-	struct passwd *pw;
-	struct group *gr;
-
-	(void) setlocale (LC_ALL, "");
-	(void) bindtextdomain (PACKAGE, LOCALEDIR);
-	(void) textdomain (PACKAGE);
-
-	/*
-	 * Dynamically get the maximum number of groups from system, instead
-	 * of using the symbolic constant NGROUPS_MAX. This ensures that the
-	 * group limit is not hard coded into the binary, so it will still
-	 * work if the system library is recompiled.
-	 */
-	sys_ngroups = sysconf (_SC_NGROUPS_MAX);
-	groups = MALLOC(sys_ngroups, GETGROUPS_T);
-
-	/*
-	 * See if the -a flag has been given to print out the concurrent
-	 * group set.
-	 */
-
-	if (argc > 1) {
-		if (argc > 2 || strcmp(argv[1], "-a") != 0)
-			usage();
-		else
-			aflg = true;
-	}
-
-	ruid = getuid ();
-	euid = geteuid ();
-	rgid = getgid ();
-	egid = getegid ();
-
-	/*
-	 * Print out the real user ID and group ID. If the user or group
-	 * does not exist, just give the numerical value.
-	 */
-
-	pw = getpwuid (ruid); /* local, no need for xgetpwuid */
-	if (NULL != pw) {
-		(void) printf ("UID=%lu(%s)",
-		               (unsigned long) ruid, pw->pw_name);
-	} else {
-		(void) printf ("UID=%lu", (unsigned long) ruid);
-	}
-
-	gr = getgrgid (rgid);; /* local, no need for xgetgrgid */
-	if (NULL != gr) {
-		(void) printf (" GID=%lu(%s)",
-		               (unsigned long) rgid, gr->gr_name);
-	} else {
-		(void) printf (" GID=%lu", (unsigned long) rgid);
-	}
-
-	/*
-	 * Print out the effective user ID and group ID if they are
-	 * different from the real values.
-	 */
-
-	if (ruid != euid) {
-		pw = getpwuid (euid); /* local, no need for xgetpwuid */
-		if (NULL != pw) {
-			(void) printf (" EUID=%lu(%s)",
-			               (unsigned long) euid, pw->pw_name);
-		} else {
-			(void) printf (" EUID=%lu", (unsigned long) euid);
-		}
-	}
-	if (rgid != egid) {
-		gr = getgrgid (egid); /* local, no need for xgetgrgid */
-		if (NULL != gr) {
-			(void) printf (" EGID=%lu(%s)",
-			               (unsigned long) egid, gr->gr_name);
-		} else {
-			(void) printf (" EGID=%lu", (unsigned long) egid);
-		}
-	}
-
-	/*
-	 * Print out the concurrent group set if the user has requested it.
-	 * The group numbers will be printed followed by their names.
-	 */
-	if (aflg && (ngroups = getgroups (sys_ngroups, groups)) != -1) {
-		int i;
-
-		/*
-		 * Start off the group message. It will be of the format
-		 *
-		 *      groups=###(aaa),###(aaa),###(aaa)
-		 *
-		 * where "###" is a numerical value and "aaa" is the
-		 * corresponding name for each respective numerical value.
-		 */
-		(void) puts (_(" groups="));
-		for (i = 0; i < ngroups; i++) {
-			if (0 != i)
-				(void) putchar (',');
-
-			/* local, no need for xgetgrgid */
-			gr = getgrgid (groups[i]);
-			if (NULL != gr) {
-				(void) printf ("%lu(%s)",
-				               (unsigned long) groups[i],
-				               gr->gr_name);
-			} else {
-				(void) printf ("%lu",
-				               (unsigned long) groups[i]);
-			}
-		}
-	}
-	free (groups);
-
-	/*
-	 * Finish off the line.
-	 */
-	(void) putchar ('\n');
-
-	return EXIT_SUCCESS;
-}
-
diff --git a/src/lastlog.c b/src/lastlog.c
index 3914b72b..3bd5c62f 100644
--- a/src/lastlog.c
+++ b/src/lastlog.c
@@ -23,14 +23,14 @@
 #include <net/if.h>
 #endif
 
-#include "atoi/str2i.h"
+#include "atoi/str2i/str2u.h"
 #include "defines.h"
 #include "prototypes.h"
 #include "getdef.h"
-#include "memzero.h"
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
+#include "string/memset/memzero.h"
 #include "string/strftime.h"
 
 
diff --git a/src/login.c b/src/login.c
index 3a302983..31162af1 100644
--- a/src/login.c
+++ b/src/login.c
@@ -25,22 +25,24 @@
 #include <sys/ioctl.h>
 #include <assert.h>
 
-#include "alloc.h"
+#include "alloc/x/xmalloc.h"
 #include "attr.h"
 #include "chkname.h"
 #include "defines.h"
+/*@-exitarg@*/
+#include "exitcodes.h"
 #include "faillog.h"
 #include "failure.h"
 #include "getdef.h"
-#include "memzero.h"
 #include "prototypes.h"
 #include "pwauth.h"
-/*@-exitarg@*/
-#include "exitcodes.h"
 #include "shadowlog.h"
-#include "string/sprintf.h"
+#include "string/memset/memzero.h"
+#include "string/sprintf/snprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strcpy/strtcpy.h"
+#include "string/strdup/xstrdup.h"
 #include "string/strftime.h"
-#include "string/strtcpy.h"
 
 
 #ifdef USE_PAM
@@ -268,7 +270,7 @@ static void process_flags (int argc, char *const *argv)
 		if (argv[arg][0] == '-' && strlen (argv[arg]) > 2) {
 			usage ();
 		}
-		if (strcmp(argv[arg], "--") == 0) {
+		if (streq(argv[arg], "--")) {
 			break; /* stop checking on a "--" */
 		}
 	}
@@ -834,7 +836,6 @@ int main (int argc, char **argv)
 			}
 			preauth_flag = false;
 			username = XMALLOC(max_size, char);
-			username[max_size - 1] = '\0';
 			login_prompt(username, max_size);
 
 			if ('\0' == username[0]) {
@@ -864,22 +865,22 @@ int main (int argc, char **argv)
 				failed = true;
 			}
 
-			if (strcmp (user_passwd, "") == 0) {
+			if (streq(user_passwd, "")) {
 				const char *prevent_no_auth = getdef_str("PREVENT_NO_AUTH");
 
 				if (prevent_no_auth == NULL) {
 					prevent_no_auth = "superuser";
 				}
-				if (strcmp(prevent_no_auth, "yes") == 0) {
+				if (streq(prevent_no_auth, "yes")) {
 					failed = true;
 				} else if ((pwd->pw_uid == 0)
-					&& (strcmp(prevent_no_auth, "superuser") == 0)) {
+					&& streq(prevent_no_auth, "superuser")) {
 					failed = true;
 				}
 			}
 		}
 
-		if (strcmp (user_passwd, SHADOW_PASSWD_STRING) == 0) {
+		if (streq(user_passwd, SHADOW_PASSWD_STRING)) {
 			spwd = xgetspnam (username);
 			if (NULL != spwd) {
 				user_passwd = spwd->sp_pwdp;
diff --git a/src/login_nopam.c b/src/login_nopam.c
index e6f77d1c..56692e15 100644
--- a/src/login_nopam.c
+++ b/src/login_nopam.c
@@ -52,26 +52,21 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>		/* for inet_ntoa() */
 
 #include "sizeof.h"
+#include "string/strchr/strrspn.h"
+#include "string/strtok/stpsep.h"
 
-#if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64)
-#undef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 256
-#endif
 
  /* Path name of the access control file. */
 #ifndef	TABLE
 #define TABLE	"/etc/login.access"
 #endif
 
-/* Delimiters for fields and for lists of users, ttys or hosts. */
-static char fs[] = ":";		/* field separator */
-static char sep[] = ", \t";	/* list-element separator */
-
 static bool list_match (char *list, const char *item, bool (*match_fn) (const char *, const char *));
 static bool user_match (const char *tok, const char *string);
 static bool from_match (const char *tok, const char *string);
@@ -79,7 +74,8 @@ static bool string_match (const char *tok, const char *string);
 static const char *resolve_hostname (const char *string);
 
 /* login_access - match username/group and host/tty with access control file */
-int login_access (const char *user, const char *from)
+int
+login_access(const char *user, const char *from)
 {
 	FILE *fp;
 	char line[BUFSIZ];
@@ -99,11 +95,12 @@ int login_access (const char *user, const char *from)
 	if (NULL != fp) {
 		int lineno = 0;	/* for diagnostics */
 		while (   !match
-		       && (fgets (line, sizeof (line), fp) == line)) {
-			ptrdiff_t  end;
+		       && (fgets (line, sizeof (line), fp) == line))
+		{
+			char  *p;
+
 			lineno++;
-			end = strlen (line) - 1;
-			if (line[0] == '\0' || line[end] != '\n') {
+			if (stpsep(line, "\n") == NULL) {
 				SYSLOG ((LOG_ERR,
 					 "%s: line %d: missing newline or line too long",
 					 TABLE, lineno));
@@ -112,17 +109,15 @@ int login_access (const char *user, const char *from)
 			if (line[0] == '#') {
 				continue;	/* comment line */
 			}
-			while (end > 0 && isspace (line[end - 1])) {
-				end--;
-			}
-			line[end] = '\0';	/* strip trailing whitespace */
+			stpcpy(strrspn(line, " \t"), "");
 			if (line[0] == '\0') {	/* skip blank lines */
 				continue;
 			}
-			if (   ((perm = strtok (line, fs)) == NULL)
-			    || ((users = strtok (NULL, fs)) == NULL)
-			    || ((froms = strtok (NULL, fs)) == NULL)
-			    || (strtok (NULL, fs) != NULL)) {
+			p = line;
+			perm = strsep(&p, ":");
+			users = strsep(&p, ":");
+			froms = strsep(&p, ":");
+			if (froms == NULL || p != NULL) {
 				SYSLOG ((LOG_ERR,
 					 "%s: line %d: bad field count",
 					 TABLE, lineno));
@@ -146,8 +141,11 @@ int login_access (const char *user, const char *from)
 }
 
 /* list_match - match an item against a list of tokens with exceptions */
-static bool list_match (char *list, const char *item, bool (*match_fn) (const char *, const char*))
+static bool
+list_match(char *list, const char *item, bool (*match_fn)(const char *, const char*))
 {
+	static const char  sep[] = ", \t";
+
 	char *tok;
 	bool match = false;
 
@@ -157,7 +155,7 @@ static bool list_match (char *list, const char *item, bool (*match_fn) (const ch
 	 * a match, look for an "EXCEPT" list and recurse to determine whether
 	 * the match is affected by any exceptions.
 	 */
-	for (tok = strtok (list, sep); tok != NULL; tok = strtok (NULL, sep)) {
+	while (NULL != (tok = strsep(&list, sep))) {
 		if (strcasecmp (tok, "EXCEPT") == 0) {	/* EXCEPT: give up */
 			break;
 		}
@@ -169,10 +167,10 @@ static bool list_match (char *list, const char *item, bool (*match_fn) (const ch
 
 	/* Process exceptions to matches. */
 	if (match) {
-		while (   ((tok = strtok (NULL, sep)) != NULL)
+		while (   (NULL != (tok = strsep(&list, sep)))
 		       && (strcasecmp (tok, "EXCEPT") != 0))
 			/* VOID */ ;
-		if (tok == 0 || !list_match (NULL, item, match_fn)) {
+		if (tok == NULL || !list_match(NULL, item, match_fn)) {
 			return (match);
 		}
 	}
@@ -186,7 +184,7 @@ static char *myhostname (void)
 
 	if (name[0] == '\0') {
 		gethostname (name, sizeof (name));
-		name[MAXHOSTNAMELEN] = '\0';
+		stpcpy(&name[MAXHOSTNAMELEN], "");
 	}
 	return (name);
 }
@@ -217,18 +215,16 @@ static bool user_match (const char *tok, const char *string)
 #ifdef PRIMARY_GROUP_MATCH
 	struct passwd *userinf;
 #endif
-	char *at;
+	char *host;
 
 	/*
 	 * If a token has the magic value "ALL" the match always succeeds.
 	 * Otherwise, return true if the token fully matches the username, or if
 	 * the token is a group that contains the username.
 	 */
-	at = strchr (tok + 1, '@');
-	if (NULL != at) {	/* split user@host pattern */
-		*at = '\0';
-		return (   user_match (tok, string)
-		        && from_match (at + 1, myhostname ()));
+	host = stpsep(tok + 1, "@");	/* split user@host pattern */
+	if (host != NULL) {
+		return user_match(tok, string) && from_match(host, myhostname());
 #if HAVE_INNETGR
 	} else if (tok[0] == '@') {	/* netgroup */
 		return (netgroup_match (tok + 1, NULL, string));
@@ -270,7 +266,7 @@ static const char *resolve_hostname (const char *string)
 	const char       *addr_str;
 	struct addrinfo  *addrs;
 
-	static char      host[MAXHOSTNAMELEN];
+	static char      host[NI_MAXHOST];
 
 	gai_err = getaddrinfo(string, NULL, NULL, &addrs);
 	if (gai_err != 0) {
diff --git a/src/logoutd.c b/src/logoutd.c
index c8705101..11a5d60a 100644
--- a/src/logoutd.c
+++ b/src/logoutd.c
@@ -16,11 +16,15 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <utmpx.h>
+
 #include "defines.h"
 #include "prototypes.h"
 #include "shadowlog.h"
 #include "sizeof.h"
-#include "string/zustr2stp.h"
+#include "string/strcpy/strncat.h"
+#include "string/strdup/strndupa.h"
+
+
 /*
  * Global variables
  */
@@ -46,22 +50,16 @@ static void send_mesg_to_tty (int tty_fd);
 static int
 check_login(const struct utmpx *ut)
 {
-	char    user[sizeof(ut->ut_user) + 1];
-	char    line[sizeof(ut->ut_line) + 1];
+	char    *user;
+	char    *line;
 	time_t  now;
 
-	ZUSTR2STP(user, ut->ut_user);
-	ZUSTR2STP(line, ut->ut_line);
+	user = STRNDUPA(ut->ut_user);
+	line = STRNDUPA(ut->ut_line);
 
-	(void) time (&now);
+	now = time(NULL);
 
-	/*
-	 * Check if they are allowed to be logged in right now.
-	 */
-	if (!isttytime(user, line, now)) {
-		return 0;
-	}
-	return 1;
+	return isttytime(user, line, now);
 }
 
 
@@ -118,15 +116,8 @@ static void send_mesg_to_tty (int tty_fd)
 int
 main(int argc, char **argv)
 {
-	int    i;
-	int    status;
 	pid_t  pid;
 
-	struct utmpx  *ut;
-	char          user[sizeof (ut->ut_user) + 1];	/* terminating NUL */
-	char          tty_name[sizeof (ut->ut_line) + 6];	/* /dev/ + NUL */
-	int           tty_fd;
-
 	if (1 != argc) {
 		(void) fputs (_("Usage: logoutd\n"), stderr);
 	}
@@ -136,7 +127,7 @@ main(int argc, char **argv)
 	(void) textdomain (PACKAGE);
 
 #ifndef DEBUG
-	for (i = 0; close (i) == 0; i++);
+	for (int i = 0; close(i) == 0; i++);
 
 	setpgrp ();
 
@@ -167,6 +158,7 @@ main(int argc, char **argv)
 	 * are not supposed to still be logged in.
 	 */
 	while (true) {
+		struct utmpx  *ut;
 
 		/*
 		 * Attempt to re-open the utmp file. The file is only
@@ -180,6 +172,9 @@ main(int argc, char **argv)
 		 * is permitted to be signed on at this time.
 		 */
 		while ((ut = getutxent()) != NULL) {
+			int   tty_fd;
+			char  tty_name[sizeof(ut->ut_line) + 6];  // /dev/ + NUL
+
 			if (ut->ut_type != USER_PROCESS) {
 				continue;
 			}
@@ -205,13 +200,12 @@ main(int argc, char **argv)
 			}
 			/* child */
 
-			if (strncmp (ut->ut_line, "/dev/", 5) != 0) {
-				strcpy (tty_name, "/dev/");
-			} else {
-				tty_name[0] = '\0';
-			}
+			if (strncmp(ut->ut_line, "/dev/", 5) != 0)
+				strcpy(tty_name, "/dev/");
+			else
+				strcpy(tty_name, "");
 
-			strncat(tty_name, ut->ut_line, NITEMS(ut->ut_line));
+			STRNCAT(tty_name, ut->ut_line);
 #ifndef O_NOCTTY
 #define O_NOCTTY 0
 #endif
@@ -229,10 +223,9 @@ main(int argc, char **argv)
 				kill (-ut->ut_pid, SIGKILL);
 			}
 
-			ZUSTR2STP(user, ut->ut_user);
-
 			SYSLOG ((LOG_NOTICE,
-				 "logged off user '%s' on '%s'", user,
+				 "logged off user '%s' on '%s'",
+			         STRNDUPA(ut->ut_user),
 				 tty_name));
 
 			/*
@@ -249,7 +242,7 @@ main(int argc, char **argv)
 		/*
 		 * Reap any dead babies ...
 		 */
-		while (wait (&status) != -1);
+		while (wait(NULL) != -1);
 	}
 
 	return EXIT_FAILURE;
diff --git a/src/new_subid_range.c b/src/new_subid_range.c
index 1ef71f36..6c62cc08 100644
--- a/src/new_subid_range.c
+++ b/src/new_subid_range.c
@@ -2,11 +2,14 @@
 
 #include <stdio.h>
 #include <unistd.h>
+
+#include "atoi/str2i/str2u.h"
 #include "subid.h"
 #include "stdlib.h"
 #include "prototypes.h"
 #include "shadowlog.h"
 
+
 /* Test program for the subid creation routine */
 
 static const char Prog[] = "new_subid_range";
@@ -45,7 +48,7 @@ int main(int argc, char *argv[])
 	range.start = 0;
 	range.count = 65536;
 	if (argc > 1)
-		range.count = atoi(argv[1]);
+		str2ul(&range.count, argv[1]);
 	if (group)
 		ok = subid_grant_gid_range(&range, !makenew);
 	else
diff --git a/src/newgidmap.c b/src/newgidmap.c
index 96a89de7..b1bf80e2 100644
--- a/src/newgidmap.c
+++ b/src/newgidmap.c
@@ -177,7 +177,7 @@ int main(int argc, char **argv)
 		if (proc_dir_fd < 0)
 			usage();
 	}
-	/* Who am i? */
+	/* Who am I? */
 	pw = get_my_pwent ();
 	if (NULL == pw) {
 		fprintf (stderr,
diff --git a/src/newgrp.c b/src/newgrp.c
index 1b3d76b8..427ae586 100644
--- a/src/newgrp.c
+++ b/src/newgrp.c
@@ -18,14 +18,17 @@
 #include <assert.h>
 
 #include "agetpass.h"
-#include "alloc.h"
+#include "alloc/x/xmalloc.h"
+#include "chkname.h"
 #include "defines.h"
-#include "getdef.h"
-#include "prototypes.h"
 /*@-exitarg@*/
 #include "exitcodes.h"
+#include "getdef.h"
+#include "prototypes.h"
 #include "shadowlog.h"
-#include "string/sprintf.h"
+#include "string/sprintf/snprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strdup/xstrdup.h"
 
 
 /*
@@ -72,7 +75,7 @@ static bool ingroup(const char *name, struct group *gr)
 
 	look = gr->gr_mem;
 	while (*look && notfound)
-		notfound = strcmp (*look++, name);
+		notfound = !streq(*look++, name);
 
 	return !notfound;
 }
@@ -186,7 +189,7 @@ static void check_perms (const struct group *grp,
 		}
 
 		if (grp->gr_passwd[0] == '\0' ||
-		    strcmp (cpasswd, grp->gr_passwd) != 0) {
+		    !streq(cpasswd, grp->gr_passwd)) {
 #ifdef WITH_AUDIT
 			SNPRINTF(audit_buf, "authentication new-gid=%lu",
 			         (unsigned long) grp->gr_gid);
@@ -399,7 +402,7 @@ int main (int argc, char **argv)
 
 	/*
 	 * Save my name for error messages and save my real gid in case of
-	 * errors. If there is an error i have to exec a new login shell for
+	 * errors. If there is an error, I have to exec a new login shell for
 	 * the user since her old shell won't have fork'd to create the
 	 * process. Skip over the program name to the next command line
 	 * argument.
@@ -426,7 +429,7 @@ int main (int argc, char **argv)
 	 * injecting arbitrary strings into our stderr/stdout, as this can
 	 * be an exploit vector.
 	 */
-	is_newgrp = (strcmp (Basename (argv[0]), "newgrp") == 0);
+	is_newgrp = streq(Basename (argv[0]), "newgrp");
 	Prog = is_newgrp ? "newgrp" : "sg";
 
 	log_set_progname(Prog);
@@ -459,7 +462,7 @@ int main (int argc, char **argv)
 	 * for sg causes a command string to be executed.
 	 *
 	 * The next argument, if present, must be the new group name. Any
-	 * remaining remaining arguments will be used to execute a command
+	 * remaining arguments will be used to execute a command
 	 * as the named group. If the group name isn't present, I just use
 	 * the login group ID of the current user.
 	 *
@@ -470,8 +473,8 @@ int main (int argc, char **argv)
 	 *      sg [-] groupid [[-c command]
 	 */
 	if (   (argc > 0)
-	    && (   (strcmp (argv[0], "-")  == 0)
-	        || (strcmp (argv[0], "-l") == 0))) {
+	    && (   streq(argv[0], "-")
+	        || streq(argv[0], "-l"))) {
 		argc--;
 		argv++;
 		initflag = true;
@@ -482,6 +485,12 @@ int main (int argc, char **argv)
 		 * not "newgrp".
 		 */
 		if ((argc > 0) && (argv[0][0] != '-')) {
+			if (!is_valid_group_name (argv[0])) {
+				fprintf (
+					stderr, _("%s: provided group is not a valid group name\n"),
+					Prog);
+				goto failure;
+			}
 			group = argv[0];
 			argc--;
 			argv++;
@@ -497,7 +506,7 @@ int main (int argc, char **argv)
 			 * "sg group -c command" (as in the man page) or
 			 * "sg group command" (as in the usage message).
 			 */
-			if ((argc > 1) && (strcmp (argv[0], "-c") == 0)) {
+			if ((argc > 1) && streq(argv[0], "-c")) {
 				command = argv[1];
 			} else {
 				command = argv[0];
@@ -513,6 +522,12 @@ int main (int argc, char **argv)
 			usage ();
 			goto failure;
 		} else if (argv[0] != NULL) {
+			if (!is_valid_group_name (argv[0])) {
+				fprintf (
+					stderr, _("%s: provided group is not a valid group name\n"),
+					Prog);
+				goto failure;
+			}
 			group = argv[0];
 		} else {
 			/*
@@ -538,9 +553,9 @@ int main (int argc, char **argv)
 
 #ifdef HAVE_SETGROUPS
 	/*
-	 * get the current users groupset. The new group will be added to
+	 * get the current user's groupset. The new group will be added to
 	 * the concurrent groupset if there is room, otherwise you get a
-	 * nasty message but at least your real and effective group id's are
+	 * nasty message but at least your real and effective group ids are
 	 * set.
 	 */
 	/* don't use getgroups(0, 0) - it doesn't work on some systems */
@@ -575,7 +590,7 @@ int main (int argc, char **argv)
 	 * now we put her in the new group. The password file entry for her
 	 * current user id has been gotten. If there was no optional group
 	 * argument she will have her real and effective group id set to the
-	 * set to the value from her password file entry.
+	 * value from her password file entry.
 	 *
 	 * If run as newgrp, or as sg with no command, this process exec's
 	 * an interactive subshell with the effective GID of the new group.
@@ -676,8 +691,8 @@ int main (int argc, char **argv)
 #ifdef HAVE_SETGROUPS
 	/*
 	 * I am going to try to add her new group id to her concurrent group
-	 * set. If the group id is already present i'll just skip this part.
-	 * If the group doesn't fit, i'll complain loudly and skip this
+	 * set. If the group id is already present I'll just skip this part.
+	 * If the group doesn't fit, I'll complain loudly and skip this
 	 * part.
 	 */
 	for (i = 0; i < ngroups; i++) {
@@ -736,7 +751,7 @@ int main (int argc, char **argv)
 	}
 
 	/*
-	 * See if the "-c" flag was used. If it was, i just create a shell
+	 * See if the "-c" flag was used. If it was, I just create a shell
 	 * command for her using the argument that followed the "-c" flag.
 	 */
 	if (cflag) {
@@ -752,7 +767,7 @@ int main (int argc, char **argv)
 	}
 
 	/*
-	 * I have to get the pathname of her login shell. As a favor, i'll
+	 * I have to get the pathname of her login shell. As a favor, I'll
 	 * try her environment for a $SHELL value first, and then try the
 	 * password file entry. Obviously this shouldn't be in the
 	 * restricted command directory since it could be used to leave the
@@ -784,7 +799,7 @@ int main (int argc, char **argv)
 	progbase = Basename (prog);
 
 	/*
-	 * Switch back to her home directory if i am doing login
+	 * Switch back to her home directory if I am doing login
 	 * initialization.
 	 */
 	if (initflag) {
diff --git a/src/newuidmap.c b/src/newuidmap.c
index e2652b50..8deb06f0 100644
--- a/src/newuidmap.c
+++ b/src/newuidmap.c
@@ -106,7 +106,7 @@ int main(int argc, char **argv)
 			usage();
 	}
 
-	/* Who am i? */
+	/* Who am I? */
 	pw = get_my_pwent ();
 	if (NULL == pw) {
 		fprintf (stderr,
diff --git a/src/newusers.c b/src/newusers.c
index 0705b579..32d224d2 100644
--- a/src/newusers.c
+++ b/src/newusers.c
@@ -30,28 +30,32 @@
 #include <errno.h>
 #include <string.h>
 
-#include "alloc.h"
-#include "atoi/str2i.h"
+#include "alloc/reallocf.h"
+#include "atoi/getnum.h"
+#include "atoi/str2i/str2s.h"
 #ifdef ACCT_TOOLS_SETUID
 #ifdef USE_PAM
 #include "pam_defs.h"
 #endif				/* USE_PAM */
 #endif				/* ACCT_TOOLS_SETUID */
-#include "prototypes.h"
+#include "chkname.h"
 #include "defines.h"
 #include "getdef.h"
 #include "groupio.h"
 #include "nscd.h"
-#include "sssd.h"
+#include "prototypes.h"
 #include "pwio.h"
 #include "sgroupio.h"
 #include "shadowio.h"
 #ifdef ENABLE_SUBIDS
 #include "subordinateio.h"
 #endif				/* ENABLE_SUBIDS */
-#include "chkname.h"
 #include "shadowlog.h"
-#include "string/sprintf.h"
+#include "sssd.h"
+#include "string/sprintf/snprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strdup/xstrdup.h"
+#include "string/strtok/stpsep.h"
 
 
 /*
@@ -383,10 +387,16 @@ static int add_user (const char *name, uid_t uid, gid_t gid)
 	struct passwd pwent;
 
 	/* Check if this is a valid user name */
-	if (!is_valid_user_name (name)) {
-		fprintf (stderr,
-		         _("%s: invalid user name '%s': use --badname to ignore\n"),
-		         Prog, name);
+	if (!is_valid_user_name(name)) {
+		if (errno == EINVAL) {
+			fprintf(stderr,
+			        _("%s: invalid user name '%s': use --badname to ignore\n"),
+			        Prog, name);
+		} else {
+			fprintf(stderr,
+			        _("%s: invalid user name '%s'\n"),
+			        Prog, name);
+		}
 		return -1;
 	}
 
@@ -419,29 +429,29 @@ static int update_passwd (struct passwd *pwd, const char *password)
 	if (NULL != crypt_method) {
 #if defined(USE_SHA_CRYPT)
 		if (sflg) {
-			if (   (0 == strcmp (crypt_method, "SHA256"))
-				|| (0 == strcmp (crypt_method, "SHA512"))) {
+			if (   streq(crypt_method, "SHA256")
+				|| streq(crypt_method, "SHA512")) {
 				crypt_arg = &sha_rounds;
 			}
 		}
 #endif				/* USE_SHA_CRYPT */
 #if defined(USE_BCRYPT)
 		if (sflg) {
-			if (0 == strcmp (crypt_method, "BCRYPT")) {
+			if (streq(crypt_method, "BCRYPT")) {
 				crypt_arg = &bcrypt_rounds;
 			}
 		}
 #endif				/* USE_BCRYPT */
 #if defined(USE_YESCRYPT)
 		if (sflg) {
-			if (0 == strcmp (crypt_method, "YESCRYPT")) {
+			if (streq(crypt_method, "YESCRYPT")) {
 				crypt_arg = &yescrypt_cost;
 			}
 		}
 #endif				/* USE_YESCRYPT */
 	}
 
-	if ((NULL != crypt_method) && (0 == strcmp(crypt_method, "NONE"))) {
+	if ((NULL != crypt_method) && streq(crypt_method, "NONE")) {
 		pwd->pw_passwd = (char *)password;
 	} else {
 		const char *salt = crypt_make_salt (crypt_method, crypt_arg);
@@ -475,22 +485,23 @@ static int add_passwd (struct passwd *pwd, const char *password)
 	if (NULL != crypt_method) {
 #if defined(USE_SHA_CRYPT)
 		if (sflg) {
-			if (   (0 == strcmp (crypt_method, "SHA256"))
-				|| (0 == strcmp (crypt_method, "SHA512"))) {
+			if (streq(crypt_method, "SHA256")
+			    || streq(crypt_method, "SHA512"))
+			{
 				crypt_arg = &sha_rounds;
 			}
 		}
 #endif				/* USE_SHA_CRYPT */
 #if defined(USE_BCRYPT)
 		if (sflg) {
-			if (0 == strcmp (crypt_method, "BCRYPT")) {
+			if (streq(crypt_method, "BCRYPT")) {
 				crypt_arg = &bcrypt_rounds;
 			}
 		}
 #endif				/* USE_BCRYPT */
 #if defined(USE_YESCRYPT)
 		if (sflg) {
-			if (0 == strcmp (crypt_method, "YESCRYPT")) {
+			if (streq(crypt_method, "YESCRYPT")) {
 				crypt_arg = &yescrypt_cost;
 			}
 		}
@@ -516,7 +527,8 @@ static int add_passwd (struct passwd *pwd, const char *password)
 	if (NULL != sp) {
 		spent = *sp;
 		if (   (NULL != crypt_method)
-		    && (0 == strcmp(crypt_method, "NONE"))) {
+		    && streq(crypt_method, "NONE"))
+		{
 			spent.sp_pwdp = (char *)password;
 		} else {
 			const char *salt = crypt_make_salt (crypt_method,
@@ -545,7 +557,7 @@ static int add_passwd (struct passwd *pwd, const char *password)
 	 * when the entry was created, so this user would have to have had
 	 * the password set someplace else.
 	 */
-	if (strcmp (pwd->pw_passwd, "x") != 0) {
+	if (!streq(pwd->pw_passwd, "x")) {
 		return update_passwd (pwd, password);
 	}
 #else				/* USE_PAM */
@@ -556,7 +568,7 @@ static int add_passwd (struct passwd *pwd, const char *password)
 	 * The password will be updated later for all users using PAM.
 	 */
 	if (   (NULL != sp)
-	    || (strcmp (pwd->pw_passwd, "x") != 0)) {
+	    || !streq(pwd->pw_passwd, "x")) {
 		return 0;
 	}
 #endif				/* USE_PAM */
@@ -567,7 +579,7 @@ static int add_passwd (struct passwd *pwd, const char *password)
 	 */
 	spent.sp_namp = pwd->pw_name;
 #ifndef USE_PAM
-	if ((crypt_method != NULL) && (0 == strcmp(crypt_method, "NONE"))) {
+	if ((crypt_method != NULL) && streq(crypt_method, "NONE")) {
 		spent.sp_pwdp = (char *)password;
 	} else {
 		const char *salt = crypt_make_salt (crypt_method, crypt_arg);
@@ -673,19 +685,19 @@ static void process_flags (int argc, char **argv)
 				usage (EXIT_FAILURE);
 			}
 #if defined(USE_SHA_CRYPT)
-			if (  (   ((0 == strcmp (crypt_method, "SHA256")) || (0 == strcmp (crypt_method, "SHA512")))
+			if (  (   (streq(crypt_method, "SHA256") || streq(crypt_method, "SHA512"))
 			       && (-1 == str2sl(&sha_rounds, optarg)))) {
                             bad_s = 1;
                         }
 #endif				/* USE_SHA_CRYPT */
 #if defined(USE_BCRYPT)
-                        if ((   (0 == strcmp (crypt_method, "BCRYPT"))
+                        if ((   streq(crypt_method, "BCRYPT")
 			       && (-1 == str2sl(&bcrypt_rounds, optarg)))) {
                             bad_s = 1;
                         }
 #endif				/* USE_BCRYPT */
 #if defined(USE_YESCRYPT)
-                        if ((   (0 == strcmp (crypt_method, "YESCRYPT"))
+                        if ((   streq(crypt_method, "YESCRYPT")
 			       && (-1 == str2sl(&yescrypt_cost, optarg)))) {
                             bad_s = 1;
                         }
@@ -742,18 +754,18 @@ static void check_flags (void)
 #endif				/* USE_SHA_CRYPT || USE_BCRYPT || USE_YESCRYPT */
 
 	if (cflg) {
-		if (   (0 != strcmp (crypt_method, "DES"))
-		    && (0 != strcmp (crypt_method, "MD5"))
-		    && (0 != strcmp (crypt_method, "NONE"))
+		if (   !streq(crypt_method, "DES")
+		    && !streq(crypt_method, "MD5")
+		    && !streq(crypt_method, "NONE")
 #ifdef USE_SHA_CRYPT
-		    && (0 != strcmp (crypt_method, "SHA256"))
-		    && (0 != strcmp (crypt_method, "SHA512"))
+		    && !streq(crypt_method, "SHA256")
+		    && !streq(crypt_method, "SHA512")
 #endif				/* USE_SHA_CRYPT */
 #ifdef USE_BCRYPT
-		    && (0 != strcmp (crypt_method, "BCRYPT"))
+		    && !streq(crypt_method, "BCRYPT")
 #endif				/* USE_BCRYPT */
 #ifdef USE_YESCRYPT
-		    && (0 != strcmp (crypt_method, "YESCRYPT"))
+		    && !streq(crypt_method, "YESCRYPT")
 #endif				/* USE_YESCRYPT */
 		    ) {
 			fprintf (stderr,
@@ -1099,15 +1111,11 @@ int main (int argc, char **argv)
 	 */
 	while (fgets (buf, sizeof buf, stdin) != NULL) {
 		line++;
-		cp = strrchr (buf, '\n');
-		if (cp == NULL && feof (stdin) == 0) {
+		if (stpsep(buf, "\n") == NULL && feof(stdin) == 0) {
 			fprintf (stderr, _("%s: line %d: line too long\n"),
 				 Prog, line);
 			fail_exit (EXIT_FAILURE);
 		}
-		if (cp != NULL) {
-			*cp = '\0';
-		}
 
 		/*
 		 * Break the string into fields and screw around with them.
@@ -1115,13 +1123,9 @@ int main (int argc, char **argv)
 		 * values aren't that particular.
 		 */
 		for (cp = buf, nfields = 0; nfields < 7; nfields++) {
-			fields[nfields] = cp;
-			cp = strchr (cp, ':');
+			fields[nfields] = strsep(&cp, ":");
 			if (cp == NULL)
 				break;
-
-			*cp = '\0';
-			cp++;
 		}
 		if (nfields != 6) {
 			fprintf (stderr, _("%s: line %d: invalid line\n"),
@@ -1209,8 +1213,8 @@ int main (int argc, char **argv)
 			fail_exit (EXIT_FAILURE);
 		}
 		lines[nusers-1]     = line;
-		usernames[nusers-1] = strdup (fields[0]);
-		passwords[nusers-1] = strdup (fields[1]);
+		usernames[nusers-1] = xstrdup(fields[0]);
+		passwords[nusers-1] = xstrdup(fields[1]);
 #endif				/* USE_PAM */
 		if (add_passwd (&newpw, fields[1]) != 0) {
 			fprintf (stderr,
diff --git a/src/passwd.c b/src/passwd.c
index 2999a3c8..e75b0b94 100644
--- a/src/passwd.c
+++ b/src/passwd.c
@@ -21,23 +21,25 @@
 #include <time.h>
 
 #include "agetpass.h"
-#include "alloc.h"
-#include "atoi/str2i.h"
+#include "atoi/a2i/a2s.h"
+#include "chkname.h"
 #include "defines.h"
 #include "getdef.h"
-#include "memzero.h"
 #include "nscd.h"
-#include "sssd.h"
 #include "prototypes.h"
 #include "pwauth.h"
 #include "pwio.h"
 #include "shadowio.h"
 #include "shadowlog.h"
-#include "string/strtcpy.h"
+#include "sssd.h"
+#include "string/memset/memzero.h"
+#include "string/sprintf/xasprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strcpy/strtcpy.h"
+#include "string/strdup/xstrdup.h"
 #include "time/day_to_str.h"
 
 
-
 /*
  * exit status values
  */
@@ -211,7 +213,7 @@ static int new_password (const struct passwd *pw)
 			return -1;
 		}
 
-		if (strcmp (cipher, crypt_passwd) != 0) {
+		if (!streq(cipher, crypt_passwd)) {
 			erase_pass (clear);
 			strzero (cipher);
 			SYSLOG ((LOG_WARN, "incorrect password for %s",
@@ -226,7 +228,7 @@ static int new_password (const struct passwd *pw)
 		erase_pass (clear);
 		strzero (cipher);
 	} else {
-		orig[0] = '\0';
+		strcpy(orig, "");
 	}
 
 	/*
@@ -241,16 +243,16 @@ static int new_password (const struct passwd *pw)
 			pass_max_len = getdef_num ("PASS_MAX_LEN", 8);
 		}
 	} else {
-		if (   (strcmp (method, "MD5")    == 0)
+		if (   streq(method, "MD5")
 #ifdef USE_SHA_CRYPT
-		    || (strcmp (method, "SHA256") == 0)
-		    || (strcmp (method, "SHA512") == 0)
+		    || streq(method, "SHA256")
+		    || streq(method, "SHA512")
 #endif /* USE_SHA_CRYPT */
 #ifdef USE_BCRYPT
-		    || (strcmp (method, "BCRYPT") == 0)
+		    || streq(method, "BCRYPT")
 #endif /* USE_BCRYPT*/
 #ifdef USE_YESCRYPT
-		    || (strcmp (method, "YESCRYPT") == 0)
+		    || streq(method, "YESCRYPT")
 #endif /* USE_YESCRYPT*/
 
 		    ) {
@@ -297,7 +299,7 @@ static int new_password (const struct passwd *pw)
 				MEMZERO(pass);
 				return -1;
 			}
-			if (warned && (strcmp (pass, cp) != 0)) {
+			if (warned && !streq(pass, cp)) {
 				warned = false;
 			}
 			ret = STRTCPY (pass, cp);
@@ -331,7 +333,7 @@ static int new_password (const struct passwd *pw)
 				MEMZERO(pass);
 				return -1;
 			}
-			if (strcmp (cp, pass) != 0) {
+			if (!streq(cp, pass)) {
 				erase_pass (cp);
 				(void) fputs (_("They don't match; try again.\n"), stderr);
 			} else {
@@ -514,9 +516,8 @@ static char *update_crypt_pw (char *cp)
 		}
 	}
 
-	if (dflg) {
-		*cp = '\0';
-	}
+	if (dflg)
+		strcpy(cp, "");
 
 	if (uflg && *cp == '!') {
 		if (cp[1] == '\0') {
@@ -531,10 +532,9 @@ static char *update_crypt_pw (char *cp)
 	}
 
 	if (lflg && *cp != '!') {
-		char *newpw = XMALLOC(strlen(cp) + 2, char);
+		char  *newpw;
 
-		strcpy (newpw, "!");
-		strcat (newpw, cp);
+		xasprintf(&newpw, "!%s", cp);
 		if (!use_pam)
 		{
 			if (do_update_pwd) {
@@ -723,7 +723,8 @@ static void update_shadow (void)
  * 	appropriate internal format. For finer resolute the chage
  *	command must be used.
  */
-int main (int argc, char **argv)
+int
+main(int argc, char **argv)
 {
 	const struct passwd *pw;	/* Password file entry for user      */
 
@@ -801,8 +802,9 @@ int main (int argc, char **argv)
 				usage (E_SUCCESS);
 				/*@notreached@*/break;
 			case 'i':
-				if (   (str2sl(&inact, optarg) == -1)
-				    || (inact < -1)) {
+				if (a2sl(&inact, optarg, NULL, 0, -1, LONG_MAX)
+				    == -1)
+				{
 					fprintf (stderr,
 					         _("%s: invalid numeric argument '%s'\n"),
 					         Prog, optarg);
@@ -820,8 +822,9 @@ int main (int argc, char **argv)
 				anyflag = true;
 				break;
 			case 'n':
-				if (   (str2sl(&age_min, optarg) == -1)
-				    || (age_min < -1)) {
+				if (a2sl(&age_min, optarg, NULL, 0, -1, LONG_MAX)
+				    == -1)
+				{
 					fprintf (stderr,
 					         _("%s: invalid numeric argument '%s'\n"),
 					         Prog, optarg);
@@ -836,7 +839,7 @@ int main (int argc, char **argv)
 			case 'r':
 				/* -r repository (files|nis|nisplus) */
 				/* only "files" supported for now */
-				if (strcmp (optarg, "files") != 0) {
+				if (!streq(optarg, "files")) {
 					fprintf (stderr,
 					         _("%s: repository %s not supported\n"),
 						 Prog, optarg);
@@ -855,8 +858,9 @@ int main (int argc, char **argv)
 				anyflag = true;
 				break;
 			case 'w':
-				if (   (str2sl(&warn, optarg) == -1)
-				    || (warn < -1)) {
+				if (a2sl(&warn, optarg, NULL, 0, -1, LONG_MAX)
+				    == -1)
+				{
 					(void) fprintf (stderr,
 					                _("%s: invalid numeric argument '%s'\n"),
 					                Prog, optarg);
@@ -866,8 +870,9 @@ int main (int argc, char **argv)
 				anyflag = true;
 				break;
 			case 'x':
-				if (   (str2sl(&age_max, optarg) == -1)
-				    || (age_max < -1)) {
+				if (a2sl(&age_max, optarg, NULL, 0, -1, LONG_MAX)
+				    == -1)
+				{
 					(void) fprintf (stderr,
 					                _("%s: invalid numeric argument '%s'\n"),
 					                Prog, optarg);
@@ -907,6 +912,10 @@ int main (int argc, char **argv)
 	}
 	myname = xstrdup (pw->pw_name);
 	if (optind < argc) {
+		if (!is_valid_user_name (argv[optind])) {
+			fprintf (stderr, _("%s: Provided user name is not a valid name\n"), Prog);
+			fail_exit (E_NOPERM);
+		}
 		name = argv[optind];
 	} else {
 		name = myname;
diff --git a/src/pwck.c b/src/pwck.c
index 70ff5e68..271a2c21 100644
--- a/src/pwck.c
+++ b/src/pwck.c
@@ -13,23 +13,26 @@
 #ident "$Id$"
 
 #include <fcntl.h>
+#include <getopt.h>
 #include <grp.h>
 #include <pwd.h>
 #include <stdio.h>
-#include <getopt.h>
+
 #include "chkname.h"
 #include "commonio.h"
 #include "defines.h"
+#include "getdef.h"
+#include "nscd.h"
 #include "prototypes.h"
 #include "pwio.h"
 #include "shadowio.h"
-#include "getdef.h"
-#include "nscd.h"
+#include "shadowlog.h"
 #include "sssd.h"
+#include "string/strcmp/streq.h"
 #ifdef WITH_TCB
 #include "tcbfuncs.h"
 #endif				/* WITH_TCB */
-#include "shadowlog.h"
+
 
 /*
  * Exit codes
@@ -447,7 +450,7 @@ static void check_pw_file (int *errors, bool *changed)
 				continue;
 			}
 
-			if (strcmp (pwd->pw_name, ent->pw_name) != 0) {
+			if (!streq(pwd->pw_name, ent->pw_name)) {
 				continue;
 			}
 
@@ -471,9 +474,14 @@ static void check_pw_file (int *errors, bool *changed)
 		 * Check for invalid usernames.  --marekm
 		 */
 
-		if (!is_valid_user_name (pwd->pw_name)) {
-			printf (_("invalid user name '%s': use --badname to ignore\n"),
-					pwd->pw_name);
+		if (!is_valid_user_name(pwd->pw_name)) {
+			if (errno == EINVAL) {
+				printf(_("invalid user name '%s': use --badname to ignore\n"),
+				       pwd->pw_name);
+			} else {
+				printf(_("invalid user name '%s'\n"),
+				       pwd->pw_name);
+			}
 			*errors += 1;
 		}
 
@@ -513,7 +521,7 @@ static void check_pw_file (int *errors, bool *changed)
 				/*
 				 * Home directory does not exist, give a warning (unless intentional)
 				 */
-				if (NULL == nonexistent || strcmp (pwd->pw_dir, nonexistent) != 0) {
+				if (NULL == nonexistent || !streq(pwd->pw_dir, nonexistent)) {
 					printf (_("user '%s': directory '%s' does not exist\n"),
 							pwd->pw_name, pwd->pw_dir);
 					*errors += 1;
@@ -639,8 +647,7 @@ static void check_pw_file (int *errors, bool *changed)
 				 * Make sure no passwords are in passwd.
 				 */
 				if (   !quiet
-				    && (strcmp (pwd->pw_passwd,
-				                SHADOW_PASSWD_STRING) != 0)) {
+				    && !streq(pwd->pw_passwd, SHADOW_PASSWD_STRING)) {
 					printf (_("user %s has an entry in %s, but its password field in %s is not set to 'x'\n"),
 					        pwd->pw_name, spw_dbname (), pw_dbname ());
 					*errors += 1;
@@ -768,7 +775,7 @@ static void check_spw_file (int *errors, bool *changed)
 				continue;
 			}
 
-			if (strcmp (spw->sp_namp, ent->sp_namp) != 0) {
+			if (!streq(spw->sp_namp, ent->sp_namp)) {
 				continue;
 			}
 
diff --git a/src/pwconv.c b/src/pwconv.c
index 7dd327ae..1bb92752 100644
--- a/src/pwconv.c
+++ b/src/pwconv.c
@@ -47,12 +47,14 @@
 
 #include "defines.h"
 #include "getdef.h"
+#include "nscd.h"
 #include "prototypes.h"
 #include "pwio.h"
-#include "shadowio.h"
-#include "nscd.h"
 #include "sssd.h"
+#include "shadowio.h"
 #include "shadowlog.h"
+#include "string/strcmp/streq.h"
+
 
 /*
  * exit status values
@@ -231,7 +233,7 @@ int main (int argc, char **argv)
 		sp = spw_locate (pw->pw_name);
 		if (NULL != sp) {
 			/* do we need to update this entry? */
-			if (strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING) == 0) {
+			if (streq(pw->pw_passwd, SHADOW_PASSWD_STRING)) {
 				continue;
 			}
 			/* update existing shadow entry */
diff --git a/src/pwunconv.c b/src/pwunconv.c
index fe18113a..2e4d3d75 100644
--- a/src/pwunconv.c
+++ b/src/pwunconv.c
@@ -17,16 +17,19 @@
 #include <sys/types.h>
 #include <unistd.h>
 #include <getopt.h>
+
 #include "defines.h"
+/*@-exitarg@*/
+#include "exitcodes.h"
 #include "getdef.h"
 #include "nscd.h"
-#include "sssd.h"
 #include "prototypes.h"
 #include "pwio.h"
 #include "shadowio.h"
-/*@-exitarg@*/
-#include "exitcodes.h"
 #include "shadowlog.h"
+#include "sssd.h"
+#include "string/strcmp/streq.h"
+
 
 /*
  * Global variables
@@ -180,7 +183,7 @@ int main (int argc, char **argv)
 		/*
 		 * Update password if non-shadow is "x".
 		 */
-		if (strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING) == 0) {
+		if (streq(pw->pw_passwd, SHADOW_PASSWD_STRING)) {
 			pwent.pw_passwd = spwd->sp_pwdp;
 		}
 
diff --git a/src/su.c b/src/su.c
index 80c08597..67195ea0 100644
--- a/src/su.c
+++ b/src/su.c
@@ -46,21 +46,24 @@
 #include <fcntl.h>
 #endif				/* !USE_PAM */
 
-#include "alloc.h"
+#include "alloc/x/xmalloc.h"
 #include "attr.h"
 #include "cast.h"
-#include "prototypes.h"
 #include "defines.h"
-#include "pwauth.h"
+/*@-exitarg@*/
+#include "exitcodes.h"
 #include "getdef.h"
 #ifdef USE_PAM
 #include "pam_defs.h"
 #endif				/* USE_PAM */
-/*@-exitarg@*/
-#include "exitcodes.h"
+#include "pwauth.h"
+#include "prototypes.h"
 #include "shadowlog.h"
-#include "string/sprintf.h"
-#include "string/strtcpy.h"
+#include "string/sprintf/snprintf.h"
+#include "string/sprintf/xasprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strcpy/strtcpy.h"
+#include "string/strdup/xstrdup.h"
 
 
 /*
@@ -126,7 +129,7 @@ static void check_perms_pam (const struct passwd *pw);
 #else				/* !USE_PAM */
 static void check_perms_nopam (const struct passwd *pw);
 #endif				/* !USE_PAM */
-static void save_caller_context (char **argv);
+static void save_caller_context(void);
 static void process_flags (int argc, char **argv);
 static void set_environment (struct passwd *pw);
 
@@ -184,7 +187,7 @@ static bool restricted_shell (const char *shellname)
 
 	setusershell ();
 	while ((line = getusershell ()) != NULL) {
-		if (('#' != *line) && (strcmp (line, shellname) == 0)) {
+		if (('#' != *line) && streq(line, shellname)) {
 			endusershell ();
 			return false;
 		}
@@ -509,17 +512,17 @@ static void check_perms_nopam (const struct passwd *pw)
 		return;
 	}
 
-	if (strcmp (pw->pw_passwd, "") == 0) {
+	if (streq(pw->pw_passwd, "")) {
 		const char  *prevent_no_auth = getdef_str("PREVENT_NO_AUTH");
 
 		if (prevent_no_auth == NULL) {
 			prevent_no_auth = "superuser";
 		}
-		if (strcmp(prevent_no_auth, "yes") == 0) {
+		if (streq(prevent_no_auth, "yes")) {
 			fprintf(stderr, _("Password field is empty, this is forbidden for all accounts.\n"));
 			exit(1);
 		} else if ((pw->pw_uid == 0)
-				&& (strcmp(prevent_no_auth, "superuser") == 0)) {
+				&& streq(prevent_no_auth, "superuser")) {
 			fprintf(stderr, _("Password field is empty, this is forbidden for super-user.\n"));
 			exit(1);
 		}
@@ -553,7 +556,7 @@ static void check_perms_nopam (const struct passwd *pw)
 	}
 	spwd = getspnam (name); /* !USE_PAM, no need for xgetspnam */
 #ifdef SU_ACCESS
-	if (strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING) == 0) {
+	if (streq(pw->pw_passwd, SHADOW_PASSWD_STRING)) {
 		if (NULL != spwd) {
 			password = spwd->sp_pwdp;
 		}
@@ -678,7 +681,7 @@ static /*@only@*/struct passwd * do_check_perms (void)
 		su_failure (caller_tty, 0 == pw->pw_uid);
 	}
 	tmp_name = item;
-	if (strcmp (name, tmp_name) != 0) {
+	if (!streq(name, tmp_name)) {
 		SYSLOG ((LOG_INFO,
 		         "Change user from '%s' to '%s' as requested by PAM",
 		         name, tmp_name));
@@ -722,6 +725,7 @@ static /*@only@*/struct passwd * do_check_perms (void)
 	return pw;
 }
 
+
 /*
  * save_caller_context - save information from the call context
  *
@@ -730,7 +734,8 @@ static /*@only@*/struct passwd * do_check_perms (void)
  *	the TTY (ttyp), and whether su was called from a console
  *	(is_console) for further processing and before they might change.
  */
-static void save_caller_context (char **argv)
+static void
+save_caller_context(void)
 {
 	struct passwd *pw = NULL;
 #ifndef USE_PAM
@@ -788,7 +793,7 @@ static void save_caller_context (char **argv)
 	 * -- chris
 	 */
 	password = pw->pw_passwd;
-	if (strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING) == 0) {
+	if (streq(pw->pw_passwd, SHADOW_PASSWD_STRING)) {
 		const struct spwd *spwd = getspnam (caller_name);
 		if (NULL != spwd) {
 			password = spwd->sp_pwdp;
@@ -801,6 +806,7 @@ static void save_caller_context (char **argv)
 	pw_free (pw);
 }
 
+
 /*
  * process_flags - Process the command line arguments
  *
@@ -848,7 +854,7 @@ static void process_flags (int argc, char **argv)
 		}
 	}
 
-	if ((optind < argc) && (strcmp (argv[optind], "-") == 0)) {
+	if ((optind < argc) && streq(argv[optind], "-")) {
 		fakelogin = true;
 		optind++;
 	}
@@ -1013,7 +1019,7 @@ int main (int argc, char **argv)
 	(void) bindtextdomain (PACKAGE, LOCALEDIR);
 	(void) textdomain (PACKAGE);
 
-	save_caller_context (argv);
+	save_caller_context();
 
 	OPENLOG (Prog);
 
@@ -1198,17 +1204,14 @@ int main (int argc, char **argv)
 	 * case they will be provided to the new user's shell as arguments.
 	 */
 	if (fakelogin) {
-		char *arg0;
+		char  *arg0;
 
 		cp = getdef_str ("SU_NAME");
 		if (NULL == cp) {
 			cp = Basename (shellstr);
 		}
 
-		arg0 = XMALLOC(strlen(cp) + 2, char);
-		arg0[0] = '-';
-		strcpy (arg0 + 1, cp);
-		cp = arg0;
+		xasprintf(&arg0, "-%s", cp);
 	} else {
 		cp = Basename (shellstr);
 	}
diff --git a/src/suauth.c b/src/suauth.c
index 4d631904..936b3a2f 100644
--- a/src/suauth.c
+++ b/src/suauth.c
@@ -8,13 +8,21 @@
  */
 
 #include <config.h>
+
 #include <errno.h>
 #include <grp.h>
 #include <pwd.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
+
 #include "defines.h"
 #include "prototypes.h"
+#include "string/strchr/stpspn.h"
+#include "string/strchr/strrspn.h"
+#include "string/strcmp/streq.h"
+#include "string/strtok/stpsep.h"
+
 
 #ifndef SUAUTHFILE
 #define SUAUTHFILE "/etc/suauth"
@@ -37,12 +45,9 @@ static int isgrp (const char *, const char *);
 static int lines = 0;
 
 
-int check_su_auth (const char *actual_id,
-                   const char *wanted_id,
-                   bool su_to_root)
+int
+check_su_auth(const char *actual_id, const char *wanted_id, bool su_to_root)
 {
-	int posn, endline;
-	const char field[] = ":";
 	FILE *authfile_fd;
 	char temp[1024];
 	char *to_users;
@@ -67,34 +72,27 @@ int check_su_auth (const char *actual_id,
 	}
 
 	while (fgets (temp, sizeof (temp), authfile_fd) != NULL) {
-		lines++;
-		endline = strlen(temp) - 1;
+		char  *p;
 
-		if (temp[0] == '\0' || temp[endline] != '\n') {
+		lines++;
+
+		if (stpsep(temp, "\n") == NULL) {
 			SYSLOG ((LOG_ERR,
 				 "%s, line %d: line too long or missing newline",
 				 SUAUTHFILE, lines));
 			continue;
 		}
 
-		while (endline > 0 && (temp[endline - 1] == ' '
-				       || temp[endline - 1] == '\t'
-				       || temp[endline - 1] == '\n'))
-			endline--;
-		temp[endline] = '\0';
+		stpcpy(strrspn(temp, " \t"), "");
 
-		posn = 0;
-		while (temp[posn] == ' ' || temp[posn] == '\t')
-			posn++;
-
-		if (temp[posn] == '\n' || temp[posn] == '#'
-		    || temp[posn] == '\0') {
+		p = stpspn(temp, " \t");
+		if (*p == '#' || *p == '\0')
 			continue;
-		}
-		if (!(to_users = strtok (temp + posn, field))
-		    || !(from_users = strtok (NULL, field))
-		    || !(action = strtok (NULL, field))
-		    || strtok (NULL, field)) {
+
+		to_users = strsep(&p, ":");
+		from_users = strsep(&p, ":");
+		action = strsep(&p, ":");
+		if (action == NULL || p != NULL) {
 			SYSLOG ((LOG_ERR,
 				 "%s, line %d. Bad number of fields.\n",
 				 SUAUTHFILE, lines));
@@ -105,7 +103,7 @@ int check_su_auth (const char *actual_id,
 			continue;
 		if (!applies (actual_id, from_users))
 			continue;
-		if (!strcmp (action, "DENY")) {
+		if (streq(action, "DENY")) {
 			SYSLOG ((su_to_root ? LOG_WARN : LOG_NOTICE,
 				 "DENIED su from '%s' to '%s' (%s)\n",
 				 actual_id, wanted_id, SUAUTHFILE));
@@ -113,14 +111,14 @@ int check_su_auth (const char *actual_id,
 			       stderr);
 			fclose (authfile_fd);
 			return DENY;
-		} else if (!strcmp (action, "NOPASS")) {
+		} else if (streq(action, "NOPASS")) {
 			SYSLOG ((su_to_root ? LOG_NOTICE : LOG_INFO,
 				 "NO password asked for su from '%s' to '%s' (%s)\n",
 				 actual_id, wanted_id, SUAUTHFILE));
 			fputs (_("Password authentication bypassed.\n"),stderr);
 			fclose (authfile_fd);
 			return NOPWORD;
-		} else if (!strcmp (action, "OWNPASS")) {
+		} else if (streq(action, "OWNPASS")) {
 			SYSLOG ((su_to_root ? LOG_NOTICE : LOG_INFO,
 				 "su from '%s' to '%s': asking for user's own password (%s)\n",
 				 actual_id, wanted_id, SUAUTHFILE));
@@ -138,17 +136,16 @@ int check_su_auth (const char *actual_id,
 	return NOACTION;
 }
 
-static int applies (const char *single, char *list)
+static int
+applies(const char *single, char *list)
 {
-	const char split[] = ", ";
 	char *tok;
 
 	int state = 0;
 
-	for (tok = strtok (list, split); tok != NULL;
-	     tok = strtok (NULL, split)) {
+	while (NULL != (tok = strsep(&list, ", "))) {
 
-		if (!strcmp (tok, "ALL")) {
+		if (streq(tok, "ALL")) {
 			if (state != 0) {
 				SYSLOG ((LOG_ERR,
 					 "%s, line %d: ALL in bad place\n",
@@ -156,7 +153,7 @@ static int applies (const char *single, char *list)
 				return 0;
 			}
 			state = 1;
-		} else if (!strcmp (tok, "EXCEPT")) {
+		} else if (streq(tok, "EXCEPT")) {
 			if (state != 1) {
 				SYSLOG ((LOG_ERR,
 					 "%s, line %d: EXCEPT in bas place\n",
@@ -164,7 +161,7 @@ static int applies (const char *single, char *list)
 				return 0;
 			}
 			state = 2;
-		} else if (!strcmp (tok, "GROUP")) {
+		} else if (streq(tok, "GROUP")) {
 			if ((state != 0) && (state != 2)) {
 				SYSLOG ((LOG_ERR,
 					 "%s, line %d: GROUP in bad place\n",
@@ -175,7 +172,7 @@ static int applies (const char *single, char *list)
 		} else {
 			switch (state) {
 			case 0:	/* No control words yet */
-				if (!strcmp (tok, single))
+				if (streq(tok, single))
 					return 1;
 				break;
 			case 1:	/* An all */
@@ -184,7 +181,7 @@ static int applies (const char *single, char *list)
 					 SUAUTHFILE, lines));
 				return 0;
 			case 2:	/* All except */
-				if (!strcmp (tok, single))
+				if (streq(tok, single))
 					return 0;
 				break;
 			case 3:	/* Group */
diff --git a/src/sulogin.c b/src/sulogin.c
index 20971743..6af471b5 100644
--- a/src/sulogin.c
+++ b/src/sulogin.c
@@ -19,7 +19,6 @@
 #include <sys/types.h>
 
 #include "agetpass.h"
-#include "alloc.h"
 #include "attr.h"
 #include "defines.h"
 #include "getdef.h"
@@ -28,6 +27,7 @@
 /*@-exitarg@*/
 #include "exitcodes.h"
 #include "shadowlog.h"
+#include "string/strdup/xstrdup.h"
 
 
 /*
diff --git a/src/useradd.c b/src/useradd.c
index 347334a6..891fd142 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -36,16 +36,15 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "alloc.h"
-#include "atoi/str2i.h"
+#include "alloc/x/xmalloc.h"
+#include "atoi/a2i/a2s.h"
+#include "atoi/getnum.h"
 #include "chkname.h"
 #include "defines.h"
 #include "faillog.h"
 #include "getdef.h"
 #include "groupio.h"
-#include "memzero.h"
 #include "nscd.h"
-#include "sssd.h"
 #include "prototypes.h"
 #include "pwauth.h"
 #include "pwio.h"
@@ -64,7 +63,13 @@
 #include "tcbfuncs.h"
 #endif
 #include "shadowlog.h"
-#include "string/sprintf.h"
+#include "sssd.h"
+#include "string/memset/memzero.h"
+#include "string/sprintf/snprintf.h"
+#include "string/sprintf/xasprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strdup/xstrdup.h"
+#include "string/strtok/stpsep.h"
 
 
 #ifndef SKEL_DIR
@@ -197,16 +202,16 @@ static bool home_added = false;
 #define E_SUB_GID_UPDATE 18	/* can't update the subordinate gid file */
 #endif				/* ENABLE_SUBIDS */
 
-#define DGROUP			"GROUP="
-#define DGROUPS			"GROUPS="
-#define DHOME			"HOME="
-#define DSHELL			"SHELL="
-#define DINACT			"INACTIVE="
-#define DEXPIRE			"EXPIRE="
-#define DSKEL			"SKEL="
-#define DUSRSKEL		"USRSKEL="
-#define DCREATE_MAIL_SPOOL	"CREATE_MAIL_SPOOL="
-#define DLOG_INIT	"LOG_INIT="
+#define DGROUP			"GROUP"
+#define DGROUPS			"GROUPS"
+#define DHOME			"HOME"
+#define DSHELL			"SHELL"
+#define DINACT			"INACTIVE"
+#define DEXPIRE			"EXPIRE"
+#define DSKEL			"SKEL"
+#define DUSRSKEL		"USRSKEL"
+#define DCREATE_MAIL_SPOOL	"CREATE_MAIL_SPOOL"
+#define DLOG_INIT		"LOG_INIT"
 
 /* local function prototypes */
 NORETURN static void fail_exit (int);
@@ -238,7 +243,7 @@ static void create_home (void);
 static void create_mail (void);
 static void check_uid_range(int rflg, uid_t user_id);
 
-static FILE *fmkstemp(char *template);
+static FILE *fmkomstemp(char *template, unsigned int flags, mode_t m);
 
 
 /*
@@ -322,8 +327,6 @@ static void fail_exit (int code)
 	exit(code);
 }
 
-#define MATCH(x,y) (strncmp((x),(y),strlen(y)) == 0)
-
 /*
  * get_defaults - read the defaults file
  *
@@ -331,7 +334,8 @@ static void fail_exit (int code)
  *	various values from the file, or uses built-in default values if the
  *	file does not exist.
  */
-static void get_defaults (void)
+static void
+get_defaults(void)
 {
 	FILE        *fp;
 	char        *default_file = USER_DEFAULTS_FILE;
@@ -358,29 +362,23 @@ static void get_defaults (void)
 	 * values are used, everything else can be ignored.
 	 */
 	while (fgets (buf, sizeof buf, fp) == buf) {
-		cp = strrchr (buf, '\n');
-		if (NULL != cp) {
-			*cp = '\0';
-		}
+		stpsep(buf, "\n");
 
-		cp = strchr (buf, '=');
-		if (NULL == cp) {
+		cp = stpsep(buf, "=");
+		if (NULL == cp)
 			continue;
-		}
-
-		cp++;
 
 		/*
 		 * Primary GROUP identifier
 		 */
-		if (MATCH (buf, DGROUP)) {
+		if (streq(buf, DGROUP)) {
 			const struct group *grp = prefix_getgr_nam_gid (cp);
 			if (NULL == grp) {
 				fprintf (stderr,
 				         _("%s: group '%s' does not exist\n"),
 				         Prog, cp);
 				fprintf (stderr,
-				         _("%s: the %s configuration in %s will be ignored\n"),
+				         _("%s: the %s= configuration in %s will be ignored\n"),
 				         Prog, DGROUP, default_file);
 			} else {
 				def_group = grp->gr_gid;
@@ -390,10 +388,10 @@ static void get_defaults (void)
 
 		ccp = cp;
 
-		if (MATCH (buf, DGROUPS)) {
+		if (streq(buf, DGROUPS)) {
 			if (get_groups (cp) != 0) {
 				fprintf (stderr,
-				         _("%s: the '%s' configuration in %s has an invalid group, ignoring the bad group\n"),
+				         _("%s: the '%s=' configuration in %s has an invalid group, ignoring the bad group\n"),
 				         Prog, DGROUPS, default_file);
 			}
 			if (user_groups[0] != NULL) {
@@ -404,28 +402,27 @@ static void get_defaults (void)
 		/*
 		 * Default HOME filesystem
 		 */
-		else if (MATCH (buf, DHOME)) {
+		else if (streq(buf, DHOME)) {
 			def_home = xstrdup(ccp);
 		}
 
 		/*
 		 * Default Login Shell command
 		 */
-		else if (MATCH (buf, DSHELL)) {
+		else if (streq(buf, DSHELL)) {
 			def_shell = xstrdup(ccp);
 		}
 
 		/*
 		 * Default Password Inactive value
 		 */
-		else if (MATCH (buf, DINACT)) {
-			if (   (str2sl(&def_inactive, ccp) == -1)
-			    || (def_inactive < -1)) {
+		else if (streq(buf, DINACT)) {
+			if (a2sl(&def_inactive, ccp, NULL, 0, -1, LONG_MAX) == -1) {
 				fprintf (stderr,
 				         _("%s: invalid numeric argument '%s'\n"),
 				         Prog, ccp);
 				fprintf (stderr,
-				         _("%s: the %s configuration in %s will be ignored\n"),
+				         _("%s: the %s= configuration in %s will be ignored\n"),
 				         Prog, DINACT, default_file);
 				def_inactive = -1;
 			}
@@ -434,14 +431,14 @@ static void get_defaults (void)
 		/*
 		 * Default account expiration date
 		 */
-		else if (MATCH (buf, DEXPIRE)) {
+		else if (streq(buf, DEXPIRE)) {
 			def_expire = xstrdup(ccp);
 		}
 
 		/*
 		 * Default Skeleton information
 		 */
-		else if (MATCH (buf, DSKEL)) {
+		else if (streq(buf, DSKEL)) {
 			if ('\0' == *ccp)
 				ccp = SKEL_DIR;
 
@@ -458,7 +455,7 @@ static void get_defaults (void)
 		/*
 		 * Default Usr Skeleton information
 		 */
-		else if (MATCH (buf, DUSRSKEL)) {
+		else if (streq(buf, DUSRSKEL)) {
 			if ('\0' == *ccp)
 				ccp = USRSKELDIR;
 
@@ -474,7 +471,7 @@ static void get_defaults (void)
 		/*
 		 * Create by default user mail spool or not ?
 		 */
-		else if (MATCH (buf, DCREATE_MAIL_SPOOL)) {
+		else if (streq(buf, DCREATE_MAIL_SPOOL)) {
 			if (*ccp == '\0')
 				ccp = "no";
 
@@ -484,7 +481,7 @@ static void get_defaults (void)
 		/*
 		 * By default do we add the user to the lastlog and faillog databases ?
 		 */
-		else if (MATCH (buf, DLOG_INIT)) {
+		else if (streq(buf, DLOG_INIT)) {
 			if (*ccp == '\0')
 				ccp = def_log_init;
 
@@ -525,7 +522,8 @@ static void show_defaults (void)
  *	are currently set. Duplicated lines are pruned, missing lines are
  *	added, and unrecognized lines are copied as is.
  */
-static int set_defaults (void)
+static int
+set_defaults(void)
 {
 	int   ret = -1;
 	bool  out_group = false;
@@ -584,7 +582,7 @@ static int set_defaults (void)
 	/*
 	 * Create a temporary file to copy the new output to.
 	 */
-	ofp = fmkstemp(new_file);
+	ofp = fmkomstemp(new_file, 0, 0644);
 	if (NULL == ofp) {
 		fprintf (stderr,
 		         _("%s: cannot open new defaults file\n"),
@@ -604,10 +602,9 @@ static int set_defaults (void)
 	}
 
 	while (fgets (buf, sizeof buf, ifp) == buf) {
-		cp = strrchr (buf, '\n');
-		if (NULL != cp) {
-			*cp = '\0';
-		} else {
+		char  *val;
+
+		if (stpsep(buf, "\n") == NULL) {
 			/* A line which does not end with \n is only valid
 			 * at the end of the file.
 			 */
@@ -621,44 +618,46 @@ static int set_defaults (void)
 			}
 		}
 
-		if (!out_group && MATCH (buf, DGROUP)) {
-			fprintf (ofp, DGROUP "%u\n", (unsigned int) def_group);
+		val = stpsep(buf, "=");
+		if (val == NULL) {
+			fprintf(ofp, "%s\n", buf);
+		} else if (!out_group && streq(buf, DGROUP)) {
+			fprintf(ofp, DGROUP "=%u\n", (unsigned int) def_group);
 			out_group = true;
-		} else if (!out_groups && MATCH (buf, DGROUPS)) {
-			fprintf (ofp, DGROUPS "%s\n", def_groups);
+		} else if (!out_groups && streq(buf, DGROUPS)) {
+			fprintf(ofp, DGROUPS "=%s\n", def_groups);
 			out_groups = true;
-		} else if (!out_home && MATCH (buf, DHOME)) {
-			fprintf (ofp, DHOME "%s\n", def_home);
+		} else if (!out_home && streq(buf, DHOME)) {
+			fprintf(ofp, DHOME "=%s\n", def_home);
 			out_home = true;
-		} else if (!out_inactive && MATCH (buf, DINACT)) {
-			fprintf (ofp, DINACT "%ld\n", def_inactive);
+		} else if (!out_inactive && streq(buf, DINACT)) {
+			fprintf(ofp, DINACT "=%ld\n", def_inactive);
 			out_inactive = true;
-		} else if (!out_expire && MATCH (buf, DEXPIRE)) {
-			fprintf (ofp, DEXPIRE "%s\n", def_expire);
+		} else if (!out_expire && streq(buf, DEXPIRE)) {
+			fprintf(ofp, DEXPIRE "=%s\n", def_expire);
 			out_expire = true;
-		} else if (!out_shell && MATCH (buf, DSHELL)) {
-			fprintf (ofp, DSHELL "%s\n", def_shell);
+		} else if (!out_shell && streq(buf, DSHELL)) {
+			fprintf(ofp, DSHELL "=%s\n", def_shell);
 			out_shell = true;
-		} else if (!out_skel && MATCH (buf, DSKEL)) {
-			fprintf (ofp, DSKEL "%s\n", def_template);
+		} else if (!out_skel && streq(buf, DSKEL)) {
+			fprintf(ofp, DSKEL "=%s\n", def_template);
 			out_skel = true;
-		} else if (!out_usrskel && MATCH (buf, DUSRSKEL)) {
-			fprintf (ofp, DUSRSKEL "%s\n", def_usrtemplate);
+		} else if (!out_usrskel && streq(buf, DUSRSKEL)) {
+			fprintf(ofp, DUSRSKEL "=%s\n", def_usrtemplate);
 			out_usrskel = true;
 		} else if (!out_create_mail_spool
-			   && MATCH (buf, DCREATE_MAIL_SPOOL)) {
-			fprintf (ofp,
-			         DCREATE_MAIL_SPOOL "%s\n",
-			         def_create_mail_spool);
+			   && streq(buf, DCREATE_MAIL_SPOOL))
+		{
+			fprintf(ofp,
+			        DCREATE_MAIL_SPOOL "=%s\n",
+			        def_create_mail_spool);
 			out_create_mail_spool = true;
-		} else if (!out_log_init
-			   && MATCH (buf, DLOG_INIT)) {
-			fprintf (ofp,
-			         DLOG_INIT "%s\n",
-			         def_log_init);
+		} else if (!out_log_init && streq(buf, DLOG_INIT)) {
+			fprintf(ofp, DLOG_INIT "=%s\n", def_log_init);
 			out_log_init = true;
-		} else
-			fprintf (ofp, "%s\n", buf);
+		} else {
+			fprintf(ofp, "%s=%s\n", buf, val);
+		}
 	}
 	(void) fclose (ifp);
 
@@ -669,26 +668,26 @@ static int set_defaults (void)
 	 * have an entry for that value.
 	 */
 	if (!out_group)
-		fprintf (ofp, DGROUP "%u\n", (unsigned int) def_group);
+		fprintf (ofp, DGROUP "=%u\n", (unsigned int) def_group);
 	if (!out_groups)
-		fprintf (ofp, DGROUPS "%s\n", def_groups);
+		fprintf (ofp, DGROUPS "=%s\n", def_groups);
 	if (!out_home)
-		fprintf (ofp, DHOME "%s\n", def_home);
+		fprintf (ofp, DHOME "=%s\n", def_home);
 	if (!out_inactive)
-		fprintf (ofp, DINACT "%ld\n", def_inactive);
+		fprintf (ofp, DINACT "=%ld\n", def_inactive);
 	if (!out_expire)
-		fprintf (ofp, DEXPIRE "%s\n", def_expire);
+		fprintf (ofp, DEXPIRE "=%s\n", def_expire);
 	if (!out_shell)
-		fprintf (ofp, DSHELL "%s\n", def_shell);
+		fprintf (ofp, DSHELL "=%s\n", def_shell);
 	if (!out_skel)
-		fprintf (ofp, DSKEL "%s\n", def_template);
+		fprintf (ofp, DSKEL "=%s\n", def_template);
 	if (!out_usrskel)
-		fprintf (ofp, DUSRSKEL "%s\n", def_usrtemplate);
+		fprintf (ofp, DUSRSKEL "=%s\n", def_usrtemplate);
 
 	if (!out_create_mail_spool)
-		fprintf (ofp, DCREATE_MAIL_SPOOL "%s\n", def_create_mail_spool);
+		fprintf (ofp, DCREATE_MAIL_SPOOL "=%s\n", def_create_mail_spool);
 	if (!out_log_init)
-		fprintf (ofp, DLOG_INIT "%s\n", def_log_init);
+		fprintf (ofp, DLOG_INIT "=%s\n", def_log_init);
 	/*
 	 * Flush and close the file. Check for errors to make certain
 	 * the new file is intact.
@@ -758,11 +757,19 @@ err_free_new:
  */
 static int get_groups (char *list)
 {
-	char *cp;
 	struct group *grp;
 	int errors = 0;
 	int ngroups = 0;
 
+	/*
+	 * Free previous group list before creating a new one.
+	 */
+	int i = 0;
+	while (NULL != user_groups[i]) {
+		free(user_groups[i]);
+		user_groups[i++] = NULL;
+	}
+
 	if ('\0' == *list) {
 		return 0;
 	}
@@ -777,20 +784,19 @@ static int get_groups (char *list)
 	 * each name and look it up. A mix of numerical and string
 	 * values for group identifiers is permitted.
 	 */
-	do {
+	while (NULL != list) {
+		char  *g;
+
 		/*
 		 * Strip off a single name from the list
 		 */
-		cp = strchr (list, ',');
-		if (NULL != cp) {
-			*cp++ = '\0';
-		}
+		g = strsep(&list, ",");
 
 		/*
 		 * Names starting with digits are treated as numerical
 		 * GID values, otherwise the string is looked up as is.
 		 */
-		grp = get_local_group (list);
+		grp = get_local_group(g);
 
 		/*
 		 * There must be a match, either by GID value or by
@@ -801,10 +807,9 @@ static int get_groups (char *list)
 		if (NULL == grp) {
 			fprintf (stderr,
 			         _("%s: group '%s' does not exist\n"),
-			         Prog, list);
+			         Prog, g);
 			errors++;
 		}
-		list = cp;
 
 		/*
 		 * If the group doesn't exist, don't dump core...
@@ -827,7 +832,7 @@ static int get_groups (char *list)
 		 */
 		user_groups[ngroups++] = xstrdup (grp->gr_name);
 		gr_free (grp);
-	} while (NULL != list);
+	}
 
 	close_group_files ();
 	unlock_group_files ();
@@ -853,21 +858,14 @@ static int get_groups (char *list)
  */
 static struct group * get_local_group(char * grp_name)
 {
-	char  *end;
-	const struct group *grp;
-	struct group *result_grp = NULL;
-	long long  gid;
+	gid_t               gid;
+	struct group        *result_grp = NULL;
+	const struct group  *grp;
 
-	gid = strtoll(grp_name, &end, 10);
-	if (   ('\0' != *grp_name)
-		&& ('\0' == *end)
-		&& (ERANGE != errno)
-		&& (gid == (gid_t)gid)) {
-		grp = gr_locate_gid (gid);
-	}
-	else {
+	if (get_gid(grp_name, &gid) == 0)
+		grp = gr_locate_gid(gid);
+	else
 		grp = gr_locate(grp_name);
-	}
 
 	if (grp != NULL) {
 		result_grp = __gr_dup (grp);
@@ -1298,8 +1296,9 @@ static void process_flags (int argc, char **argv)
 				eflg = true;
 				break;
 			case 'f':
-				if (   (str2sl(&def_inactive, optarg) == -1)
-				    || (def_inactive < -1)) {
+				if (a2sl(&def_inactive, optarg, NULL, 0, -1, LONG_MAX)
+				    == -1)
+				{
 					fprintf (stderr,
 					         _("%s: invalid numeric argument '%s'\n"),
 					         Prog, optarg);
@@ -1360,16 +1359,13 @@ static void process_flags (int argc, char **argv)
 				 * example: -K UID_MIN=100 -K UID_MAX=499
 				 * note: -K UID_MIN=10,UID_MAX=499 doesn't work yet
 				 */
-				cp = strchr (optarg, '=');
+				cp = stpsep(optarg, "=");
 				if (NULL == cp) {
 					fprintf (stderr,
 					         _("%s: -K requires KEY=VALUE\n"),
 					         Prog);
 					exit (E_BAD_ARG);
 				}
-				/* terminate name, point to value */
-				*cp = '\0';
-				cp++;
 				if (putdef_str (optarg, cp, NULL) < 0) {
 					exit (E_BAD_ARG);
 				}
@@ -1417,7 +1413,7 @@ static void process_flags (int argc, char **argv)
 				}
 				if (    '\0' != optarg[0]
 				     && '*'  != optarg[0]
-				     && strcmp(optarg, "/sbin/nologin") != 0
+				     && !streq(optarg, "/sbin/nologin")
 				     && (   stat(optarg, &st) != 0
 				         || S_ISDIR(st.st_mode)
 				         || access(optarg, X_OK) != 0)) {
@@ -1537,10 +1533,16 @@ static void process_flags (int argc, char **argv)
 		}
 
 		user_name = argv[optind];
-		if (!is_valid_user_name (user_name)) {
-			fprintf (stderr,
-			         _("%s: invalid user name '%s': use --badname to ignore\n"),
-			         Prog, user_name);
+		if (!is_valid_user_name(user_name)) {
+			if (errno == EINVAL) {
+				fprintf(stderr,
+				        _("%s: invalid user name '%s': use --badname to ignore\n"),
+				        Prog, user_name);
+			} else {
+				fprintf(stderr,
+				        _("%s: invalid user name '%s'\n"),
+				        Prog, user_name);
+			}
 #ifdef WITH_AUDIT
 			audit_logger (AUDIT_ADD_USER, Prog,
 			              "adding user",
@@ -1582,7 +1584,7 @@ static void process_flags (int argc, char **argv)
 	if (!lflg) {
 		/* If we are missing the flag lflg aka -l, check the defaults
 		* file to see if we need to disable it as a default*/
-		if (strcmp (def_log_init, "no") == 0) {
+		if (streq(def_log_init, "no")) {
 			lflg = true;
 		}
 	}
@@ -2050,7 +2052,7 @@ static void lastlog_reset (uid_t uid)
 		return;
 	}
 	if (   (lseek (fd, offset_uid, SEEK_SET) != offset_uid)
-	    || (write_full (fd, &ll, sizeof (ll)) != (ssize_t) sizeof (ll))
+	    || (write_full (fd, &ll, sizeof (ll)) == -1)
 	    || (fsync (fd) != 0)) {
 		fprintf (stderr,
 		         _("%s: failed to reset the lastlog entry of UID %lu: %s\n"),
@@ -2089,11 +2091,7 @@ static void tallylog_reset (const char *user_name)
 		failed = 1;
 		break;
 	case 0: /* child */
-		pname = strrchr(pam_tally2, '/');
-		if (pname == NULL)
-			pname = pam_tally2;
-		else
-			pname++;        /* Skip the '/' */
+		pname = Basename(pam_tally2);
 		execl(pam_tally2, pname, "--user", user_name, "--reset", "--quiet", NULL);
 		/* If we come here, something has gone terribly wrong */
 		perror(pam_tally2);
@@ -2237,7 +2235,7 @@ static void create_home (void)
 	if (access (prefix_user_home, F_OK) == 0)
 		return;
 
-	path[0] = '\0';
+	strcpy(path, "");
 	bhome = strdup(prefix_user_home);
 	if (!bhome) {
 		fprintf(stderr,
@@ -2283,7 +2281,7 @@ static void create_home (void)
 					Prog, path);
 				fail_exit(E_HOMEDIR);
 			}
-			btrfs_check[strlen(path) - strlen(cp) - 1] = '\0';
+			stpcpy(&btrfs_check[strlen(path) - strlen(cp) - 1], "");
 			if (is_btrfs(btrfs_check) <= 0) {
 				fprintf(stderr,
 					_("%s: home directory \"%s\" must be mounted on BTRFS\n"),
@@ -2749,21 +2747,25 @@ int main (int argc, char **argv)
 
 
 static FILE *
-fmkstemp(char *template)
+fmkomstemp(char *template, unsigned int flags, mode_t m)
 {
 	int   fd;
 	FILE  *fp;
 
-	fd = mkstemp(template);
+	fd = mkostemp(template, flags);
 	if (fd == -1)
 		return NULL;
 
+	if (fchmod(fd, m) == -1)
+		goto fail;
+
 	fp = fdopen(fd, "w");
-	if (fp == NULL) {
-		close(fd);
-		unlink(template);
-		return NULL;
-	}
+	if (fp == NULL)
+		goto fail;
 
 	return fp;
+fail:
+	close(fd);
+	unlink(template);
+	return NULL;
 }
diff --git a/src/userdel.c b/src/userdel.c
index ff1f7ddf..6552c5ae 100644
--- a/src/userdel.c
+++ b/src/userdel.c
@@ -20,7 +20,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "alloc.h"
 #ifdef ACCT_TOOLS_SETUID
 #ifdef USE_PAM
 #include "pam_defs.h"
@@ -52,7 +51,9 @@
 #include "subordinateio.h"
 #endif				/* ENABLE_SUBIDS */
 #include "shadowlog.h"
-#include "string/sprintf.h"
+#include "string/sprintf/xasprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strdup/xstrdup.h"
 
 
 /*
@@ -319,7 +320,7 @@ static void remove_usergroup (void)
 		 */
 		prefix_setpwent ();
 		while ((pwd = prefix_getpwent ()) != NULL) {
-			if (strcmp (pwd->pw_name, user_name) == 0) {
+			if (streq(pwd->pw_name, user_name)) {
 				continue;
 			}
 			if (pwd->pw_gid == grp->gr_gid) {
@@ -1183,7 +1184,7 @@ int main (int argc, char **argv)
 		 */
 		prefix_setpwent ();
 		while ((pwd = prefix_getpwent ())) {
-			if (strcmp (pwd->pw_name, user_name) == 0) {
+			if (streq(pwd->pw_name, user_name)) {
 				continue;
 			}
 			if (path_prefix (user_home, pwd->pw_dir)) {
diff --git a/src/usermod.c b/src/usermod.c
index f8896984..f33aec31 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -32,16 +32,18 @@
 #include <sys/types.h>
 #include <time.h>
 
-#include "alloc.h"
-#include "atoi/str2i.h"
+#include "alloc/malloc.h"
+#include "alloc/x/xmalloc.h"
+#include "atoi/a2i/a2i.h"
+#include "atoi/a2i/a2s.h"
+#include "atoi/getnum.h"
 #include "chkname.h"
 #include "defines.h"
 #include "faillog.h"
 #include "getdef.h"
 #include "groupio.h"
-#include "memzero.h"
+#include "must_be.h"
 #include "nscd.h"
-#include "sssd.h"
 #include "prototypes.h"
 #include "pwauth.h"
 #include "pwio.h"
@@ -59,7 +61,11 @@
 #include "tcbfuncs.h"
 #endif
 #include "shadowlog.h"
-#include "string/sprintf.h"
+#include "sssd.h"
+#include "string/memset/memzero.h"
+#include "string/sprintf/xasprintf.h"
+#include "string/strcmp/streq.h"
+#include "string/strdup/xstrdup.h"
 #include "time/day_to_str.h"
 
 
@@ -212,7 +218,6 @@ extern int allow_bad_names;
  */
 static int get_groups (char *list)
 {
-	char *cp;
 	struct group *grp;
 	int errors = 0;
 	int ngroups = 0;
@@ -231,21 +236,19 @@ static int get_groups (char *list)
 	 * name and look it up. A mix of numerical and string values for
 	 * group identifiers is permitted.
 	 */
-	do {
+	while (NULL != list) {
+		char  *g;
+
 		/*
 		 * Strip off a single name from the list
 		 */
-		cp = strchr (list, ',');
-		if (NULL != cp) {
-			*cp = '\0';
-			cp++;
-		}
+		g = strsep(&list, ",");
 
 		/*
 		 * Names starting with digits are treated as numerical GID
 		 * values, otherwise the string is looked up as is.
 		 */
-		grp = prefix_getgr_nam_gid (list);
+		grp = prefix_getgr_nam_gid(g);
 
 		/*
 		 * There must be a match, either by GID value or by
@@ -253,10 +256,9 @@ static int get_groups (char *list)
 		 */
 		if (NULL == grp) {
 			fprintf (stderr, _("%s: group '%s' does not exist\n"),
-			         Prog, list);
+			         Prog, g);
 			errors++;
 		}
-		list = cp;
 
 		/*
 		 * If the group doesn't exist, don't dump core. Instead,
@@ -279,7 +281,7 @@ static int get_groups (char *list)
 		 */
 		user_groups[ngroups++] = xstrdup (grp->gr_name);
 		gr_free (grp);
-	} while (NULL != list);
+	}
 
 	user_groups[ngroups] = NULL;
 
@@ -294,63 +296,64 @@ static int get_groups (char *list)
 }
 
 #ifdef ENABLE_SUBIDS
-struct ulong_range
+struct id_range
 {
-	unsigned long first;
-	unsigned long last;
+	id_t  first;
+	id_t  last;
 };
 
-static struct ulong_range getulong_range(const char *str)
+static struct id_range
+getid_range(const char *str)
 {
-	struct ulong_range result = { .first = ULONG_MAX, .last = 0 };
-	long long first, last;
-	char *pos;
+	id_t             first, last;
+	const char       *pos;
+	struct id_range  result = {
+		.first = type_max(id_t),
+		.last = type_min(id_t)
+	};
 
-	errno = 0;
-	first = strtoll(str, &pos, 10);
-	if (('\0' == *str) || ('-' != *pos ) || (0 != errno) ||
-	    (first != (unsigned long)first))
-		goto out;
+	static_assert(is_same_type(id_t, uid_t), "");
+	static_assert(is_same_type(id_t, gid_t), "");
 
-	errno = 0;
-	last = strtoll(pos + 1, &pos, 10);
-	if (('\0' != *pos ) || (0 != errno) ||
-	    (last != (unsigned long)last))
-		goto out;
+	first = type_min(id_t);
+	last = type_max(id_t);
 
-	if (first > last)
-		goto out;
+	if (a2i(id_t, &first, str, &pos, 10, first, last) == -1
+	    && errno != ENOTSUP)
+	{
+		return result;
+	}
 
-	/*
-	 * uid_t in linux is an unsigned int, anything over this is an invalid
-	 * range will be later refused anyway by get_map_ranges().
-	 */
-	if (first > UINT_MAX || last > UINT_MAX)
-		goto out;
+	if ('-' != *pos++)
+		return result;
 
-	result.first = (unsigned long)first;
-	result.last = (unsigned long)last;
-out:
+	if (a2i(id_t, &last, pos, NULL, 10, first, last) == -1)
+		return result;
+
+	result.first = first;
+	result.last = last;
 	return result;
 }
 
-struct ulong_range_list_entry {
-	struct ulong_range_list_entry *next;
-	struct ulong_range range;
+struct id_range_list_entry {
+	struct id_range_list_entry  *next;
+	struct id_range             range;
 };
 
-static struct ulong_range_list_entry *add_sub_uids = NULL, *del_sub_uids = NULL;
-static struct ulong_range_list_entry *add_sub_gids = NULL, *del_sub_gids = NULL;
+static struct id_range_list_entry  *add_sub_uids = NULL, *del_sub_uids = NULL;
+static struct id_range_list_entry  *add_sub_gids = NULL, *del_sub_gids = NULL;
 
-static int prepend_range(const char *str, struct ulong_range_list_entry **head)
+static int
+prepend_range(const char *str, struct id_range_list_entry **head)
 {
-	struct ulong_range range;
-	struct ulong_range_list_entry *entry;
-	range = getulong_range(str);
+	struct id_range             range;
+	struct id_range_list_entry  *entry;
+
+	range = getid_range(str);
 	if (range.first > range.last)
 		return 0;
 
-	entry = MALLOC(1, struct ulong_range_list_entry);
+	entry = MALLOC(1, struct id_range_list_entry);
 	if (!entry) {
 		fprintf (stderr,
 			_("%s: failed to allocate memory: %s\n"),
@@ -424,15 +427,14 @@ usage (int status)
 static char *new_pw_passwd (char *pw_pass)
 {
 	if (Lflg && ('!' != pw_pass[0])) {
-		char *buf = XMALLOC(strlen(pw_pass) + 2, char);
+		char  *buf;
 
 #ifdef WITH_AUDIT
 		audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
 		              "updating passwd", user_newname, user_newid, 0);
 #endif
 		SYSLOG ((LOG_INFO, "lock user '%s' password", user_newname));
-		strcpy (buf, "!");
-		strcat (buf, pw_pass);
+		xasprintf(&buf, "!%s", pw_pass);
 		pw_pass = buf;
 	} else if (Uflg && pw_pass[0] == '!') {
 		if (pw_pass[1] == '\0') {
@@ -494,7 +496,7 @@ static void new_pwent (struct passwd *pwent)
 	 * used for this account.
 	 */
 	if (   (!is_shadow_pwd)
-	    || (strcmp (pwent->pw_passwd, SHADOW_PASSWD_STRING) != 0)) {
+	    || !streq(pwent->pw_passwd, SHADOW_PASSWD_STRING)) {
 		pwent->pw_passwd = new_pw_passwd (pwent->pw_passwd);
 	}
 
@@ -981,7 +983,8 @@ static void grp_update (void)
  *	values that the user will be created with accordingly. The values
  *	are checked for sanity.
  */
-static void process_flags (int argc, char **argv)
+static void
+process_flags(int argc, char **argv)
 {
 	struct stat st;
 	bool anyflag = false;
@@ -1060,7 +1063,7 @@ static void process_flags (int argc, char **argv)
 				}
 				dflg = true;
 				user_newhome = optarg;
-				if (user_newhome[0] != '/') {
+				if ((user_newhome[0] != '/') && !streq(user_newhome, "")) {
 					fprintf (stderr,
 					         _("%s: homedir must be an absolute path\n"),
 					         Prog);
@@ -1078,8 +1081,9 @@ static void process_flags (int argc, char **argv)
 				eflg = true;
 				break;
 			case 'f':
-				if (   (str2sl(&user_newinactive, optarg) == -1)
-				    || (user_newinactive < -1)) {
+				if (a2sl(&user_newinactive, optarg, NULL, 0, -1, LONG_MAX)
+				    == -1)
+				{
 					fprintf (stderr,
 					         _("%s: invalid numeric argument '%s'\n"),
 					         Prog, optarg);
@@ -1113,10 +1117,16 @@ static void process_flags (int argc, char **argv)
 				usage (E_SUCCESS);
 				/*@notreached@*/break;
 			case 'l':
-				if (!is_valid_user_name (optarg)) {
-					fprintf (stderr,
-					         _("%s: invalid user name '%s': use --badname to ignore\n"),
-					         Prog, optarg);
+				if (!is_valid_user_name(optarg)) {
+					if (errno == EINVAL) {
+						fprintf(stderr,
+						        _("%s: invalid user name '%s': use --badname to ignore\n"),
+						        Prog, optarg);
+					} else {
+						fprintf(stderr,
+						        _("%s: invalid user name '%s'\n"),
+						        Prog, optarg);
+					}
 					exit (E_BAD_ARG);
 				}
 				lflg = true;
@@ -1154,7 +1164,7 @@ static void process_flags (int argc, char **argv)
 				}
 				if (    '\0' != optarg[0]
 				     && '*'  != optarg[0]
-				     && strcmp(optarg, "/sbin/nologin") != 0
+				     && !streq(optarg, "/sbin/nologin")
 				     && (   stat(optarg, &st) != 0
 				         || S_ISDIR(st.st_mode)
 				         || access(optarg, X_OK) != 0)) {
@@ -1364,10 +1374,10 @@ static void process_flags (int argc, char **argv)
 		gflg = false;
 	}
 	if (   (NULL != user_newshell)
-	    && (strcmp (user_newshell, user_shell) == 0)) {
+	    && streq(user_newshell, user_shell)) {
 		sflg = false;
 	}
-	if (strcmp (user_newname, user_name) == 0) {
+	if (streq(user_newname, user_name)) {
 		lflg = false;
 	}
 	if (user_newinactive == user_inactive) {
@@ -1377,12 +1387,12 @@ static void process_flags (int argc, char **argv)
 		eflg = false;
 	}
 	if (   (NULL != user_newhome)
-	    && (strcmp (user_newhome, user_home) == 0)) {
+	    && streq(user_newhome, user_home)) {
 		dflg = false;
 		mflg = false;
 	}
 	if (   (NULL != user_newcomment)
-	    && (strcmp (user_newcomment, user_comment) == 0)) {
+	    && streq(user_newcomment, user_comment)) {
 		cflg = false;
 	}
 
@@ -1717,7 +1727,7 @@ static void usr_update (void)
 			spent = *spwd;
 			new_spent (&spent);
 		} else if (   (    pflg
-		               && (strcmp (pwent.pw_passwd, SHADOW_PASSWD_STRING) == 0))
+		               && streq(pwent.pw_passwd, SHADOW_PASSWD_STRING))
 		           || eflg || fflg) {
 			/* In some cases, we force the creation of a
 			 * shadow entry:
@@ -1794,7 +1804,7 @@ static void move_home (void)
 
 	if (access (prefix_user_newhome, F_OK) == 0) {
 		/*
-		 * If the new home directory already exist, the user
+		 * If the new home directory already exists, the user
 		 * should not use -m.
 		 */
 		fprintf (stderr,
@@ -2241,53 +2251,69 @@ int main (int argc, char **argv)
 	}
 #ifdef ENABLE_SUBIDS
 	if (Vflg) {
-		struct ulong_range_list_entry *ptr;
+		struct id_range_list_entry  *ptr;
+
 		for (ptr = del_sub_uids; ptr != NULL; ptr = ptr->next) {
-			unsigned long count = ptr->range.last - ptr->range.first + 1;
+			id_t  count = ptr->range.last - ptr->range.first + 1;
+
 			if (sub_uid_remove(user_name, ptr->range.first, count) == 0) {
-				fprintf (stderr,
-					_("%s: failed to remove uid range %lu-%lu from '%s'\n"),
-					Prog, ptr->range.first, ptr->range.last,
-					sub_uid_dbname ());
+				fprintf(stderr,
+				        _("%s: failed to remove uid range %ju-%ju from '%s'\n"),
+				        Prog,
+				        (uintmax_t) ptr->range.first,
+				        (uintmax_t) ptr->range.last,
+				        sub_uid_dbname());
 				fail_exit (E_SUB_UID_UPDATE);
 			}
 		}
 	}
 	if (vflg) {
-		struct ulong_range_list_entry *ptr;
+		struct id_range_list_entry  *ptr;
+
 		for (ptr = add_sub_uids; ptr != NULL; ptr = ptr->next) {
-			unsigned long count = ptr->range.last - ptr->range.first + 1;
+			id_t  count = ptr->range.last - ptr->range.first + 1;
+
 			if (sub_uid_add(user_name, ptr->range.first, count) == 0) {
-				fprintf (stderr,
-					_("%s: failed to add uid range %lu-%lu to '%s'\n"),
-					Prog, ptr->range.first, ptr->range.last,
-					sub_uid_dbname ());
+				fprintf(stderr,
+				        _("%s: failed to add uid range %ju-%ju to '%s'\n"),
+				        Prog,
+				        (uintmax_t) ptr->range.first,
+				        (uintmax_t) ptr->range.last,
+				        sub_uid_dbname());
 				fail_exit (E_SUB_UID_UPDATE);
 			}
 		}
 	}
 	if (Wflg) {
-		struct ulong_range_list_entry *ptr;
+		struct id_range_list_entry  *ptr;
+
 		for (ptr = del_sub_gids; ptr != NULL; ptr = ptr->next) {
-			unsigned long count = ptr->range.last - ptr->range.first + 1;
+			id_t  count = ptr->range.last - ptr->range.first + 1;
+
 			if (sub_gid_remove(user_name, ptr->range.first, count) == 0) {
-				fprintf (stderr,
-					_("%s: failed to remove gid range %lu-%lu from '%s'\n"),
-					Prog, ptr->range.first, ptr->range.last,
-					sub_gid_dbname ());
+				fprintf(stderr,
+				        _("%s: failed to remove gid range %ju-%ju from '%s'\n"),
+				        Prog,
+				        (uintmax_t) ptr->range.first,
+				        (uintmax_t) ptr->range.last,
+				        sub_gid_dbname());
 				fail_exit (E_SUB_GID_UPDATE);
 			}
 		}
 	}
 	if (wflg) {
-		struct ulong_range_list_entry *ptr;
+		struct id_range_list_entry  *ptr;
+
 		for (ptr = add_sub_gids; ptr != NULL; ptr = ptr->next) {
-			unsigned long count = ptr->range.last - ptr->range.first + 1;
+			id_t  count = ptr->range.last - ptr->range.first + 1;
+
 			if (sub_gid_add(user_name, ptr->range.first, count) == 0) {
-				fprintf (stderr,
-					_("%s: failed to add gid range %lu-%lu to '%s'\n"),
-					Prog, ptr->range.first, ptr->range.last,
-					sub_gid_dbname ());
+				fprintf(stderr,
+				        _("%s: failed to add gid range %ju-%ju to '%s'\n"),
+				        Prog,
+				        (uintmax_t) ptr->range.first,
+				        (uintmax_t) ptr->range.last,
+				        sub_gid_dbname());
 				fail_exit (E_SUB_GID_UPDATE);
 			}
 		}
diff --git a/src/vipw.c b/src/vipw.c
index c30b32de..a855e0d7 100644
--- a/src/vipw.c
+++ b/src/vipw.c
@@ -27,12 +27,10 @@
 #include <unistd.h>
 #include <utime.h>
 
-#include "alloc.h"
 #include "defines.h"
 #include "getdef.h"
 #include "groupio.h"
 #include "nscd.h"
-#include "sssd.h"
 #include "prototypes.h"
 #include "pwio.h"
 #include "sgroupio.h"
@@ -44,7 +42,10 @@
 #include "tcbfuncs.h"
 #endif				/* WITH_TCB */
 #include "shadowlog.h"
-#include "string/sprintf.h"
+#include "sssd.h"
+#include "string/sprintf/snprintf.h"
+#include "string/sprintf/xasprintf.h"
+#include "string/strcmp/streq.h"
 
 
 #define MSG_WARN_EDIT_OTHER_FILE _( \
@@ -389,7 +390,7 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (void))
 		vipwexit (fileedit, 1, 1);
 	}
 	if (st1.st_mtime == st2.st_mtime) {
-		vipwexit (0, 0, 0);
+		vipwexit(NULL, 0, 0);
 	}
 #ifdef WITH_SELINUX
 	/* unset the fscreatecon */
@@ -446,7 +447,7 @@ vipwedit (const char *file, int (*file_lock) (void), int (*file_unlock) (void))
 			free(to_rename);
 		}
 #endif				/* WITH_TCB */
-		vipwexit (0, 0, 1);
+		vipwexit(NULL, 0, 1);
 	}
 
 #ifdef WITH_TCB
@@ -471,7 +472,7 @@ int main (int argc, char **argv)
 	bool  editshadow = false;
 	bool  do_vigr;
 
-	do_vigr = (strcmp(Basename(argv[0]), "vigr") == 0);
+	do_vigr = streq(Basename(argv[0]), "vigr");
 
 	Prog = do_vigr ? "vigr" : "vipw";
 	log_set_progname(Prog);
diff --git a/tests/tests/README b/tests/README
similarity index 100%
rename from tests/tests/README
rename to tests/README
diff --git a/tests/tests/bug334803-test.exp b/tests/bug334803-test.exp
similarity index 100%
rename from tests/tests/bug334803-test.exp
rename to tests/bug334803-test.exp
diff --git a/tests/tests/chage/01/data/chage1 b/tests/chage/01/data/chage1
similarity index 100%
rename from tests/tests/chage/01/data/chage1
rename to tests/chage/01/data/chage1
diff --git a/tests/tests/chage/01/data/chage2 b/tests/chage/01/data/chage2
similarity index 100%
rename from tests/tests/chage/01/data/chage2
rename to tests/chage/01/data/chage2
diff --git a/tests/tests/chage/01/data/chage3 b/tests/chage/01/data/chage3
similarity index 100%
rename from tests/tests/chage/01/data/chage3
rename to tests/chage/01/data/chage3
diff --git a/tests/tests/chage/01/data/chage4 b/tests/chage/01/data/chage4
similarity index 100%
rename from tests/tests/chage/01/data/chage4
rename to tests/chage/01/data/chage4
diff --git a/tests/tests/chage/01/data/chage5 b/tests/chage/01/data/chage5
similarity index 100%
rename from tests/tests/chage/01/data/chage5
rename to tests/chage/01/data/chage5
diff --git a/tests/tests/chage/01/data/chage6 b/tests/chage/01/data/chage6
similarity index 100%
rename from tests/tests/chage/01/data/chage6
rename to tests/chage/01/data/chage6
diff --git a/tests/tests/chage/01/data/chage7 b/tests/chage/01/data/chage7
similarity index 100%
rename from tests/tests/chage/01/data/chage7
rename to tests/chage/01/data/chage7
diff --git a/tests/tests/chage/01/data/chage7b b/tests/chage/01/data/chage7b
similarity index 100%
rename from tests/tests/chage/01/data/chage7b
rename to tests/chage/01/data/chage7b
diff --git a/tests/tests/chage/01/data/chage8 b/tests/chage/01/data/chage8
similarity index 100%
rename from tests/tests/chage/01/data/chage8
rename to tests/chage/01/data/chage8
diff --git a/tests/tests/chage/01/data/group b/tests/chage/01/data/group
similarity index 100%
rename from tests/tests/chage/01/data/group
rename to tests/chage/01/data/group
diff --git a/tests/tests/chage/01/data/gshadow b/tests/chage/01/data/gshadow
similarity index 100%
rename from tests/tests/chage/01/data/gshadow
rename to tests/chage/01/data/gshadow
diff --git a/tests/tests/chage/01/data/passwd b/tests/chage/01/data/passwd
similarity index 100%
rename from tests/tests/chage/01/data/passwd
rename to tests/chage/01/data/passwd
diff --git a/tests/tests/chage/01/data/shadow b/tests/chage/01/data/shadow
similarity index 100%
rename from tests/tests/chage/01/data/shadow
rename to tests/chage/01/data/shadow
diff --git a/tests/tests/chage/01/data/usage b/tests/chage/01/data/usage
similarity index 100%
rename from tests/tests/chage/01/data/usage
rename to tests/chage/01/data/usage
diff --git a/tests/tests/chage/01/run b/tests/chage/01/run
similarity index 100%
rename from tests/tests/chage/01/run
rename to tests/chage/01/run
diff --git a/tests/tests/chage/01/run1.exp b/tests/chage/01/run1.exp
similarity index 100%
rename from tests/tests/chage/01/run1.exp
rename to tests/chage/01/run1.exp
diff --git a/tests/tests/chage/01/run2.exp b/tests/chage/01/run2.exp
similarity index 100%
rename from tests/tests/chage/01/run2.exp
rename to tests/chage/01/run2.exp
diff --git a/tests/tests/chage/02/data/group b/tests/chage/02/data/group
similarity index 100%
rename from tests/tests/chage/02/data/group
rename to tests/chage/02/data/group
diff --git a/tests/tests/chage/02/data/gshadow b/tests/chage/02/data/gshadow
similarity index 100%
rename from tests/tests/chage/02/data/gshadow
rename to tests/chage/02/data/gshadow
diff --git a/tests/tests/chage/02/data/passwd b/tests/chage/02/data/passwd
similarity index 100%
rename from tests/tests/chage/02/data/passwd
rename to tests/chage/02/data/passwd
diff --git a/tests/tests/chage/02/data/shadow b/tests/chage/02/data/shadow
similarity index 100%
rename from tests/tests/chage/02/data/shadow
rename to tests/chage/02/data/shadow
diff --git a/tests/tests/chage/02/run b/tests/chage/02/run
similarity index 100%
rename from tests/tests/chage/02/run
rename to tests/chage/02/run
diff --git a/tests/tests/chage/02/run.exp b/tests/chage/02/run.exp
similarity index 100%
rename from tests/tests/chage/02/run.exp
rename to tests/chage/02/run.exp
diff --git a/tests/tests/chage/03_chsh_usage/chage.test b/tests/chage/03_chsh_usage/chage.test
similarity index 100%
rename from tests/tests/chage/03_chsh_usage/chage.test
rename to tests/chage/03_chsh_usage/chage.test
diff --git a/tests/tests/chage/03_chsh_usage/config.txt b/tests/chage/03_chsh_usage/config.txt
similarity index 100%
rename from tests/tests/chage/03_chsh_usage/config.txt
rename to tests/chage/03_chsh_usage/config.txt
diff --git a/tests/tests/chage/03_chsh_usage/config/etc/group b/tests/chage/03_chsh_usage/config/etc/group
similarity index 100%
rename from tests/tests/chage/03_chsh_usage/config/etc/group
rename to tests/chage/03_chsh_usage/config/etc/group
diff --git a/tests/tests/chage/03_chsh_usage/config/etc/gshadow b/tests/chage/03_chsh_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/03_chsh_usage/config/etc/gshadow
rename to tests/chage/03_chsh_usage/config/etc/gshadow
diff --git a/tests/tests/chage/03_chsh_usage/config/etc/passwd b/tests/chage/03_chsh_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/03_chsh_usage/config/etc/passwd
rename to tests/chage/03_chsh_usage/config/etc/passwd
diff --git a/tests/tests/chage/03_chsh_usage/config/etc/shadow b/tests/chage/03_chsh_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/03_chsh_usage/config/etc/shadow
rename to tests/chage/03_chsh_usage/config/etc/shadow
diff --git a/tests/tests/chage/03_chsh_usage/data/usage.out b/tests/chage/03_chsh_usage/data/usage.out
similarity index 100%
rename from tests/tests/chage/03_chsh_usage/data/usage.out
rename to tests/chage/03_chsh_usage/data/usage.out
diff --git a/tests/tests/chage/04_chsh_usage_invalid_option/chage.test b/tests/chage/04_chsh_usage_invalid_option/chage.test
similarity index 100%
rename from tests/tests/chage/04_chsh_usage_invalid_option/chage.test
rename to tests/chage/04_chsh_usage_invalid_option/chage.test
diff --git a/tests/tests/chage/04_chsh_usage_invalid_option/config.txt b/tests/chage/04_chsh_usage_invalid_option/config.txt
similarity index 100%
rename from tests/tests/chage/04_chsh_usage_invalid_option/config.txt
rename to tests/chage/04_chsh_usage_invalid_option/config.txt
diff --git a/tests/tests/chage/04_chsh_usage_invalid_option/config/etc/group b/tests/chage/04_chsh_usage_invalid_option/config/etc/group
similarity index 100%
rename from tests/tests/chage/04_chsh_usage_invalid_option/config/etc/group
rename to tests/chage/04_chsh_usage_invalid_option/config/etc/group
diff --git a/tests/tests/chage/04_chsh_usage_invalid_option/config/etc/gshadow b/tests/chage/04_chsh_usage_invalid_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/04_chsh_usage_invalid_option/config/etc/gshadow
rename to tests/chage/04_chsh_usage_invalid_option/config/etc/gshadow
diff --git a/tests/tests/chage/04_chsh_usage_invalid_option/config/etc/passwd b/tests/chage/04_chsh_usage_invalid_option/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/04_chsh_usage_invalid_option/config/etc/passwd
rename to tests/chage/04_chsh_usage_invalid_option/config/etc/passwd
diff --git a/tests/tests/chage/04_chsh_usage_invalid_option/config/etc/shadow b/tests/chage/04_chsh_usage_invalid_option/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/04_chsh_usage_invalid_option/config/etc/shadow
rename to tests/chage/04_chsh_usage_invalid_option/config/etc/shadow
diff --git a/tests/tests/chage/04_chsh_usage_invalid_option/data/usage.out b/tests/chage/04_chsh_usage_invalid_option/data/usage.out
similarity index 100%
rename from tests/tests/chage/04_chsh_usage_invalid_option/data/usage.out
rename to tests/chage/04_chsh_usage_invalid_option/data/usage.out
diff --git a/tests/tests/chage/05_chsh_usage_2_users/chage.test b/tests/chage/05_chsh_usage_2_users/chage.test
similarity index 100%
rename from tests/tests/chage/05_chsh_usage_2_users/chage.test
rename to tests/chage/05_chsh_usage_2_users/chage.test
diff --git a/tests/tests/chage/05_chsh_usage_2_users/config.txt b/tests/chage/05_chsh_usage_2_users/config.txt
similarity index 100%
rename from tests/tests/chage/05_chsh_usage_2_users/config.txt
rename to tests/chage/05_chsh_usage_2_users/config.txt
diff --git a/tests/tests/chage/05_chsh_usage_2_users/config/etc/group b/tests/chage/05_chsh_usage_2_users/config/etc/group
similarity index 100%
rename from tests/tests/chage/05_chsh_usage_2_users/config/etc/group
rename to tests/chage/05_chsh_usage_2_users/config/etc/group
diff --git a/tests/tests/chage/05_chsh_usage_2_users/config/etc/gshadow b/tests/chage/05_chsh_usage_2_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/05_chsh_usage_2_users/config/etc/gshadow
rename to tests/chage/05_chsh_usage_2_users/config/etc/gshadow
diff --git a/tests/tests/chage/05_chsh_usage_2_users/config/etc/passwd b/tests/chage/05_chsh_usage_2_users/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/05_chsh_usage_2_users/config/etc/passwd
rename to tests/chage/05_chsh_usage_2_users/config/etc/passwd
diff --git a/tests/tests/chage/05_chsh_usage_2_users/config/etc/shadow b/tests/chage/05_chsh_usage_2_users/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/05_chsh_usage_2_users/config/etc/shadow
rename to tests/chage/05_chsh_usage_2_users/config/etc/shadow
diff --git a/tests/tests/chage/05_chsh_usage_2_users/data/usage.out b/tests/chage/05_chsh_usage_2_users/data/usage.out
similarity index 100%
rename from tests/tests/chage/05_chsh_usage_2_users/data/usage.out
rename to tests/chage/05_chsh_usage_2_users/data/usage.out
diff --git a/tests/tests/chage/06_chsh_usage_no_users/chage.test b/tests/chage/06_chsh_usage_no_users/chage.test
similarity index 100%
rename from tests/tests/chage/06_chsh_usage_no_users/chage.test
rename to tests/chage/06_chsh_usage_no_users/chage.test
diff --git a/tests/tests/chage/06_chsh_usage_no_users/config.txt b/tests/chage/06_chsh_usage_no_users/config.txt
similarity index 100%
rename from tests/tests/chage/06_chsh_usage_no_users/config.txt
rename to tests/chage/06_chsh_usage_no_users/config.txt
diff --git a/tests/tests/chage/06_chsh_usage_no_users/config/etc/group b/tests/chage/06_chsh_usage_no_users/config/etc/group
similarity index 100%
rename from tests/tests/chage/06_chsh_usage_no_users/config/etc/group
rename to tests/chage/06_chsh_usage_no_users/config/etc/group
diff --git a/tests/tests/chage/06_chsh_usage_no_users/config/etc/gshadow b/tests/chage/06_chsh_usage_no_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/06_chsh_usage_no_users/config/etc/gshadow
rename to tests/chage/06_chsh_usage_no_users/config/etc/gshadow
diff --git a/tests/tests/chage/06_chsh_usage_no_users/config/etc/passwd b/tests/chage/06_chsh_usage_no_users/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/06_chsh_usage_no_users/config/etc/passwd
rename to tests/chage/06_chsh_usage_no_users/config/etc/passwd
diff --git a/tests/tests/chage/06_chsh_usage_no_users/config/etc/shadow b/tests/chage/06_chsh_usage_no_users/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/06_chsh_usage_no_users/config/etc/shadow
rename to tests/chage/06_chsh_usage_no_users/config/etc/shadow
diff --git a/tests/tests/chage/06_chsh_usage_no_users/data/usage.out b/tests/chage/06_chsh_usage_no_users/data/usage.out
similarity index 100%
rename from tests/tests/chage/06_chsh_usage_no_users/data/usage.out
rename to tests/chage/06_chsh_usage_no_users/data/usage.out
diff --git a/tests/tests/chage/07_chsh_usage-l_exclusive/chage.test b/tests/chage/07_chsh_usage-l_exclusive/chage.test
similarity index 100%
rename from tests/tests/chage/07_chsh_usage-l_exclusive/chage.test
rename to tests/chage/07_chsh_usage-l_exclusive/chage.test
diff --git a/tests/tests/chage/07_chsh_usage-l_exclusive/config.txt b/tests/chage/07_chsh_usage-l_exclusive/config.txt
similarity index 100%
rename from tests/tests/chage/07_chsh_usage-l_exclusive/config.txt
rename to tests/chage/07_chsh_usage-l_exclusive/config.txt
diff --git a/tests/tests/chage/07_chsh_usage-l_exclusive/config/etc/group b/tests/chage/07_chsh_usage-l_exclusive/config/etc/group
similarity index 100%
rename from tests/tests/chage/07_chsh_usage-l_exclusive/config/etc/group
rename to tests/chage/07_chsh_usage-l_exclusive/config/etc/group
diff --git a/tests/tests/chage/07_chsh_usage-l_exclusive/config/etc/gshadow b/tests/chage/07_chsh_usage-l_exclusive/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/07_chsh_usage-l_exclusive/config/etc/gshadow
rename to tests/chage/07_chsh_usage-l_exclusive/config/etc/gshadow
diff --git a/tests/tests/chage/07_chsh_usage-l_exclusive/config/etc/passwd b/tests/chage/07_chsh_usage-l_exclusive/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/07_chsh_usage-l_exclusive/config/etc/passwd
rename to tests/chage/07_chsh_usage-l_exclusive/config/etc/passwd
diff --git a/tests/tests/chage/07_chsh_usage-l_exclusive/config/etc/shadow b/tests/chage/07_chsh_usage-l_exclusive/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/07_chsh_usage-l_exclusive/config/etc/shadow
rename to tests/chage/07_chsh_usage-l_exclusive/config/etc/shadow
diff --git a/tests/tests/chage/07_chsh_usage-l_exclusive/data/usage.out b/tests/chage/07_chsh_usage-l_exclusive/data/usage.out
similarity index 100%
rename from tests/tests/chage/07_chsh_usage-l_exclusive/data/usage.out
rename to tests/chage/07_chsh_usage-l_exclusive/data/usage.out
diff --git a/tests/tests/chage/08_chsh_usage_invalid_date/chage.test b/tests/chage/08_chsh_usage_invalid_date/chage.test
similarity index 100%
rename from tests/tests/chage/08_chsh_usage_invalid_date/chage.test
rename to tests/chage/08_chsh_usage_invalid_date/chage.test
diff --git a/tests/tests/chage/08_chsh_usage_invalid_date/config.txt b/tests/chage/08_chsh_usage_invalid_date/config.txt
similarity index 100%
rename from tests/tests/chage/08_chsh_usage_invalid_date/config.txt
rename to tests/chage/08_chsh_usage_invalid_date/config.txt
diff --git a/tests/tests/chage/08_chsh_usage_invalid_date/config/etc/group b/tests/chage/08_chsh_usage_invalid_date/config/etc/group
similarity index 100%
rename from tests/tests/chage/08_chsh_usage_invalid_date/config/etc/group
rename to tests/chage/08_chsh_usage_invalid_date/config/etc/group
diff --git a/tests/tests/chage/08_chsh_usage_invalid_date/config/etc/gshadow b/tests/chage/08_chsh_usage_invalid_date/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/08_chsh_usage_invalid_date/config/etc/gshadow
rename to tests/chage/08_chsh_usage_invalid_date/config/etc/gshadow
diff --git a/tests/tests/chage/08_chsh_usage_invalid_date/config/etc/passwd b/tests/chage/08_chsh_usage_invalid_date/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/08_chsh_usage_invalid_date/config/etc/passwd
rename to tests/chage/08_chsh_usage_invalid_date/config/etc/passwd
diff --git a/tests/tests/chage/08_chsh_usage_invalid_date/config/etc/shadow b/tests/chage/08_chsh_usage_invalid_date/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/08_chsh_usage_invalid_date/config/etc/shadow
rename to tests/chage/08_chsh_usage_invalid_date/config/etc/shadow
diff --git a/tests/tests/chage/08_chsh_usage_invalid_date/data/usage.out b/tests/chage/08_chsh_usage_invalid_date/data/usage.out
similarity index 100%
rename from tests/tests/chage/08_chsh_usage_invalid_date/data/usage.out
rename to tests/chage/08_chsh_usage_invalid_date/data/usage.out
diff --git a/tests/tests/chage/09_chsh_usage_invalid_numeric_arg/chage.test b/tests/chage/09_chsh_usage_invalid_numeric_arg/chage.test
similarity index 100%
rename from tests/tests/chage/09_chsh_usage_invalid_numeric_arg/chage.test
rename to tests/chage/09_chsh_usage_invalid_numeric_arg/chage.test
diff --git a/tests/tests/chage/09_chsh_usage_invalid_numeric_arg/config.txt b/tests/chage/09_chsh_usage_invalid_numeric_arg/config.txt
similarity index 100%
rename from tests/tests/chage/09_chsh_usage_invalid_numeric_arg/config.txt
rename to tests/chage/09_chsh_usage_invalid_numeric_arg/config.txt
diff --git a/tests/tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/group b/tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/group
similarity index 100%
rename from tests/tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/group
rename to tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/group
diff --git a/tests/tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/gshadow b/tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/gshadow
rename to tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/gshadow
diff --git a/tests/tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/passwd b/tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/passwd
rename to tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/passwd
diff --git a/tests/tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/shadow b/tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/shadow
rename to tests/chage/09_chsh_usage_invalid_numeric_arg/config/etc/shadow
diff --git a/tests/tests/chage/09_chsh_usage_invalid_numeric_arg/data/usage.out b/tests/chage/09_chsh_usage_invalid_numeric_arg/data/usage.out
similarity index 100%
rename from tests/tests/chage/09_chsh_usage_invalid_numeric_arg/data/usage.out
rename to tests/chage/09_chsh_usage_invalid_numeric_arg/data/usage.out
diff --git a/tests/tests/chage/10_chsh-l/chage.test b/tests/chage/10_chsh-l/chage.test
similarity index 100%
rename from tests/tests/chage/10_chsh-l/chage.test
rename to tests/chage/10_chsh-l/chage.test
diff --git a/tests/tests/chage/10_chsh-l/config.txt b/tests/chage/10_chsh-l/config.txt
similarity index 100%
rename from tests/tests/chage/10_chsh-l/config.txt
rename to tests/chage/10_chsh-l/config.txt
diff --git a/tests/tests/chage/10_chsh-l/config/etc/group b/tests/chage/10_chsh-l/config/etc/group
similarity index 100%
rename from tests/tests/chage/10_chsh-l/config/etc/group
rename to tests/chage/10_chsh-l/config/etc/group
diff --git a/tests/tests/chage/10_chsh-l/config/etc/gshadow b/tests/chage/10_chsh-l/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/10_chsh-l/config/etc/gshadow
rename to tests/chage/10_chsh-l/config/etc/gshadow
diff --git a/tests/tests/chage/10_chsh-l/config/etc/passwd b/tests/chage/10_chsh-l/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/10_chsh-l/config/etc/passwd
rename to tests/chage/10_chsh-l/config/etc/passwd
diff --git a/tests/tests/chage/10_chsh-l/config/etc/shadow b/tests/chage/10_chsh-l/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/10_chsh-l/config/etc/shadow
rename to tests/chage/10_chsh-l/config/etc/shadow
diff --git a/tests/tests/chage/10_chsh-l/data/myuser1 b/tests/chage/10_chsh-l/data/myuser1
similarity index 100%
rename from tests/tests/chage/10_chsh-l/data/myuser1
rename to tests/chage/10_chsh-l/data/myuser1
diff --git a/tests/tests/chage/10_chsh-l/data/myuser10 b/tests/chage/10_chsh-l/data/myuser10
similarity index 100%
rename from tests/tests/chage/10_chsh-l/data/myuser10
rename to tests/chage/10_chsh-l/data/myuser10
diff --git a/tests/tests/chage/10_chsh-l/data/myuser11 b/tests/chage/10_chsh-l/data/myuser11
similarity index 100%
rename from tests/tests/chage/10_chsh-l/data/myuser11
rename to tests/chage/10_chsh-l/data/myuser11
diff --git a/tests/tests/chage/10_chsh-l/data/myuser2 b/tests/chage/10_chsh-l/data/myuser2
similarity index 100%
rename from tests/tests/chage/10_chsh-l/data/myuser2
rename to tests/chage/10_chsh-l/data/myuser2
diff --git a/tests/tests/chage/10_chsh-l/data/myuser3 b/tests/chage/10_chsh-l/data/myuser3
similarity index 100%
rename from tests/tests/chage/10_chsh-l/data/myuser3
rename to tests/chage/10_chsh-l/data/myuser3
diff --git a/tests/tests/chage/10_chsh-l/data/myuser4 b/tests/chage/10_chsh-l/data/myuser4
similarity index 100%
rename from tests/tests/chage/10_chsh-l/data/myuser4
rename to tests/chage/10_chsh-l/data/myuser4
diff --git a/tests/tests/chage/10_chsh-l/data/myuser5 b/tests/chage/10_chsh-l/data/myuser5
similarity index 100%
rename from tests/tests/chage/10_chsh-l/data/myuser5
rename to tests/chage/10_chsh-l/data/myuser5
diff --git a/tests/tests/chage/10_chsh-l/data/myuser6 b/tests/chage/10_chsh-l/data/myuser6
similarity index 100%
rename from tests/tests/chage/10_chsh-l/data/myuser6
rename to tests/chage/10_chsh-l/data/myuser6
diff --git a/tests/tests/chage/10_chsh-l/data/myuser7 b/tests/chage/10_chsh-l/data/myuser7
similarity index 100%
rename from tests/tests/chage/10_chsh-l/data/myuser7
rename to tests/chage/10_chsh-l/data/myuser7
diff --git a/tests/tests/chage/10_chsh-l/data/myuser8 b/tests/chage/10_chsh-l/data/myuser8
similarity index 100%
rename from tests/tests/chage/10_chsh-l/data/myuser8
rename to tests/chage/10_chsh-l/data/myuser8
diff --git a/tests/tests/chage/10_chsh-l/data/myuser9 b/tests/chage/10_chsh-l/data/myuser9
similarity index 100%
rename from tests/tests/chage/10_chsh-l/data/myuser9
rename to tests/chage/10_chsh-l/data/myuser9
diff --git a/tests/tests/chage/11_chsh_usage_invalid_user/chage.test b/tests/chage/11_chsh_usage_invalid_user/chage.test
similarity index 100%
rename from tests/tests/chage/11_chsh_usage_invalid_user/chage.test
rename to tests/chage/11_chsh_usage_invalid_user/chage.test
diff --git a/tests/tests/chage/11_chsh_usage_invalid_user/config.txt b/tests/chage/11_chsh_usage_invalid_user/config.txt
similarity index 100%
rename from tests/tests/chage/11_chsh_usage_invalid_user/config.txt
rename to tests/chage/11_chsh_usage_invalid_user/config.txt
diff --git a/tests/tests/chage/11_chsh_usage_invalid_user/config/etc/group b/tests/chage/11_chsh_usage_invalid_user/config/etc/group
similarity index 100%
rename from tests/tests/chage/11_chsh_usage_invalid_user/config/etc/group
rename to tests/chage/11_chsh_usage_invalid_user/config/etc/group
diff --git a/tests/tests/chage/11_chsh_usage_invalid_user/config/etc/gshadow b/tests/chage/11_chsh_usage_invalid_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/11_chsh_usage_invalid_user/config/etc/gshadow
rename to tests/chage/11_chsh_usage_invalid_user/config/etc/gshadow
diff --git a/tests/tests/chage/11_chsh_usage_invalid_user/config/etc/passwd b/tests/chage/11_chsh_usage_invalid_user/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/11_chsh_usage_invalid_user/config/etc/passwd
rename to tests/chage/11_chsh_usage_invalid_user/config/etc/passwd
diff --git a/tests/tests/chage/11_chsh_usage_invalid_user/config/etc/shadow b/tests/chage/11_chsh_usage_invalid_user/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/11_chsh_usage_invalid_user/config/etc/shadow
rename to tests/chage/11_chsh_usage_invalid_user/config/etc/shadow
diff --git a/tests/tests/chage/11_chsh_usage_invalid_user/data/usage.out b/tests/chage/11_chsh_usage_invalid_user/data/usage.out
similarity index 100%
rename from tests/tests/chage/11_chsh_usage_invalid_user/data/usage.out
rename to tests/chage/11_chsh_usage_invalid_user/data/usage.out
diff --git a/tests/tests/chage/12_chsh_usage-l_invalid_user2/chage.test b/tests/chage/12_chsh_usage-l_invalid_user2/chage.test
similarity index 100%
rename from tests/tests/chage/12_chsh_usage-l_invalid_user2/chage.test
rename to tests/chage/12_chsh_usage-l_invalid_user2/chage.test
diff --git a/tests/tests/chage/12_chsh_usage-l_invalid_user2/config.txt b/tests/chage/12_chsh_usage-l_invalid_user2/config.txt
similarity index 100%
rename from tests/tests/chage/12_chsh_usage-l_invalid_user2/config.txt
rename to tests/chage/12_chsh_usage-l_invalid_user2/config.txt
diff --git a/tests/tests/chage/12_chsh_usage-l_invalid_user2/config/etc/group b/tests/chage/12_chsh_usage-l_invalid_user2/config/etc/group
similarity index 100%
rename from tests/tests/chage/12_chsh_usage-l_invalid_user2/config/etc/group
rename to tests/chage/12_chsh_usage-l_invalid_user2/config/etc/group
diff --git a/tests/tests/chage/12_chsh_usage-l_invalid_user2/config/etc/gshadow b/tests/chage/12_chsh_usage-l_invalid_user2/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/12_chsh_usage-l_invalid_user2/config/etc/gshadow
rename to tests/chage/12_chsh_usage-l_invalid_user2/config/etc/gshadow
diff --git a/tests/tests/chage/12_chsh_usage-l_invalid_user2/config/etc/passwd b/tests/chage/12_chsh_usage-l_invalid_user2/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/12_chsh_usage-l_invalid_user2/config/etc/passwd
rename to tests/chage/12_chsh_usage-l_invalid_user2/config/etc/passwd
diff --git a/tests/tests/chage/12_chsh_usage-l_invalid_user2/config/etc/shadow b/tests/chage/12_chsh_usage-l_invalid_user2/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/12_chsh_usage-l_invalid_user2/config/etc/shadow
rename to tests/chage/12_chsh_usage-l_invalid_user2/config/etc/shadow
diff --git a/tests/tests/chage/12_chsh_usage-l_invalid_user2/data/usage.out b/tests/chage/12_chsh_usage-l_invalid_user2/data/usage.out
similarity index 100%
rename from tests/tests/chage/12_chsh_usage-l_invalid_user2/data/usage.out
rename to tests/chage/12_chsh_usage-l_invalid_user2/data/usage.out
diff --git a/tests/tests/chage/13_chsh_locked_passwd/chage.test b/tests/chage/13_chsh_locked_passwd/chage.test
similarity index 100%
rename from tests/tests/chage/13_chsh_locked_passwd/chage.test
rename to tests/chage/13_chsh_locked_passwd/chage.test
diff --git a/tests/tests/chage/13_chsh_locked_passwd/config.txt b/tests/chage/13_chsh_locked_passwd/config.txt
similarity index 100%
rename from tests/tests/chage/13_chsh_locked_passwd/config.txt
rename to tests/chage/13_chsh_locked_passwd/config.txt
diff --git a/tests/tests/chage/13_chsh_locked_passwd/config/etc/group b/tests/chage/13_chsh_locked_passwd/config/etc/group
similarity index 100%
rename from tests/tests/chage/13_chsh_locked_passwd/config/etc/group
rename to tests/chage/13_chsh_locked_passwd/config/etc/group
diff --git a/tests/tests/chage/13_chsh_locked_passwd/config/etc/gshadow b/tests/chage/13_chsh_locked_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/13_chsh_locked_passwd/config/etc/gshadow
rename to tests/chage/13_chsh_locked_passwd/config/etc/gshadow
diff --git a/tests/tests/chage/13_chsh_locked_passwd/config/etc/passwd b/tests/chage/13_chsh_locked_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/13_chsh_locked_passwd/config/etc/passwd
rename to tests/chage/13_chsh_locked_passwd/config/etc/passwd
diff --git a/tests/tests/chage/13_chsh_locked_passwd/config/etc/shadow b/tests/chage/13_chsh_locked_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/13_chsh_locked_passwd/config/etc/shadow
rename to tests/chage/13_chsh_locked_passwd/config/etc/shadow
diff --git a/tests/tests/chage/13_chsh_locked_passwd/data/usage.out b/tests/chage/13_chsh_locked_passwd/data/usage.out
similarity index 100%
rename from tests/tests/chage/13_chsh_locked_passwd/data/usage.out
rename to tests/chage/13_chsh_locked_passwd/data/usage.out
diff --git a/tests/tests/chage/14_chsh_locked_shadow/chage.test b/tests/chage/14_chsh_locked_shadow/chage.test
similarity index 100%
rename from tests/tests/chage/14_chsh_locked_shadow/chage.test
rename to tests/chage/14_chsh_locked_shadow/chage.test
diff --git a/tests/tests/chage/14_chsh_locked_shadow/config.txt b/tests/chage/14_chsh_locked_shadow/config.txt
similarity index 100%
rename from tests/tests/chage/14_chsh_locked_shadow/config.txt
rename to tests/chage/14_chsh_locked_shadow/config.txt
diff --git a/tests/tests/chage/14_chsh_locked_shadow/config/etc/group b/tests/chage/14_chsh_locked_shadow/config/etc/group
similarity index 100%
rename from tests/tests/chage/14_chsh_locked_shadow/config/etc/group
rename to tests/chage/14_chsh_locked_shadow/config/etc/group
diff --git a/tests/tests/chage/14_chsh_locked_shadow/config/etc/gshadow b/tests/chage/14_chsh_locked_shadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/14_chsh_locked_shadow/config/etc/gshadow
rename to tests/chage/14_chsh_locked_shadow/config/etc/gshadow
diff --git a/tests/tests/chage/14_chsh_locked_shadow/config/etc/passwd b/tests/chage/14_chsh_locked_shadow/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/14_chsh_locked_shadow/config/etc/passwd
rename to tests/chage/14_chsh_locked_shadow/config/etc/passwd
diff --git a/tests/tests/chage/14_chsh_locked_shadow/config/etc/shadow b/tests/chage/14_chsh_locked_shadow/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/14_chsh_locked_shadow/config/etc/shadow
rename to tests/chage/14_chsh_locked_shadow/config/etc/shadow
diff --git a/tests/tests/chage/14_chsh_locked_shadow/data/usage.out b/tests/chage/14_chsh_locked_shadow/data/usage.out
similarity index 100%
rename from tests/tests/chage/14_chsh_locked_shadow/data/usage.out
rename to tests/chage/14_chsh_locked_shadow/data/usage.out
diff --git a/tests/tests/chage/15_chage-I_no_shadow_entry/chage.test b/tests/chage/15_chage-I_no_shadow_entry/chage.test
similarity index 100%
rename from tests/tests/chage/15_chage-I_no_shadow_entry/chage.test
rename to tests/chage/15_chage-I_no_shadow_entry/chage.test
diff --git a/tests/tests/chage/15_chage-I_no_shadow_entry/config.txt b/tests/chage/15_chage-I_no_shadow_entry/config.txt
similarity index 100%
rename from tests/tests/chage/15_chage-I_no_shadow_entry/config.txt
rename to tests/chage/15_chage-I_no_shadow_entry/config.txt
diff --git a/tests/tests/chage/15_chage-I_no_shadow_entry/config/etc/group b/tests/chage/15_chage-I_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/chage/15_chage-I_no_shadow_entry/config/etc/group
rename to tests/chage/15_chage-I_no_shadow_entry/config/etc/group
diff --git a/tests/tests/chage/15_chage-I_no_shadow_entry/config/etc/gshadow b/tests/chage/15_chage-I_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/15_chage-I_no_shadow_entry/config/etc/gshadow
rename to tests/chage/15_chage-I_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/chage/15_chage-I_no_shadow_entry/config/etc/login.defs b/tests/chage/15_chage-I_no_shadow_entry/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/15_chage-I_no_shadow_entry/config/etc/login.defs
rename to tests/chage/15_chage-I_no_shadow_entry/config/etc/login.defs
diff --git a/tests/tests/chage/15_chage-I_no_shadow_entry/config/etc/passwd b/tests/chage/15_chage-I_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/15_chage-I_no_shadow_entry/config/etc/passwd
rename to tests/chage/15_chage-I_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/chage/15_chage-I_no_shadow_entry/config/etc/shadow b/tests/chage/15_chage-I_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/15_chage-I_no_shadow_entry/config/etc/shadow
rename to tests/chage/15_chage-I_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/chage/15_chage-I_no_shadow_entry/data/passwd b/tests/chage/15_chage-I_no_shadow_entry/data/passwd
similarity index 100%
rename from tests/tests/chage/15_chage-I_no_shadow_entry/data/passwd
rename to tests/chage/15_chage-I_no_shadow_entry/data/passwd
diff --git a/tests/tests/chage/15_chage-I_no_shadow_entry/data/shadow b/tests/chage/15_chage-I_no_shadow_entry/data/shadow
similarity index 100%
rename from tests/tests/chage/15_chage-I_no_shadow_entry/data/shadow
rename to tests/chage/15_chage-I_no_shadow_entry/data/shadow
diff --git a/tests/tests/chage/16_chage-m_no_shadow_entry/chage.test b/tests/chage/16_chage-m_no_shadow_entry/chage.test
similarity index 100%
rename from tests/tests/chage/16_chage-m_no_shadow_entry/chage.test
rename to tests/chage/16_chage-m_no_shadow_entry/chage.test
diff --git a/tests/tests/chage/16_chage-m_no_shadow_entry/config.txt b/tests/chage/16_chage-m_no_shadow_entry/config.txt
similarity index 100%
rename from tests/tests/chage/16_chage-m_no_shadow_entry/config.txt
rename to tests/chage/16_chage-m_no_shadow_entry/config.txt
diff --git a/tests/tests/chage/16_chage-m_no_shadow_entry/config/etc/group b/tests/chage/16_chage-m_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/chage/16_chage-m_no_shadow_entry/config/etc/group
rename to tests/chage/16_chage-m_no_shadow_entry/config/etc/group
diff --git a/tests/tests/chage/16_chage-m_no_shadow_entry/config/etc/gshadow b/tests/chage/16_chage-m_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/16_chage-m_no_shadow_entry/config/etc/gshadow
rename to tests/chage/16_chage-m_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/chage/16_chage-m_no_shadow_entry/config/etc/login.defs b/tests/chage/16_chage-m_no_shadow_entry/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/16_chage-m_no_shadow_entry/config/etc/login.defs
rename to tests/chage/16_chage-m_no_shadow_entry/config/etc/login.defs
diff --git a/tests/tests/chage/16_chage-m_no_shadow_entry/config/etc/passwd b/tests/chage/16_chage-m_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/16_chage-m_no_shadow_entry/config/etc/passwd
rename to tests/chage/16_chage-m_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/chage/16_chage-m_no_shadow_entry/config/etc/shadow b/tests/chage/16_chage-m_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/16_chage-m_no_shadow_entry/config/etc/shadow
rename to tests/chage/16_chage-m_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/chage/16_chage-m_no_shadow_entry/data/passwd b/tests/chage/16_chage-m_no_shadow_entry/data/passwd
similarity index 100%
rename from tests/tests/chage/16_chage-m_no_shadow_entry/data/passwd
rename to tests/chage/16_chage-m_no_shadow_entry/data/passwd
diff --git a/tests/tests/chage/16_chage-m_no_shadow_entry/data/shadow b/tests/chage/16_chage-m_no_shadow_entry/data/shadow
similarity index 100%
rename from tests/tests/chage/16_chage-m_no_shadow_entry/data/shadow
rename to tests/chage/16_chage-m_no_shadow_entry/data/shadow
diff --git a/tests/tests/chage/17_chage-M_no_shadow_entry/chage.test b/tests/chage/17_chage-M_no_shadow_entry/chage.test
similarity index 100%
rename from tests/tests/chage/17_chage-M_no_shadow_entry/chage.test
rename to tests/chage/17_chage-M_no_shadow_entry/chage.test
diff --git a/tests/tests/chage/17_chage-M_no_shadow_entry/config.txt b/tests/chage/17_chage-M_no_shadow_entry/config.txt
similarity index 100%
rename from tests/tests/chage/17_chage-M_no_shadow_entry/config.txt
rename to tests/chage/17_chage-M_no_shadow_entry/config.txt
diff --git a/tests/tests/chage/17_chage-M_no_shadow_entry/config/etc/group b/tests/chage/17_chage-M_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/chage/17_chage-M_no_shadow_entry/config/etc/group
rename to tests/chage/17_chage-M_no_shadow_entry/config/etc/group
diff --git a/tests/tests/chage/17_chage-M_no_shadow_entry/config/etc/gshadow b/tests/chage/17_chage-M_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/17_chage-M_no_shadow_entry/config/etc/gshadow
rename to tests/chage/17_chage-M_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/chage/17_chage-M_no_shadow_entry/config/etc/login.defs b/tests/chage/17_chage-M_no_shadow_entry/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/17_chage-M_no_shadow_entry/config/etc/login.defs
rename to tests/chage/17_chage-M_no_shadow_entry/config/etc/login.defs
diff --git a/tests/tests/chage/17_chage-M_no_shadow_entry/config/etc/passwd b/tests/chage/17_chage-M_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/17_chage-M_no_shadow_entry/config/etc/passwd
rename to tests/chage/17_chage-M_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/chage/17_chage-M_no_shadow_entry/config/etc/shadow b/tests/chage/17_chage-M_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/17_chage-M_no_shadow_entry/config/etc/shadow
rename to tests/chage/17_chage-M_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/chage/17_chage-M_no_shadow_entry/data/passwd b/tests/chage/17_chage-M_no_shadow_entry/data/passwd
similarity index 100%
rename from tests/tests/chage/17_chage-M_no_shadow_entry/data/passwd
rename to tests/chage/17_chage-M_no_shadow_entry/data/passwd
diff --git a/tests/tests/chage/17_chage-M_no_shadow_entry/data/shadow b/tests/chage/17_chage-M_no_shadow_entry/data/shadow
similarity index 100%
rename from tests/tests/chage/17_chage-M_no_shadow_entry/data/shadow
rename to tests/chage/17_chage-M_no_shadow_entry/data/shadow
diff --git a/tests/tests/chage/18_chage-d_no_shadow_entry/chage.test b/tests/chage/18_chage-d_no_shadow_entry/chage.test
similarity index 100%
rename from tests/tests/chage/18_chage-d_no_shadow_entry/chage.test
rename to tests/chage/18_chage-d_no_shadow_entry/chage.test
diff --git a/tests/tests/chage/18_chage-d_no_shadow_entry/config.txt b/tests/chage/18_chage-d_no_shadow_entry/config.txt
similarity index 100%
rename from tests/tests/chage/18_chage-d_no_shadow_entry/config.txt
rename to tests/chage/18_chage-d_no_shadow_entry/config.txt
diff --git a/tests/tests/chage/18_chage-d_no_shadow_entry/config/etc/group b/tests/chage/18_chage-d_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/chage/18_chage-d_no_shadow_entry/config/etc/group
rename to tests/chage/18_chage-d_no_shadow_entry/config/etc/group
diff --git a/tests/tests/chage/18_chage-d_no_shadow_entry/config/etc/gshadow b/tests/chage/18_chage-d_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/18_chage-d_no_shadow_entry/config/etc/gshadow
rename to tests/chage/18_chage-d_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/chage/18_chage-d_no_shadow_entry/config/etc/login.defs b/tests/chage/18_chage-d_no_shadow_entry/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/18_chage-d_no_shadow_entry/config/etc/login.defs
rename to tests/chage/18_chage-d_no_shadow_entry/config/etc/login.defs
diff --git a/tests/tests/chage/18_chage-d_no_shadow_entry/config/etc/passwd b/tests/chage/18_chage-d_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/18_chage-d_no_shadow_entry/config/etc/passwd
rename to tests/chage/18_chage-d_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/chage/18_chage-d_no_shadow_entry/config/etc/shadow b/tests/chage/18_chage-d_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/18_chage-d_no_shadow_entry/config/etc/shadow
rename to tests/chage/18_chage-d_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/chage/18_chage-d_no_shadow_entry/data/passwd b/tests/chage/18_chage-d_no_shadow_entry/data/passwd
similarity index 100%
rename from tests/tests/chage/18_chage-d_no_shadow_entry/data/passwd
rename to tests/chage/18_chage-d_no_shadow_entry/data/passwd
diff --git a/tests/tests/chage/18_chage-d_no_shadow_entry/data/shadow b/tests/chage/18_chage-d_no_shadow_entry/data/shadow
similarity index 100%
rename from tests/tests/chage/18_chage-d_no_shadow_entry/data/shadow
rename to tests/chage/18_chage-d_no_shadow_entry/data/shadow
diff --git a/tests/tests/chage/19_chage-W_no_shadow_entry/chage.test b/tests/chage/19_chage-W_no_shadow_entry/chage.test
similarity index 100%
rename from tests/tests/chage/19_chage-W_no_shadow_entry/chage.test
rename to tests/chage/19_chage-W_no_shadow_entry/chage.test
diff --git a/tests/tests/chage/19_chage-W_no_shadow_entry/config.txt b/tests/chage/19_chage-W_no_shadow_entry/config.txt
similarity index 100%
rename from tests/tests/chage/19_chage-W_no_shadow_entry/config.txt
rename to tests/chage/19_chage-W_no_shadow_entry/config.txt
diff --git a/tests/tests/chage/19_chage-W_no_shadow_entry/config/etc/group b/tests/chage/19_chage-W_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/chage/19_chage-W_no_shadow_entry/config/etc/group
rename to tests/chage/19_chage-W_no_shadow_entry/config/etc/group
diff --git a/tests/tests/chage/19_chage-W_no_shadow_entry/config/etc/gshadow b/tests/chage/19_chage-W_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/19_chage-W_no_shadow_entry/config/etc/gshadow
rename to tests/chage/19_chage-W_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/chage/19_chage-W_no_shadow_entry/config/etc/login.defs b/tests/chage/19_chage-W_no_shadow_entry/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/19_chage-W_no_shadow_entry/config/etc/login.defs
rename to tests/chage/19_chage-W_no_shadow_entry/config/etc/login.defs
diff --git a/tests/tests/chage/19_chage-W_no_shadow_entry/config/etc/passwd b/tests/chage/19_chage-W_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/19_chage-W_no_shadow_entry/config/etc/passwd
rename to tests/chage/19_chage-W_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/chage/19_chage-W_no_shadow_entry/config/etc/shadow b/tests/chage/19_chage-W_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/19_chage-W_no_shadow_entry/config/etc/shadow
rename to tests/chage/19_chage-W_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/chage/19_chage-W_no_shadow_entry/data/passwd b/tests/chage/19_chage-W_no_shadow_entry/data/passwd
similarity index 100%
rename from tests/tests/chage/19_chage-W_no_shadow_entry/data/passwd
rename to tests/chage/19_chage-W_no_shadow_entry/data/passwd
diff --git a/tests/tests/chage/19_chage-W_no_shadow_entry/data/shadow b/tests/chage/19_chage-W_no_shadow_entry/data/shadow
similarity index 100%
rename from tests/tests/chage/19_chage-W_no_shadow_entry/data/shadow
rename to tests/chage/19_chage-W_no_shadow_entry/data/shadow
diff --git a/tests/tests/chage/20_chage-E_no_shadow_entry/chage.test b/tests/chage/20_chage-E_no_shadow_entry/chage.test
similarity index 100%
rename from tests/tests/chage/20_chage-E_no_shadow_entry/chage.test
rename to tests/chage/20_chage-E_no_shadow_entry/chage.test
diff --git a/tests/tests/chage/20_chage-E_no_shadow_entry/config.txt b/tests/chage/20_chage-E_no_shadow_entry/config.txt
similarity index 100%
rename from tests/tests/chage/20_chage-E_no_shadow_entry/config.txt
rename to tests/chage/20_chage-E_no_shadow_entry/config.txt
diff --git a/tests/tests/chage/20_chage-E_no_shadow_entry/config/etc/group b/tests/chage/20_chage-E_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/chage/20_chage-E_no_shadow_entry/config/etc/group
rename to tests/chage/20_chage-E_no_shadow_entry/config/etc/group
diff --git a/tests/tests/chage/20_chage-E_no_shadow_entry/config/etc/gshadow b/tests/chage/20_chage-E_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/20_chage-E_no_shadow_entry/config/etc/gshadow
rename to tests/chage/20_chage-E_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/chage/20_chage-E_no_shadow_entry/config/etc/login.defs b/tests/chage/20_chage-E_no_shadow_entry/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/20_chage-E_no_shadow_entry/config/etc/login.defs
rename to tests/chage/20_chage-E_no_shadow_entry/config/etc/login.defs
diff --git a/tests/tests/chage/20_chage-E_no_shadow_entry/config/etc/passwd b/tests/chage/20_chage-E_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/20_chage-E_no_shadow_entry/config/etc/passwd
rename to tests/chage/20_chage-E_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/chage/20_chage-E_no_shadow_entry/config/etc/shadow b/tests/chage/20_chage-E_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/20_chage-E_no_shadow_entry/config/etc/shadow
rename to tests/chage/20_chage-E_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/chage/20_chage-E_no_shadow_entry/data/passwd b/tests/chage/20_chage-E_no_shadow_entry/data/passwd
similarity index 100%
rename from tests/tests/chage/20_chage-E_no_shadow_entry/data/passwd
rename to tests/chage/20_chage-E_no_shadow_entry/data/passwd
diff --git a/tests/tests/chage/20_chage-E_no_shadow_entry/data/shadow b/tests/chage/20_chage-E_no_shadow_entry/data/shadow
similarity index 100%
rename from tests/tests/chage/20_chage-E_no_shadow_entry/data/shadow
rename to tests/chage/20_chage-E_no_shadow_entry/data/shadow
diff --git a/tests/tests/chage/21_chage_no_shadow_file/chage.test b/tests/chage/21_chage_no_shadow_file/chage.test
similarity index 100%
rename from tests/tests/chage/21_chage_no_shadow_file/chage.test
rename to tests/chage/21_chage_no_shadow_file/chage.test
diff --git a/tests/tests/chage/21_chage_no_shadow_file/config.txt b/tests/chage/21_chage_no_shadow_file/config.txt
similarity index 100%
rename from tests/tests/chage/21_chage_no_shadow_file/config.txt
rename to tests/chage/21_chage_no_shadow_file/config.txt
diff --git a/tests/tests/chage/21_chage_no_shadow_file/config/etc/group b/tests/chage/21_chage_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/chage/21_chage_no_shadow_file/config/etc/group
rename to tests/chage/21_chage_no_shadow_file/config/etc/group
diff --git a/tests/tests/chage/21_chage_no_shadow_file/config/etc/gshadow b/tests/chage/21_chage_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/21_chage_no_shadow_file/config/etc/gshadow
rename to tests/chage/21_chage_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/chage/21_chage_no_shadow_file/config/etc/passwd b/tests/chage/21_chage_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/21_chage_no_shadow_file/config/etc/passwd
rename to tests/chage/21_chage_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/chage/21_chage_no_shadow_file/config/etc/shadow b/tests/chage/21_chage_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/21_chage_no_shadow_file/config/etc/shadow
rename to tests/chage/21_chage_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/chage/21_chage_no_shadow_file/data/usage.out b/tests/chage/21_chage_no_shadow_file/data/usage.out
similarity index 100%
rename from tests/tests/chage/21_chage_no_shadow_file/data/usage.out
rename to tests/chage/21_chage_no_shadow_file/data/usage.out
diff --git a/tests/tests/chage/22_chage_myuser-l/chage.test b/tests/chage/22_chage_myuser-l/chage.test
similarity index 100%
rename from tests/tests/chage/22_chage_myuser-l/chage.test
rename to tests/chage/22_chage_myuser-l/chage.test
diff --git a/tests/tests/chage/22_chage_myuser-l/config.txt b/tests/chage/22_chage_myuser-l/config.txt
similarity index 100%
rename from tests/tests/chage/22_chage_myuser-l/config.txt
rename to tests/chage/22_chage_myuser-l/config.txt
diff --git a/tests/tests/chage/22_chage_myuser-l/config/etc/group b/tests/chage/22_chage_myuser-l/config/etc/group
similarity index 100%
rename from tests/tests/chage/22_chage_myuser-l/config/etc/group
rename to tests/chage/22_chage_myuser-l/config/etc/group
diff --git a/tests/tests/chage/22_chage_myuser-l/config/etc/gshadow b/tests/chage/22_chage_myuser-l/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/22_chage_myuser-l/config/etc/gshadow
rename to tests/chage/22_chage_myuser-l/config/etc/gshadow
diff --git a/tests/tests/chage/22_chage_myuser-l/config/etc/passwd b/tests/chage/22_chage_myuser-l/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/22_chage_myuser-l/config/etc/passwd
rename to tests/chage/22_chage_myuser-l/config/etc/passwd
diff --git a/tests/tests/chage/22_chage_myuser-l/config/etc/shadow b/tests/chage/22_chage_myuser-l/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/22_chage_myuser-l/config/etc/shadow
rename to tests/chage/22_chage_myuser-l/config/etc/shadow
diff --git a/tests/tests/chage/22_chage_myuser-l/data/myuser1 b/tests/chage/22_chage_myuser-l/data/myuser1
similarity index 100%
rename from tests/tests/chage/22_chage_myuser-l/data/myuser1
rename to tests/chage/22_chage_myuser-l/data/myuser1
diff --git a/tests/tests/chage/23_chage_myuser-I/chage.test b/tests/chage/23_chage_myuser-I/chage.test
similarity index 100%
rename from tests/tests/chage/23_chage_myuser-I/chage.test
rename to tests/chage/23_chage_myuser-I/chage.test
diff --git a/tests/tests/chage/23_chage_myuser-I/config.txt b/tests/chage/23_chage_myuser-I/config.txt
similarity index 100%
rename from tests/tests/chage/23_chage_myuser-I/config.txt
rename to tests/chage/23_chage_myuser-I/config.txt
diff --git a/tests/tests/chage/23_chage_myuser-I/config/etc/group b/tests/chage/23_chage_myuser-I/config/etc/group
similarity index 100%
rename from tests/tests/chage/23_chage_myuser-I/config/etc/group
rename to tests/chage/23_chage_myuser-I/config/etc/group
diff --git a/tests/tests/chage/23_chage_myuser-I/config/etc/gshadow b/tests/chage/23_chage_myuser-I/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/23_chage_myuser-I/config/etc/gshadow
rename to tests/chage/23_chage_myuser-I/config/etc/gshadow
diff --git a/tests/tests/chage/23_chage_myuser-I/config/etc/passwd b/tests/chage/23_chage_myuser-I/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/23_chage_myuser-I/config/etc/passwd
rename to tests/chage/23_chage_myuser-I/config/etc/passwd
diff --git a/tests/tests/chage/23_chage_myuser-I/config/etc/shadow b/tests/chage/23_chage_myuser-I/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/23_chage_myuser-I/config/etc/shadow
rename to tests/chage/23_chage_myuser-I/config/etc/shadow
diff --git a/tests/tests/chage/23_chage_myuser-I/data/usage.out b/tests/chage/23_chage_myuser-I/data/usage.out
similarity index 100%
rename from tests/tests/chage/23_chage_myuser-I/data/usage.out
rename to tests/chage/23_chage_myuser-I/data/usage.out
diff --git a/tests/tests/chage/24_chage_myuser-l_other/chage.test b/tests/chage/24_chage_myuser-l_other/chage.test
similarity index 100%
rename from tests/tests/chage/24_chage_myuser-l_other/chage.test
rename to tests/chage/24_chage_myuser-l_other/chage.test
diff --git a/tests/tests/chage/24_chage_myuser-l_other/config.txt b/tests/chage/24_chage_myuser-l_other/config.txt
similarity index 100%
rename from tests/tests/chage/24_chage_myuser-l_other/config.txt
rename to tests/chage/24_chage_myuser-l_other/config.txt
diff --git a/tests/tests/chage/24_chage_myuser-l_other/config/etc/group b/tests/chage/24_chage_myuser-l_other/config/etc/group
similarity index 100%
rename from tests/tests/chage/24_chage_myuser-l_other/config/etc/group
rename to tests/chage/24_chage_myuser-l_other/config/etc/group
diff --git a/tests/tests/chage/24_chage_myuser-l_other/config/etc/gshadow b/tests/chage/24_chage_myuser-l_other/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/24_chage_myuser-l_other/config/etc/gshadow
rename to tests/chage/24_chage_myuser-l_other/config/etc/gshadow
diff --git a/tests/tests/chage/24_chage_myuser-l_other/config/etc/passwd b/tests/chage/24_chage_myuser-l_other/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/24_chage_myuser-l_other/config/etc/passwd
rename to tests/chage/24_chage_myuser-l_other/config/etc/passwd
diff --git a/tests/tests/chage/24_chage_myuser-l_other/config/etc/shadow b/tests/chage/24_chage_myuser-l_other/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/24_chage_myuser-l_other/config/etc/shadow
rename to tests/chage/24_chage_myuser-l_other/config/etc/shadow
diff --git a/tests/tests/chage/24_chage_myuser-l_other/data/usage.out b/tests/chage/24_chage_myuser-l_other/data/usage.out
similarity index 100%
rename from tests/tests/chage/24_chage_myuser-l_other/data/usage.out
rename to tests/chage/24_chage_myuser-l_other/data/usage.out
diff --git a/tests/tests/chage/25_chage_interactive/chage.test b/tests/chage/25_chage_interactive/chage.test
similarity index 100%
rename from tests/tests/chage/25_chage_interactive/chage.test
rename to tests/chage/25_chage_interactive/chage.test
diff --git a/tests/tests/chage/25_chage_interactive/config.txt b/tests/chage/25_chage_interactive/config.txt
similarity index 100%
rename from tests/tests/chage/25_chage_interactive/config.txt
rename to tests/chage/25_chage_interactive/config.txt
diff --git a/tests/tests/chage/25_chage_interactive/config/etc/group b/tests/chage/25_chage_interactive/config/etc/group
similarity index 100%
rename from tests/tests/chage/25_chage_interactive/config/etc/group
rename to tests/chage/25_chage_interactive/config/etc/group
diff --git a/tests/tests/chage/25_chage_interactive/config/etc/gshadow b/tests/chage/25_chage_interactive/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/25_chage_interactive/config/etc/gshadow
rename to tests/chage/25_chage_interactive/config/etc/gshadow
diff --git a/tests/tests/chage/25_chage_interactive/config/etc/login.defs b/tests/chage/25_chage_interactive/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/25_chage_interactive/config/etc/login.defs
rename to tests/chage/25_chage_interactive/config/etc/login.defs
diff --git a/tests/tests/chage/25_chage_interactive/config/etc/passwd b/tests/chage/25_chage_interactive/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/25_chage_interactive/config/etc/passwd
rename to tests/chage/25_chage_interactive/config/etc/passwd
diff --git a/tests/tests/chage/25_chage_interactive/config/etc/shadow b/tests/chage/25_chage_interactive/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/25_chage_interactive/config/etc/shadow
rename to tests/chage/25_chage_interactive/config/etc/shadow
diff --git a/tests/tests/chage/25_chage_interactive/data/shadow b/tests/chage/25_chage_interactive/data/shadow
similarity index 100%
rename from tests/tests/chage/25_chage_interactive/data/shadow
rename to tests/chage/25_chage_interactive/data/shadow
diff --git a/tests/tests/chage/25_chage_interactive/run.exp b/tests/chage/25_chage_interactive/run.exp
similarity index 100%
rename from tests/tests/chage/25_chage_interactive/run.exp
rename to tests/chage/25_chage_interactive/run.exp
diff --git a/tests/tests/chage/26_chage_interactive_date_0/chage.test b/tests/chage/26_chage_interactive_date_0/chage.test
similarity index 100%
rename from tests/tests/chage/26_chage_interactive_date_0/chage.test
rename to tests/chage/26_chage_interactive_date_0/chage.test
diff --git a/tests/tests/chage/26_chage_interactive_date_0/config.txt b/tests/chage/26_chage_interactive_date_0/config.txt
similarity index 100%
rename from tests/tests/chage/26_chage_interactive_date_0/config.txt
rename to tests/chage/26_chage_interactive_date_0/config.txt
diff --git a/tests/tests/chage/26_chage_interactive_date_0/config/etc/group b/tests/chage/26_chage_interactive_date_0/config/etc/group
similarity index 100%
rename from tests/tests/chage/26_chage_interactive_date_0/config/etc/group
rename to tests/chage/26_chage_interactive_date_0/config/etc/group
diff --git a/tests/tests/chage/26_chage_interactive_date_0/config/etc/gshadow b/tests/chage/26_chage_interactive_date_0/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/26_chage_interactive_date_0/config/etc/gshadow
rename to tests/chage/26_chage_interactive_date_0/config/etc/gshadow
diff --git a/tests/tests/chage/26_chage_interactive_date_0/config/etc/login.defs b/tests/chage/26_chage_interactive_date_0/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/26_chage_interactive_date_0/config/etc/login.defs
rename to tests/chage/26_chage_interactive_date_0/config/etc/login.defs
diff --git a/tests/tests/chage/26_chage_interactive_date_0/config/etc/passwd b/tests/chage/26_chage_interactive_date_0/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/26_chage_interactive_date_0/config/etc/passwd
rename to tests/chage/26_chage_interactive_date_0/config/etc/passwd
diff --git a/tests/tests/chage/26_chage_interactive_date_0/config/etc/shadow b/tests/chage/26_chage_interactive_date_0/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/26_chage_interactive_date_0/config/etc/shadow
rename to tests/chage/26_chage_interactive_date_0/config/etc/shadow
diff --git a/tests/tests/chage/26_chage_interactive_date_0/data/shadow b/tests/chage/26_chage_interactive_date_0/data/shadow
similarity index 100%
rename from tests/tests/chage/26_chage_interactive_date_0/data/shadow
rename to tests/chage/26_chage_interactive_date_0/data/shadow
diff --git a/tests/tests/chage/26_chage_interactive_date_0/run.exp b/tests/chage/26_chage_interactive_date_0/run.exp
similarity index 100%
rename from tests/tests/chage/26_chage_interactive_date_0/run.exp
rename to tests/chage/26_chage_interactive_date_0/run.exp
diff --git a/tests/tests/chage/27_chage_interactive_date_-1/chage.test b/tests/chage/27_chage_interactive_date_-1/chage.test
similarity index 100%
rename from tests/tests/chage/27_chage_interactive_date_-1/chage.test
rename to tests/chage/27_chage_interactive_date_-1/chage.test
diff --git a/tests/tests/chage/27_chage_interactive_date_-1/config.txt b/tests/chage/27_chage_interactive_date_-1/config.txt
similarity index 100%
rename from tests/tests/chage/27_chage_interactive_date_-1/config.txt
rename to tests/chage/27_chage_interactive_date_-1/config.txt
diff --git a/tests/tests/chage/27_chage_interactive_date_-1/config/etc/group b/tests/chage/27_chage_interactive_date_-1/config/etc/group
similarity index 100%
rename from tests/tests/chage/27_chage_interactive_date_-1/config/etc/group
rename to tests/chage/27_chage_interactive_date_-1/config/etc/group
diff --git a/tests/tests/chage/27_chage_interactive_date_-1/config/etc/gshadow b/tests/chage/27_chage_interactive_date_-1/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/27_chage_interactive_date_-1/config/etc/gshadow
rename to tests/chage/27_chage_interactive_date_-1/config/etc/gshadow
diff --git a/tests/tests/chage/27_chage_interactive_date_-1/config/etc/login.defs b/tests/chage/27_chage_interactive_date_-1/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/27_chage_interactive_date_-1/config/etc/login.defs
rename to tests/chage/27_chage_interactive_date_-1/config/etc/login.defs
diff --git a/tests/tests/chage/27_chage_interactive_date_-1/config/etc/passwd b/tests/chage/27_chage_interactive_date_-1/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/27_chage_interactive_date_-1/config/etc/passwd
rename to tests/chage/27_chage_interactive_date_-1/config/etc/passwd
diff --git a/tests/tests/chage/27_chage_interactive_date_-1/config/etc/shadow b/tests/chage/27_chage_interactive_date_-1/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/27_chage_interactive_date_-1/config/etc/shadow
rename to tests/chage/27_chage_interactive_date_-1/config/etc/shadow
diff --git a/tests/tests/chage/27_chage_interactive_date_-1/data/shadow b/tests/chage/27_chage_interactive_date_-1/data/shadow
similarity index 100%
rename from tests/tests/chage/27_chage_interactive_date_-1/data/shadow
rename to tests/chage/27_chage_interactive_date_-1/data/shadow
diff --git a/tests/tests/chage/27_chage_interactive_date_-1/run.exp b/tests/chage/27_chage_interactive_date_-1/run.exp
similarity index 100%
rename from tests/tests/chage/27_chage_interactive_date_-1/run.exp
rename to tests/chage/27_chage_interactive_date_-1/run.exp
diff --git a/tests/tests/chage/28_chage_interactive_date_EPOCH/chage.test b/tests/chage/28_chage_interactive_date_EPOCH/chage.test
similarity index 100%
rename from tests/tests/chage/28_chage_interactive_date_EPOCH/chage.test
rename to tests/chage/28_chage_interactive_date_EPOCH/chage.test
diff --git a/tests/tests/chage/28_chage_interactive_date_EPOCH/config.txt b/tests/chage/28_chage_interactive_date_EPOCH/config.txt
similarity index 100%
rename from tests/tests/chage/28_chage_interactive_date_EPOCH/config.txt
rename to tests/chage/28_chage_interactive_date_EPOCH/config.txt
diff --git a/tests/tests/chage/28_chage_interactive_date_EPOCH/config/etc/group b/tests/chage/28_chage_interactive_date_EPOCH/config/etc/group
similarity index 100%
rename from tests/tests/chage/28_chage_interactive_date_EPOCH/config/etc/group
rename to tests/chage/28_chage_interactive_date_EPOCH/config/etc/group
diff --git a/tests/tests/chage/28_chage_interactive_date_EPOCH/config/etc/gshadow b/tests/chage/28_chage_interactive_date_EPOCH/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/28_chage_interactive_date_EPOCH/config/etc/gshadow
rename to tests/chage/28_chage_interactive_date_EPOCH/config/etc/gshadow
diff --git a/tests/tests/chage/28_chage_interactive_date_EPOCH/config/etc/login.defs b/tests/chage/28_chage_interactive_date_EPOCH/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/28_chage_interactive_date_EPOCH/config/etc/login.defs
rename to tests/chage/28_chage_interactive_date_EPOCH/config/etc/login.defs
diff --git a/tests/tests/chage/28_chage_interactive_date_EPOCH/config/etc/passwd b/tests/chage/28_chage_interactive_date_EPOCH/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/28_chage_interactive_date_EPOCH/config/etc/passwd
rename to tests/chage/28_chage_interactive_date_EPOCH/config/etc/passwd
diff --git a/tests/tests/chage/28_chage_interactive_date_EPOCH/config/etc/shadow b/tests/chage/28_chage_interactive_date_EPOCH/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/28_chage_interactive_date_EPOCH/config/etc/shadow
rename to tests/chage/28_chage_interactive_date_EPOCH/config/etc/shadow
diff --git a/tests/tests/chage/28_chage_interactive_date_EPOCH/data/shadow b/tests/chage/28_chage_interactive_date_EPOCH/data/shadow
similarity index 100%
rename from tests/tests/chage/28_chage_interactive_date_EPOCH/data/shadow
rename to tests/chage/28_chage_interactive_date_EPOCH/data/shadow
diff --git a/tests/tests/chage/28_chage_interactive_date_EPOCH/run.exp b/tests/chage/28_chage_interactive_date_EPOCH/run.exp
similarity index 100%
rename from tests/tests/chage/28_chage_interactive_date_EPOCH/run.exp
rename to tests/chage/28_chage_interactive_date_EPOCH/run.exp
diff --git a/tests/tests/chage/29_chage_interactive_date_pre-EPOCH/chage.test b/tests/chage/29_chage_interactive_date_pre-EPOCH/chage.test
similarity index 100%
rename from tests/tests/chage/29_chage_interactive_date_pre-EPOCH/chage.test
rename to tests/chage/29_chage_interactive_date_pre-EPOCH/chage.test
diff --git a/tests/tests/chage/29_chage_interactive_date_pre-EPOCH/config.txt b/tests/chage/29_chage_interactive_date_pre-EPOCH/config.txt
similarity index 100%
rename from tests/tests/chage/29_chage_interactive_date_pre-EPOCH/config.txt
rename to tests/chage/29_chage_interactive_date_pre-EPOCH/config.txt
diff --git a/tests/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/group b/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/group
similarity index 100%
rename from tests/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/group
rename to tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/group
diff --git a/tests/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/gshadow b/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/gshadow
rename to tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/gshadow
diff --git a/tests/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/login.defs b/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/login.defs
rename to tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/login.defs
diff --git a/tests/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/passwd b/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/passwd
rename to tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/passwd
diff --git a/tests/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/shadow b/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/shadow
rename to tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/shadow
diff --git a/tests/tests/chage/29_chage_interactive_date_pre-EPOCH/run.exp b/tests/chage/29_chage_interactive_date_pre-EPOCH/run.exp
similarity index 100%
rename from tests/tests/chage/29_chage_interactive_date_pre-EPOCH/run.exp
rename to tests/chage/29_chage_interactive_date_pre-EPOCH/run.exp
diff --git a/tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/chage.test b/tests/chage/30_chage_interactive_date_pre-EPOCH2/chage.test
similarity index 100%
rename from tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/chage.test
rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/chage.test
diff --git a/tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/config.txt b/tests/chage/30_chage_interactive_date_pre-EPOCH2/config.txt
similarity index 100%
rename from tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/config.txt
rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/config.txt
diff --git a/tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/group b/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/group
similarity index 100%
rename from tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/group
rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/group
diff --git a/tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/gshadow b/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/gshadow
rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/gshadow
diff --git a/tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/login.defs b/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/login.defs
rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/login.defs
diff --git a/tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/passwd b/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/passwd
rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/passwd
diff --git a/tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/shadow b/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/shadow
rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/shadow
diff --git a/tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/run.exp b/tests/chage/30_chage_interactive_date_pre-EPOCH2/run.exp
similarity index 100%
rename from tests/tests/chage/30_chage_interactive_date_pre-EPOCH2/run.exp
rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/run.exp
diff --git a/tests/tests/chage/31_chage_interactive_date_invalid/chage.test b/tests/chage/31_chage_interactive_date_invalid/chage.test
similarity index 100%
rename from tests/tests/chage/31_chage_interactive_date_invalid/chage.test
rename to tests/chage/31_chage_interactive_date_invalid/chage.test
diff --git a/tests/tests/chage/31_chage_interactive_date_invalid/config.txt b/tests/chage/31_chage_interactive_date_invalid/config.txt
similarity index 100%
rename from tests/tests/chage/31_chage_interactive_date_invalid/config.txt
rename to tests/chage/31_chage_interactive_date_invalid/config.txt
diff --git a/tests/tests/chage/31_chage_interactive_date_invalid/config/etc/group b/tests/chage/31_chage_interactive_date_invalid/config/etc/group
similarity index 100%
rename from tests/tests/chage/31_chage_interactive_date_invalid/config/etc/group
rename to tests/chage/31_chage_interactive_date_invalid/config/etc/group
diff --git a/tests/tests/chage/31_chage_interactive_date_invalid/config/etc/gshadow b/tests/chage/31_chage_interactive_date_invalid/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/31_chage_interactive_date_invalid/config/etc/gshadow
rename to tests/chage/31_chage_interactive_date_invalid/config/etc/gshadow
diff --git a/tests/tests/chage/31_chage_interactive_date_invalid/config/etc/login.defs b/tests/chage/31_chage_interactive_date_invalid/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/31_chage_interactive_date_invalid/config/etc/login.defs
rename to tests/chage/31_chage_interactive_date_invalid/config/etc/login.defs
diff --git a/tests/tests/chage/31_chage_interactive_date_invalid/config/etc/passwd b/tests/chage/31_chage_interactive_date_invalid/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/31_chage_interactive_date_invalid/config/etc/passwd
rename to tests/chage/31_chage_interactive_date_invalid/config/etc/passwd
diff --git a/tests/tests/chage/31_chage_interactive_date_invalid/config/etc/shadow b/tests/chage/31_chage_interactive_date_invalid/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/31_chage_interactive_date_invalid/config/etc/shadow
rename to tests/chage/31_chage_interactive_date_invalid/config/etc/shadow
diff --git a/tests/tests/chage/31_chage_interactive_date_invalid/run.exp b/tests/chage/31_chage_interactive_date_invalid/run.exp
similarity index 100%
rename from tests/tests/chage/31_chage_interactive_date_invalid/run.exp
rename to tests/chage/31_chage_interactive_date_invalid/run.exp
diff --git a/tests/tests/chage/32_chage_interactive_date_invalid2/chage.test b/tests/chage/32_chage_interactive_date_invalid2/chage.test
similarity index 100%
rename from tests/tests/chage/32_chage_interactive_date_invalid2/chage.test
rename to tests/chage/32_chage_interactive_date_invalid2/chage.test
diff --git a/tests/tests/chage/32_chage_interactive_date_invalid2/config.txt b/tests/chage/32_chage_interactive_date_invalid2/config.txt
similarity index 100%
rename from tests/tests/chage/32_chage_interactive_date_invalid2/config.txt
rename to tests/chage/32_chage_interactive_date_invalid2/config.txt
diff --git a/tests/tests/chage/32_chage_interactive_date_invalid2/config/etc/group b/tests/chage/32_chage_interactive_date_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/chage/32_chage_interactive_date_invalid2/config/etc/group
rename to tests/chage/32_chage_interactive_date_invalid2/config/etc/group
diff --git a/tests/tests/chage/32_chage_interactive_date_invalid2/config/etc/gshadow b/tests/chage/32_chage_interactive_date_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/32_chage_interactive_date_invalid2/config/etc/gshadow
rename to tests/chage/32_chage_interactive_date_invalid2/config/etc/gshadow
diff --git a/tests/tests/chage/32_chage_interactive_date_invalid2/config/etc/login.defs b/tests/chage/32_chage_interactive_date_invalid2/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/32_chage_interactive_date_invalid2/config/etc/login.defs
rename to tests/chage/32_chage_interactive_date_invalid2/config/etc/login.defs
diff --git a/tests/tests/chage/32_chage_interactive_date_invalid2/config/etc/passwd b/tests/chage/32_chage_interactive_date_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/32_chage_interactive_date_invalid2/config/etc/passwd
rename to tests/chage/32_chage_interactive_date_invalid2/config/etc/passwd
diff --git a/tests/tests/chage/32_chage_interactive_date_invalid2/config/etc/shadow b/tests/chage/32_chage_interactive_date_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/32_chage_interactive_date_invalid2/config/etc/shadow
rename to tests/chage/32_chage_interactive_date_invalid2/config/etc/shadow
diff --git a/tests/tests/chage/32_chage_interactive_date_invalid2/run.exp b/tests/chage/32_chage_interactive_date_invalid2/run.exp
similarity index 100%
rename from tests/tests/chage/32_chage_interactive_date_invalid2/run.exp
rename to tests/chage/32_chage_interactive_date_invalid2/run.exp
diff --git a/tests/tests/chage/33_chage_interactive-W_invalid1/chage.test b/tests/chage/33_chage_interactive-W_invalid1/chage.test
similarity index 100%
rename from tests/tests/chage/33_chage_interactive-W_invalid1/chage.test
rename to tests/chage/33_chage_interactive-W_invalid1/chage.test
diff --git a/tests/tests/chage/33_chage_interactive-W_invalid1/config.txt b/tests/chage/33_chage_interactive-W_invalid1/config.txt
similarity index 100%
rename from tests/tests/chage/33_chage_interactive-W_invalid1/config.txt
rename to tests/chage/33_chage_interactive-W_invalid1/config.txt
diff --git a/tests/tests/chage/33_chage_interactive-W_invalid1/config/etc/group b/tests/chage/33_chage_interactive-W_invalid1/config/etc/group
similarity index 100%
rename from tests/tests/chage/33_chage_interactive-W_invalid1/config/etc/group
rename to tests/chage/33_chage_interactive-W_invalid1/config/etc/group
diff --git a/tests/tests/chage/33_chage_interactive-W_invalid1/config/etc/gshadow b/tests/chage/33_chage_interactive-W_invalid1/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/33_chage_interactive-W_invalid1/config/etc/gshadow
rename to tests/chage/33_chage_interactive-W_invalid1/config/etc/gshadow
diff --git a/tests/tests/chage/33_chage_interactive-W_invalid1/config/etc/login.defs b/tests/chage/33_chage_interactive-W_invalid1/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/33_chage_interactive-W_invalid1/config/etc/login.defs
rename to tests/chage/33_chage_interactive-W_invalid1/config/etc/login.defs
diff --git a/tests/tests/chage/33_chage_interactive-W_invalid1/config/etc/passwd b/tests/chage/33_chage_interactive-W_invalid1/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/33_chage_interactive-W_invalid1/config/etc/passwd
rename to tests/chage/33_chage_interactive-W_invalid1/config/etc/passwd
diff --git a/tests/tests/chage/33_chage_interactive-W_invalid1/config/etc/shadow b/tests/chage/33_chage_interactive-W_invalid1/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/33_chage_interactive-W_invalid1/config/etc/shadow
rename to tests/chage/33_chage_interactive-W_invalid1/config/etc/shadow
diff --git a/tests/tests/chage/33_chage_interactive-W_invalid1/run.exp b/tests/chage/33_chage_interactive-W_invalid1/run.exp
similarity index 100%
rename from tests/tests/chage/33_chage_interactive-W_invalid1/run.exp
rename to tests/chage/33_chage_interactive-W_invalid1/run.exp
diff --git a/tests/tests/chage/34_chage_interactive-W_invalid2/chage.test b/tests/chage/34_chage_interactive-W_invalid2/chage.test
similarity index 100%
rename from tests/tests/chage/34_chage_interactive-W_invalid2/chage.test
rename to tests/chage/34_chage_interactive-W_invalid2/chage.test
diff --git a/tests/tests/chage/34_chage_interactive-W_invalid2/config.txt b/tests/chage/34_chage_interactive-W_invalid2/config.txt
similarity index 100%
rename from tests/tests/chage/34_chage_interactive-W_invalid2/config.txt
rename to tests/chage/34_chage_interactive-W_invalid2/config.txt
diff --git a/tests/tests/chage/34_chage_interactive-W_invalid2/config/etc/group b/tests/chage/34_chage_interactive-W_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/chage/34_chage_interactive-W_invalid2/config/etc/group
rename to tests/chage/34_chage_interactive-W_invalid2/config/etc/group
diff --git a/tests/tests/chage/34_chage_interactive-W_invalid2/config/etc/gshadow b/tests/chage/34_chage_interactive-W_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/34_chage_interactive-W_invalid2/config/etc/gshadow
rename to tests/chage/34_chage_interactive-W_invalid2/config/etc/gshadow
diff --git a/tests/tests/chage/34_chage_interactive-W_invalid2/config/etc/login.defs b/tests/chage/34_chage_interactive-W_invalid2/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/34_chage_interactive-W_invalid2/config/etc/login.defs
rename to tests/chage/34_chage_interactive-W_invalid2/config/etc/login.defs
diff --git a/tests/tests/chage/34_chage_interactive-W_invalid2/config/etc/passwd b/tests/chage/34_chage_interactive-W_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/34_chage_interactive-W_invalid2/config/etc/passwd
rename to tests/chage/34_chage_interactive-W_invalid2/config/etc/passwd
diff --git a/tests/tests/chage/34_chage_interactive-W_invalid2/config/etc/shadow b/tests/chage/34_chage_interactive-W_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/34_chage_interactive-W_invalid2/config/etc/shadow
rename to tests/chage/34_chage_interactive-W_invalid2/config/etc/shadow
diff --git a/tests/tests/chage/34_chage_interactive-W_invalid2/run.exp b/tests/chage/34_chage_interactive-W_invalid2/run.exp
similarity index 100%
rename from tests/tests/chage/34_chage_interactive-W_invalid2/run.exp
rename to tests/chage/34_chage_interactive-W_invalid2/run.exp
diff --git a/tests/tests/chage/35_chage_interactive-W-1/chage.test b/tests/chage/35_chage_interactive-W-1/chage.test
similarity index 100%
rename from tests/tests/chage/35_chage_interactive-W-1/chage.test
rename to tests/chage/35_chage_interactive-W-1/chage.test
diff --git a/tests/tests/chage/35_chage_interactive-W-1/config.txt b/tests/chage/35_chage_interactive-W-1/config.txt
similarity index 100%
rename from tests/tests/chage/35_chage_interactive-W-1/config.txt
rename to tests/chage/35_chage_interactive-W-1/config.txt
diff --git a/tests/tests/chage/35_chage_interactive-W-1/config/etc/group b/tests/chage/35_chage_interactive-W-1/config/etc/group
similarity index 100%
rename from tests/tests/chage/35_chage_interactive-W-1/config/etc/group
rename to tests/chage/35_chage_interactive-W-1/config/etc/group
diff --git a/tests/tests/chage/35_chage_interactive-W-1/config/etc/gshadow b/tests/chage/35_chage_interactive-W-1/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/35_chage_interactive-W-1/config/etc/gshadow
rename to tests/chage/35_chage_interactive-W-1/config/etc/gshadow
diff --git a/tests/tests/chage/35_chage_interactive-W-1/config/etc/login.defs b/tests/chage/35_chage_interactive-W-1/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/35_chage_interactive-W-1/config/etc/login.defs
rename to tests/chage/35_chage_interactive-W-1/config/etc/login.defs
diff --git a/tests/tests/chage/35_chage_interactive-W-1/config/etc/passwd b/tests/chage/35_chage_interactive-W-1/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/35_chage_interactive-W-1/config/etc/passwd
rename to tests/chage/35_chage_interactive-W-1/config/etc/passwd
diff --git a/tests/tests/chage/35_chage_interactive-W-1/config/etc/shadow b/tests/chage/35_chage_interactive-W-1/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/35_chage_interactive-W-1/config/etc/shadow
rename to tests/chage/35_chage_interactive-W-1/config/etc/shadow
diff --git a/tests/tests/chage/35_chage_interactive-W-1/data/shadow b/tests/chage/35_chage_interactive-W-1/data/shadow
similarity index 100%
rename from tests/tests/chage/35_chage_interactive-W-1/data/shadow
rename to tests/chage/35_chage_interactive-W-1/data/shadow
diff --git a/tests/tests/chage/35_chage_interactive-W-1/run.exp b/tests/chage/35_chage_interactive-W-1/run.exp
similarity index 100%
rename from tests/tests/chage/35_chage_interactive-W-1/run.exp
rename to tests/chage/35_chage_interactive-W-1/run.exp
diff --git a/tests/tests/chage/36_chage_interactive-I_invalid1/chage.test b/tests/chage/36_chage_interactive-I_invalid1/chage.test
similarity index 100%
rename from tests/tests/chage/36_chage_interactive-I_invalid1/chage.test
rename to tests/chage/36_chage_interactive-I_invalid1/chage.test
diff --git a/tests/tests/chage/36_chage_interactive-I_invalid1/config.txt b/tests/chage/36_chage_interactive-I_invalid1/config.txt
similarity index 100%
rename from tests/tests/chage/36_chage_interactive-I_invalid1/config.txt
rename to tests/chage/36_chage_interactive-I_invalid1/config.txt
diff --git a/tests/tests/chage/36_chage_interactive-I_invalid1/config/etc/group b/tests/chage/36_chage_interactive-I_invalid1/config/etc/group
similarity index 100%
rename from tests/tests/chage/36_chage_interactive-I_invalid1/config/etc/group
rename to tests/chage/36_chage_interactive-I_invalid1/config/etc/group
diff --git a/tests/tests/chage/36_chage_interactive-I_invalid1/config/etc/gshadow b/tests/chage/36_chage_interactive-I_invalid1/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/36_chage_interactive-I_invalid1/config/etc/gshadow
rename to tests/chage/36_chage_interactive-I_invalid1/config/etc/gshadow
diff --git a/tests/tests/chage/36_chage_interactive-I_invalid1/config/etc/login.defs b/tests/chage/36_chage_interactive-I_invalid1/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/36_chage_interactive-I_invalid1/config/etc/login.defs
rename to tests/chage/36_chage_interactive-I_invalid1/config/etc/login.defs
diff --git a/tests/tests/chage/36_chage_interactive-I_invalid1/config/etc/passwd b/tests/chage/36_chage_interactive-I_invalid1/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/36_chage_interactive-I_invalid1/config/etc/passwd
rename to tests/chage/36_chage_interactive-I_invalid1/config/etc/passwd
diff --git a/tests/tests/chage/36_chage_interactive-I_invalid1/config/etc/shadow b/tests/chage/36_chage_interactive-I_invalid1/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/36_chage_interactive-I_invalid1/config/etc/shadow
rename to tests/chage/36_chage_interactive-I_invalid1/config/etc/shadow
diff --git a/tests/tests/chage/36_chage_interactive-I_invalid1/run.exp b/tests/chage/36_chage_interactive-I_invalid1/run.exp
similarity index 100%
rename from tests/tests/chage/36_chage_interactive-I_invalid1/run.exp
rename to tests/chage/36_chage_interactive-I_invalid1/run.exp
diff --git a/tests/tests/chage/37_chage_interactive-I_invalid2/chage.test b/tests/chage/37_chage_interactive-I_invalid2/chage.test
similarity index 100%
rename from tests/tests/chage/37_chage_interactive-I_invalid2/chage.test
rename to tests/chage/37_chage_interactive-I_invalid2/chage.test
diff --git a/tests/tests/chage/37_chage_interactive-I_invalid2/config.txt b/tests/chage/37_chage_interactive-I_invalid2/config.txt
similarity index 100%
rename from tests/tests/chage/37_chage_interactive-I_invalid2/config.txt
rename to tests/chage/37_chage_interactive-I_invalid2/config.txt
diff --git a/tests/tests/chage/37_chage_interactive-I_invalid2/config/etc/group b/tests/chage/37_chage_interactive-I_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/chage/37_chage_interactive-I_invalid2/config/etc/group
rename to tests/chage/37_chage_interactive-I_invalid2/config/etc/group
diff --git a/tests/tests/chage/37_chage_interactive-I_invalid2/config/etc/gshadow b/tests/chage/37_chage_interactive-I_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/37_chage_interactive-I_invalid2/config/etc/gshadow
rename to tests/chage/37_chage_interactive-I_invalid2/config/etc/gshadow
diff --git a/tests/tests/chage/37_chage_interactive-I_invalid2/config/etc/login.defs b/tests/chage/37_chage_interactive-I_invalid2/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/37_chage_interactive-I_invalid2/config/etc/login.defs
rename to tests/chage/37_chage_interactive-I_invalid2/config/etc/login.defs
diff --git a/tests/tests/chage/37_chage_interactive-I_invalid2/config/etc/passwd b/tests/chage/37_chage_interactive-I_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/37_chage_interactive-I_invalid2/config/etc/passwd
rename to tests/chage/37_chage_interactive-I_invalid2/config/etc/passwd
diff --git a/tests/tests/chage/37_chage_interactive-I_invalid2/config/etc/shadow b/tests/chage/37_chage_interactive-I_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/37_chage_interactive-I_invalid2/config/etc/shadow
rename to tests/chage/37_chage_interactive-I_invalid2/config/etc/shadow
diff --git a/tests/tests/chage/37_chage_interactive-I_invalid2/run.exp b/tests/chage/37_chage_interactive-I_invalid2/run.exp
similarity index 100%
rename from tests/tests/chage/37_chage_interactive-I_invalid2/run.exp
rename to tests/chage/37_chage_interactive-I_invalid2/run.exp
diff --git a/tests/tests/chage/38_chage_interactive-I-1/chage.test b/tests/chage/38_chage_interactive-I-1/chage.test
similarity index 100%
rename from tests/tests/chage/38_chage_interactive-I-1/chage.test
rename to tests/chage/38_chage_interactive-I-1/chage.test
diff --git a/tests/tests/chage/38_chage_interactive-I-1/config.txt b/tests/chage/38_chage_interactive-I-1/config.txt
similarity index 100%
rename from tests/tests/chage/38_chage_interactive-I-1/config.txt
rename to tests/chage/38_chage_interactive-I-1/config.txt
diff --git a/tests/tests/chage/38_chage_interactive-I-1/config/etc/group b/tests/chage/38_chage_interactive-I-1/config/etc/group
similarity index 100%
rename from tests/tests/chage/38_chage_interactive-I-1/config/etc/group
rename to tests/chage/38_chage_interactive-I-1/config/etc/group
diff --git a/tests/tests/chage/38_chage_interactive-I-1/config/etc/gshadow b/tests/chage/38_chage_interactive-I-1/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/38_chage_interactive-I-1/config/etc/gshadow
rename to tests/chage/38_chage_interactive-I-1/config/etc/gshadow
diff --git a/tests/tests/chage/38_chage_interactive-I-1/config/etc/login.defs b/tests/chage/38_chage_interactive-I-1/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/38_chage_interactive-I-1/config/etc/login.defs
rename to tests/chage/38_chage_interactive-I-1/config/etc/login.defs
diff --git a/tests/tests/chage/38_chage_interactive-I-1/config/etc/passwd b/tests/chage/38_chage_interactive-I-1/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/38_chage_interactive-I-1/config/etc/passwd
rename to tests/chage/38_chage_interactive-I-1/config/etc/passwd
diff --git a/tests/tests/chage/38_chage_interactive-I-1/config/etc/shadow b/tests/chage/38_chage_interactive-I-1/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/38_chage_interactive-I-1/config/etc/shadow
rename to tests/chage/38_chage_interactive-I-1/config/etc/shadow
diff --git a/tests/tests/chage/38_chage_interactive-I-1/data/shadow b/tests/chage/38_chage_interactive-I-1/data/shadow
similarity index 100%
rename from tests/tests/chage/38_chage_interactive-I-1/data/shadow
rename to tests/chage/38_chage_interactive-I-1/data/shadow
diff --git a/tests/tests/chage/38_chage_interactive-I-1/run.exp b/tests/chage/38_chage_interactive-I-1/run.exp
similarity index 100%
rename from tests/tests/chage/38_chage_interactive-I-1/run.exp
rename to tests/chage/38_chage_interactive-I-1/run.exp
diff --git a/tests/tests/chage/39_chage_interactive-d-1/chage.test b/tests/chage/39_chage_interactive-d-1/chage.test
similarity index 100%
rename from tests/tests/chage/39_chage_interactive-d-1/chage.test
rename to tests/chage/39_chage_interactive-d-1/chage.test
diff --git a/tests/tests/chage/39_chage_interactive-d-1/config.txt b/tests/chage/39_chage_interactive-d-1/config.txt
similarity index 100%
rename from tests/tests/chage/39_chage_interactive-d-1/config.txt
rename to tests/chage/39_chage_interactive-d-1/config.txt
diff --git a/tests/tests/chage/39_chage_interactive-d-1/config/etc/group b/tests/chage/39_chage_interactive-d-1/config/etc/group
similarity index 100%
rename from tests/tests/chage/39_chage_interactive-d-1/config/etc/group
rename to tests/chage/39_chage_interactive-d-1/config/etc/group
diff --git a/tests/tests/chage/39_chage_interactive-d-1/config/etc/gshadow b/tests/chage/39_chage_interactive-d-1/config/etc/gshadow
similarity index 100%
rename from tests/tests/chage/39_chage_interactive-d-1/config/etc/gshadow
rename to tests/chage/39_chage_interactive-d-1/config/etc/gshadow
diff --git a/tests/tests/chage/39_chage_interactive-d-1/config/etc/login.defs b/tests/chage/39_chage_interactive-d-1/config/etc/login.defs
similarity index 100%
rename from tests/tests/chage/39_chage_interactive-d-1/config/etc/login.defs
rename to tests/chage/39_chage_interactive-d-1/config/etc/login.defs
diff --git a/tests/tests/chage/39_chage_interactive-d-1/config/etc/passwd b/tests/chage/39_chage_interactive-d-1/config/etc/passwd
similarity index 100%
rename from tests/tests/chage/39_chage_interactive-d-1/config/etc/passwd
rename to tests/chage/39_chage_interactive-d-1/config/etc/passwd
diff --git a/tests/tests/chage/39_chage_interactive-d-1/config/etc/shadow b/tests/chage/39_chage_interactive-d-1/config/etc/shadow
similarity index 100%
rename from tests/tests/chage/39_chage_interactive-d-1/config/etc/shadow
rename to tests/chage/39_chage_interactive-d-1/config/etc/shadow
diff --git a/tests/tests/chage/39_chage_interactive-d-1/data/shadow b/tests/chage/39_chage_interactive-d-1/data/shadow
similarity index 100%
rename from tests/tests/chage/39_chage_interactive-d-1/data/shadow
rename to tests/chage/39_chage_interactive-d-1/data/shadow
diff --git a/tests/tests/chage/39_chage_interactive-d-1/run.exp b/tests/chage/39_chage_interactive-d-1/run.exp
similarity index 100%
rename from tests/tests/chage/39_chage_interactive-d-1/run.exp
rename to tests/chage/39_chage_interactive-d-1/run.exp
diff --git a/tests/tests/chroot/chage/01_chage--root/chage.test b/tests/chroot/chage/01_chage--root/chage.test
similarity index 100%
rename from tests/tests/chroot/chage/01_chage--root/chage.test
rename to tests/chroot/chage/01_chage--root/chage.test
diff --git a/tests/tests/chroot/chage/01_chage--root/config.txt b/tests/chroot/chage/01_chage--root/config.txt
similarity index 100%
rename from tests/tests/chroot/chage/01_chage--root/config.txt
rename to tests/chroot/chage/01_chage--root/config.txt
diff --git a/tests/tests/chroot/chage/01_chage--root/config/etc/default/useradd b/tests/chroot/chage/01_chage--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/chage/01_chage--root/config/etc/default/useradd
rename to tests/chroot/chage/01_chage--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/chage/01_chage--root/config/etc/group b/tests/chroot/chage/01_chage--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/chage/01_chage--root/config/etc/group
rename to tests/chroot/chage/01_chage--root/config/etc/group
diff --git a/tests/tests/chroot/chage/01_chage--root/config/etc/gshadow b/tests/chroot/chage/01_chage--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/chage/01_chage--root/config/etc/gshadow
rename to tests/chroot/chage/01_chage--root/config/etc/gshadow
diff --git a/tests/tests/chroot/chage/01_chage--root/config/etc/passwd b/tests/chroot/chage/01_chage--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/chage/01_chage--root/config/etc/passwd
rename to tests/chroot/chage/01_chage--root/config/etc/passwd
diff --git a/tests/tests/chroot/chage/01_chage--root/config/etc/shadow b/tests/chroot/chage/01_chage--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/chage/01_chage--root/config/etc/shadow
rename to tests/chroot/chage/01_chage--root/config/etc/shadow
diff --git a/tests/tests/chroot/chage/01_chage--root/config_chroot/etc/group b/tests/chroot/chage/01_chage--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/chage/01_chage--root/config_chroot/etc/group
rename to tests/chroot/chage/01_chage--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/chage/01_chage--root/config_chroot/etc/gshadow b/tests/chroot/chage/01_chage--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/chage/01_chage--root/config_chroot/etc/gshadow
rename to tests/chroot/chage/01_chage--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/chage/01_chage--root/config_chroot/etc/login.defs b/tests/chroot/chage/01_chage--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/chage/01_chage--root/config_chroot/etc/login.defs
rename to tests/chroot/chage/01_chage--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/chage/01_chage--root/config_chroot/etc/passwd b/tests/chroot/chage/01_chage--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/chage/01_chage--root/config_chroot/etc/passwd
rename to tests/chroot/chage/01_chage--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/chage/01_chage--root/config_chroot/etc/shadow b/tests/chroot/chage/01_chage--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/chage/01_chage--root/config_chroot/etc/shadow
rename to tests/chroot/chage/01_chage--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/chage/01_chage--root/data/shadow b/tests/chroot/chage/01_chage--root/data/shadow
similarity index 100%
rename from tests/tests/chroot/chage/01_chage--root/data/shadow
rename to tests/chroot/chage/01_chage--root/data/shadow
diff --git a/tests/tests/chroot/chgpasswd/01_chgpasswd--root/chgpasswd.test b/tests/chroot/chgpasswd/01_chgpasswd--root/chgpasswd.test
similarity index 100%
rename from tests/tests/chroot/chgpasswd/01_chgpasswd--root/chgpasswd.test
rename to tests/chroot/chgpasswd/01_chgpasswd--root/chgpasswd.test
diff --git a/tests/tests/chroot/chgpasswd/01_chgpasswd--root/config.txt b/tests/chroot/chgpasswd/01_chgpasswd--root/config.txt
similarity index 100%
rename from tests/tests/chroot/chgpasswd/01_chgpasswd--root/config.txt
rename to tests/chroot/chgpasswd/01_chgpasswd--root/config.txt
diff --git a/tests/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/default/useradd b/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/default/useradd
rename to tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/group b/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/group
rename to tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/group
diff --git a/tests/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/gshadow b/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/gshadow
rename to tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/gshadow
diff --git a/tests/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/passwd b/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/passwd
rename to tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/passwd
diff --git a/tests/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/shadow b/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/shadow
rename to tests/chroot/chgpasswd/01_chgpasswd--root/config/etc/shadow
diff --git a/tests/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/group b/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/group
rename to tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/gshadow b/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/gshadow
rename to tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/login.defs b/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/login.defs
rename to tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/passwd b/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/passwd
rename to tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/shadow b/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/shadow
rename to tests/chroot/chgpasswd/01_chgpasswd--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/chgpasswd/01_chgpasswd--root/data/gshadow b/tests/chroot/chgpasswd/01_chgpasswd--root/data/gshadow
similarity index 100%
rename from tests/tests/chroot/chgpasswd/01_chgpasswd--root/data/gshadow
rename to tests/chroot/chgpasswd/01_chgpasswd--root/data/gshadow
diff --git a/tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/chpasswd.test b/tests/chroot/chpasswd/01_chpasswd--root_nopam/chpasswd.test
similarity index 100%
rename from tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/chpasswd.test
rename to tests/chroot/chpasswd/01_chpasswd--root_nopam/chpasswd.test
diff --git a/tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config.txt b/tests/chroot/chpasswd/01_chpasswd--root_nopam/config.txt
similarity index 100%
rename from tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config.txt
rename to tests/chroot/chpasswd/01_chpasswd--root_nopam/config.txt
diff --git a/tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/default/useradd b/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/default/useradd
rename to tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/default/useradd
diff --git a/tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/group b/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/group
similarity index 100%
rename from tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/group
rename to tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/group
diff --git a/tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/gshadow b/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/gshadow
rename to tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/gshadow
diff --git a/tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/passwd b/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/passwd
rename to tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/passwd
diff --git a/tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/shadow b/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/shadow
rename to tests/chroot/chpasswd/01_chpasswd--root_nopam/config/etc/shadow
diff --git a/tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/group b/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/group
rename to tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/group
diff --git a/tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/gshadow b/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/gshadow
rename to tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/login.defs b/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/login.defs
rename to tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/passwd b/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/passwd
rename to tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/shadow b/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/shadow
rename to tests/chroot/chpasswd/01_chpasswd--root_nopam/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/data/shadow b/tests/chroot/chpasswd/01_chpasswd--root_nopam/data/shadow
similarity index 100%
rename from tests/tests/chroot/chpasswd/01_chpasswd--root_nopam/data/shadow
rename to tests/chroot/chpasswd/01_chpasswd--root_nopam/data/shadow
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/chpasswd.test b/tests/chroot/chpasswd/02_chpasswd--root_pam/chpasswd.test
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/chpasswd.test
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/chpasswd.test
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config.txt b/tests/chroot/chpasswd/02_chpasswd--root_pam/config.txt
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config.txt
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/config.txt
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/default/useradd b/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/default/useradd
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/default/useradd
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/group b/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/group
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/group
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/group
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/gshadow b/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/gshadow
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/gshadow
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/passwd b/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/passwd
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/passwd
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/shadow b/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/shadow
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/config/etc/shadow
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/group b/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/group
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/group
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/gshadow b/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/gshadow
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/login.defs b/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/login.defs
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/pam.d/chpasswd b/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/pam.d/chpasswd
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/pam.d/chpasswd
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/pam.d/common-password b/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/pam.d/common-password
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/pam.d/common-password
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/passwd b/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/passwd
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/shadow b/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/shadow
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/chpasswd/02_chpasswd--root_pam/data/shadow b/tests/chroot/chpasswd/02_chpasswd--root_pam/data/shadow
similarity index 100%
rename from tests/tests/chroot/chpasswd/02_chpasswd--root_pam/data/shadow
rename to tests/chroot/chpasswd/02_chpasswd--root_pam/data/shadow
diff --git a/tests/tests/chroot/chsh/01_chsh--root/chsh.test b/tests/chroot/chsh/01_chsh--root/chsh.test
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/chsh.test
rename to tests/chroot/chsh/01_chsh--root/chsh.test
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config.txt b/tests/chroot/chsh/01_chsh--root/config.txt
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config.txt
rename to tests/chroot/chsh/01_chsh--root/config.txt
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config/etc/default/useradd b/tests/chroot/chsh/01_chsh--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config/etc/default/useradd
rename to tests/chroot/chsh/01_chsh--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config/etc/group b/tests/chroot/chsh/01_chsh--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config/etc/group
rename to tests/chroot/chsh/01_chsh--root/config/etc/group
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config/etc/gshadow b/tests/chroot/chsh/01_chsh--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config/etc/gshadow
rename to tests/chroot/chsh/01_chsh--root/config/etc/gshadow
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config/etc/passwd b/tests/chroot/chsh/01_chsh--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config/etc/passwd
rename to tests/chroot/chsh/01_chsh--root/config/etc/passwd
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config/etc/shadow b/tests/chroot/chsh/01_chsh--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config/etc/shadow
rename to tests/chroot/chsh/01_chsh--root/config/etc/shadow
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config_chroot.list b/tests/chroot/chsh/01_chsh--root/config_chroot.list
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config_chroot.list
rename to tests/chroot/chsh/01_chsh--root/config_chroot.list
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/group b/tests/chroot/chsh/01_chsh--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/group
rename to tests/chroot/chsh/01_chsh--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/gshadow b/tests/chroot/chsh/01_chsh--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/gshadow
rename to tests/chroot/chsh/01_chsh--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/login.defs b/tests/chroot/chsh/01_chsh--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/login.defs
rename to tests/chroot/chsh/01_chsh--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/chsh b/tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/chsh
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/chsh
rename to tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/chsh
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/common-account b/tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/common-account
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/common-account
rename to tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/common-account
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/common-auth b/tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/common-auth
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/common-auth
rename to tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/common-auth
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/common-session b/tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/common-session
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/common-session
rename to tests/chroot/chsh/01_chsh--root/config_chroot/etc/pam.d/common-session
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/passwd b/tests/chroot/chsh/01_chsh--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/passwd
rename to tests/chroot/chsh/01_chsh--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/shadow b/tests/chroot/chsh/01_chsh--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/shadow
rename to tests/chroot/chsh/01_chsh--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/shells b/tests/chroot/chsh/01_chsh--root/config_chroot/etc/shells
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/config_chroot/etc/shells
rename to tests/chroot/chsh/01_chsh--root/config_chroot/etc/shells
diff --git a/tests/tests/chroot/chsh/01_chsh--root/data/passwd b/tests/chroot/chsh/01_chsh--root/data/passwd
similarity index 100%
rename from tests/tests/chroot/chsh/01_chsh--root/data/passwd
rename to tests/chroot/chsh/01_chsh--root/data/passwd
diff --git a/tests/tests/chroot/gpasswd/01_gpasswd--root/config.txt b/tests/chroot/gpasswd/01_gpasswd--root/config.txt
similarity index 100%
rename from tests/tests/chroot/gpasswd/01_gpasswd--root/config.txt
rename to tests/chroot/gpasswd/01_gpasswd--root/config.txt
diff --git a/tests/tests/chroot/gpasswd/01_gpasswd--root/config/etc/default/useradd b/tests/chroot/gpasswd/01_gpasswd--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/gpasswd/01_gpasswd--root/config/etc/default/useradd
rename to tests/chroot/gpasswd/01_gpasswd--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/gpasswd/01_gpasswd--root/config/etc/group b/tests/chroot/gpasswd/01_gpasswd--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/gpasswd/01_gpasswd--root/config/etc/group
rename to tests/chroot/gpasswd/01_gpasswd--root/config/etc/group
diff --git a/tests/tests/chroot/gpasswd/01_gpasswd--root/config/etc/gshadow b/tests/chroot/gpasswd/01_gpasswd--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/gpasswd/01_gpasswd--root/config/etc/gshadow
rename to tests/chroot/gpasswd/01_gpasswd--root/config/etc/gshadow
diff --git a/tests/tests/chroot/gpasswd/01_gpasswd--root/config/etc/passwd b/tests/chroot/gpasswd/01_gpasswd--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/gpasswd/01_gpasswd--root/config/etc/passwd
rename to tests/chroot/gpasswd/01_gpasswd--root/config/etc/passwd
diff --git a/tests/tests/chroot/gpasswd/01_gpasswd--root/config/etc/shadow b/tests/chroot/gpasswd/01_gpasswd--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/gpasswd/01_gpasswd--root/config/etc/shadow
rename to tests/chroot/gpasswd/01_gpasswd--root/config/etc/shadow
diff --git a/tests/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/group b/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/group
rename to tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/gshadow b/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/gshadow
rename to tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/login.defs b/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/login.defs
rename to tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/passwd b/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/passwd
rename to tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/shadow b/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/shadow
rename to tests/chroot/gpasswd/01_gpasswd--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/gpasswd/01_gpasswd--root/data/group b/tests/chroot/gpasswd/01_gpasswd--root/data/group
similarity index 100%
rename from tests/tests/chroot/gpasswd/01_gpasswd--root/data/group
rename to tests/chroot/gpasswd/01_gpasswd--root/data/group
diff --git a/tests/tests/chroot/gpasswd/01_gpasswd--root/data/gshadow b/tests/chroot/gpasswd/01_gpasswd--root/data/gshadow
similarity index 100%
rename from tests/tests/chroot/gpasswd/01_gpasswd--root/data/gshadow
rename to tests/chroot/gpasswd/01_gpasswd--root/data/gshadow
diff --git a/tests/tests/chroot/gpasswd/01_gpasswd--root/gpasswd.test b/tests/chroot/gpasswd/01_gpasswd--root/gpasswd.test
similarity index 100%
rename from tests/tests/chroot/gpasswd/01_gpasswd--root/gpasswd.test
rename to tests/chroot/gpasswd/01_gpasswd--root/gpasswd.test
diff --git a/tests/tests/chroot/groupadd/01_groupadd--root/config.txt b/tests/chroot/groupadd/01_groupadd--root/config.txt
similarity index 100%
rename from tests/tests/chroot/groupadd/01_groupadd--root/config.txt
rename to tests/chroot/groupadd/01_groupadd--root/config.txt
diff --git a/tests/tests/chroot/groupadd/01_groupadd--root/config/etc/default/useradd b/tests/chroot/groupadd/01_groupadd--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/groupadd/01_groupadd--root/config/etc/default/useradd
rename to tests/chroot/groupadd/01_groupadd--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/groupadd/01_groupadd--root/config/etc/group b/tests/chroot/groupadd/01_groupadd--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/groupadd/01_groupadd--root/config/etc/group
rename to tests/chroot/groupadd/01_groupadd--root/config/etc/group
diff --git a/tests/tests/chroot/groupadd/01_groupadd--root/config/etc/gshadow b/tests/chroot/groupadd/01_groupadd--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/groupadd/01_groupadd--root/config/etc/gshadow
rename to tests/chroot/groupadd/01_groupadd--root/config/etc/gshadow
diff --git a/tests/tests/chroot/groupadd/01_groupadd--root/config/etc/passwd b/tests/chroot/groupadd/01_groupadd--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/groupadd/01_groupadd--root/config/etc/passwd
rename to tests/chroot/groupadd/01_groupadd--root/config/etc/passwd
diff --git a/tests/tests/chroot/groupadd/01_groupadd--root/config/etc/shadow b/tests/chroot/groupadd/01_groupadd--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/groupadd/01_groupadd--root/config/etc/shadow
rename to tests/chroot/groupadd/01_groupadd--root/config/etc/shadow
diff --git a/tests/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/group b/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/group
rename to tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/gshadow b/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/gshadow
rename to tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/login.defs b/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/login.defs
rename to tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/passwd b/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/passwd
rename to tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/shadow b/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/shadow
rename to tests/chroot/groupadd/01_groupadd--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/groupadd/01_groupadd--root/data/group b/tests/chroot/groupadd/01_groupadd--root/data/group
similarity index 100%
rename from tests/tests/chroot/groupadd/01_groupadd--root/data/group
rename to tests/chroot/groupadd/01_groupadd--root/data/group
diff --git a/tests/tests/chroot/groupadd/01_groupadd--root/data/gshadow b/tests/chroot/groupadd/01_groupadd--root/data/gshadow
similarity index 100%
rename from tests/tests/chroot/groupadd/01_groupadd--root/data/gshadow
rename to tests/chroot/groupadd/01_groupadd--root/data/gshadow
diff --git a/tests/tests/chroot/groupadd/01_groupadd--root/groupadd.test b/tests/chroot/groupadd/01_groupadd--root/groupadd.test
similarity index 100%
rename from tests/tests/chroot/groupadd/01_groupadd--root/groupadd.test
rename to tests/chroot/groupadd/01_groupadd--root/groupadd.test
diff --git a/tests/tests/chroot/groupdel/01_groupdel--root/config.txt b/tests/chroot/groupdel/01_groupdel--root/config.txt
similarity index 100%
rename from tests/tests/chroot/groupdel/01_groupdel--root/config.txt
rename to tests/chroot/groupdel/01_groupdel--root/config.txt
diff --git a/tests/tests/chroot/groupdel/01_groupdel--root/config/etc/default/useradd b/tests/chroot/groupdel/01_groupdel--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/groupdel/01_groupdel--root/config/etc/default/useradd
rename to tests/chroot/groupdel/01_groupdel--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/groupdel/01_groupdel--root/config/etc/group b/tests/chroot/groupdel/01_groupdel--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/groupdel/01_groupdel--root/config/etc/group
rename to tests/chroot/groupdel/01_groupdel--root/config/etc/group
diff --git a/tests/tests/chroot/groupdel/01_groupdel--root/config/etc/gshadow b/tests/chroot/groupdel/01_groupdel--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/groupdel/01_groupdel--root/config/etc/gshadow
rename to tests/chroot/groupdel/01_groupdel--root/config/etc/gshadow
diff --git a/tests/tests/chroot/groupdel/01_groupdel--root/config/etc/passwd b/tests/chroot/groupdel/01_groupdel--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/groupdel/01_groupdel--root/config/etc/passwd
rename to tests/chroot/groupdel/01_groupdel--root/config/etc/passwd
diff --git a/tests/tests/chroot/groupdel/01_groupdel--root/config/etc/shadow b/tests/chroot/groupdel/01_groupdel--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/groupdel/01_groupdel--root/config/etc/shadow
rename to tests/chroot/groupdel/01_groupdel--root/config/etc/shadow
diff --git a/tests/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/group b/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/group
rename to tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/gshadow b/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/gshadow
rename to tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/login.defs b/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/login.defs
rename to tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/passwd b/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/passwd
rename to tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/shadow b/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/shadow
rename to tests/chroot/groupdel/01_groupdel--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/groupdel/01_groupdel--root/data/group b/tests/chroot/groupdel/01_groupdel--root/data/group
similarity index 100%
rename from tests/tests/chroot/groupdel/01_groupdel--root/data/group
rename to tests/chroot/groupdel/01_groupdel--root/data/group
diff --git a/tests/tests/chroot/groupdel/01_groupdel--root/data/gshadow b/tests/chroot/groupdel/01_groupdel--root/data/gshadow
similarity index 100%
rename from tests/tests/chroot/groupdel/01_groupdel--root/data/gshadow
rename to tests/chroot/groupdel/01_groupdel--root/data/gshadow
diff --git a/tests/tests/chroot/groupdel/01_groupdel--root/groupdel.test b/tests/chroot/groupdel/01_groupdel--root/groupdel.test
similarity index 100%
rename from tests/tests/chroot/groupdel/01_groupdel--root/groupdel.test
rename to tests/chroot/groupdel/01_groupdel--root/groupdel.test
diff --git a/tests/tests/chroot/groupmod/01_groupmod--root/config.txt b/tests/chroot/groupmod/01_groupmod--root/config.txt
similarity index 100%
rename from tests/tests/chroot/groupmod/01_groupmod--root/config.txt
rename to tests/chroot/groupmod/01_groupmod--root/config.txt
diff --git a/tests/tests/chroot/groupmod/01_groupmod--root/config/etc/default/useradd b/tests/chroot/groupmod/01_groupmod--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/groupmod/01_groupmod--root/config/etc/default/useradd
rename to tests/chroot/groupmod/01_groupmod--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/groupmod/01_groupmod--root/config/etc/group b/tests/chroot/groupmod/01_groupmod--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/groupmod/01_groupmod--root/config/etc/group
rename to tests/chroot/groupmod/01_groupmod--root/config/etc/group
diff --git a/tests/tests/chroot/groupmod/01_groupmod--root/config/etc/gshadow b/tests/chroot/groupmod/01_groupmod--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/groupmod/01_groupmod--root/config/etc/gshadow
rename to tests/chroot/groupmod/01_groupmod--root/config/etc/gshadow
diff --git a/tests/tests/chroot/groupmod/01_groupmod--root/config/etc/passwd b/tests/chroot/groupmod/01_groupmod--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/groupmod/01_groupmod--root/config/etc/passwd
rename to tests/chroot/groupmod/01_groupmod--root/config/etc/passwd
diff --git a/tests/tests/chroot/groupmod/01_groupmod--root/config/etc/shadow b/tests/chroot/groupmod/01_groupmod--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/groupmod/01_groupmod--root/config/etc/shadow
rename to tests/chroot/groupmod/01_groupmod--root/config/etc/shadow
diff --git a/tests/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/group b/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/group
rename to tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/gshadow b/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/gshadow
rename to tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/login.defs b/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/login.defs
rename to tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/passwd b/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/passwd
rename to tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/shadow b/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/shadow
rename to tests/chroot/groupmod/01_groupmod--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/groupmod/01_groupmod--root/data/group b/tests/chroot/groupmod/01_groupmod--root/data/group
similarity index 100%
rename from tests/tests/chroot/groupmod/01_groupmod--root/data/group
rename to tests/chroot/groupmod/01_groupmod--root/data/group
diff --git a/tests/tests/chroot/groupmod/01_groupmod--root/data/gshadow b/tests/chroot/groupmod/01_groupmod--root/data/gshadow
similarity index 100%
rename from tests/tests/chroot/groupmod/01_groupmod--root/data/gshadow
rename to tests/chroot/groupmod/01_groupmod--root/data/gshadow
diff --git a/tests/tests/chroot/groupmod/01_groupmod--root/groupmod.test b/tests/chroot/groupmod/01_groupmod--root/groupmod.test
similarity index 100%
rename from tests/tests/chroot/groupmod/01_groupmod--root/groupmod.test
rename to tests/chroot/groupmod/01_groupmod--root/groupmod.test
diff --git a/tests/tests/chroot/grpck/01_grpck--root/config.txt b/tests/chroot/grpck/01_grpck--root/config.txt
similarity index 100%
rename from tests/tests/chroot/grpck/01_grpck--root/config.txt
rename to tests/chroot/grpck/01_grpck--root/config.txt
diff --git a/tests/tests/chroot/grpck/01_grpck--root/config/etc/default/useradd b/tests/chroot/grpck/01_grpck--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/grpck/01_grpck--root/config/etc/default/useradd
rename to tests/chroot/grpck/01_grpck--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/grpck/01_grpck--root/config/etc/group b/tests/chroot/grpck/01_grpck--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/grpck/01_grpck--root/config/etc/group
rename to tests/chroot/grpck/01_grpck--root/config/etc/group
diff --git a/tests/tests/chroot/grpck/01_grpck--root/config/etc/gshadow b/tests/chroot/grpck/01_grpck--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/grpck/01_grpck--root/config/etc/gshadow
rename to tests/chroot/grpck/01_grpck--root/config/etc/gshadow
diff --git a/tests/tests/chroot/grpck/01_grpck--root/config/etc/passwd b/tests/chroot/grpck/01_grpck--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/grpck/01_grpck--root/config/etc/passwd
rename to tests/chroot/grpck/01_grpck--root/config/etc/passwd
diff --git a/tests/tests/chroot/grpck/01_grpck--root/config/etc/shadow b/tests/chroot/grpck/01_grpck--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/grpck/01_grpck--root/config/etc/shadow
rename to tests/chroot/grpck/01_grpck--root/config/etc/shadow
diff --git a/tests/tests/chroot/grpck/01_grpck--root/config_chroot/etc/group b/tests/chroot/grpck/01_grpck--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/grpck/01_grpck--root/config_chroot/etc/group
rename to tests/chroot/grpck/01_grpck--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/grpck/01_grpck--root/config_chroot/etc/gshadow b/tests/chroot/grpck/01_grpck--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/grpck/01_grpck--root/config_chroot/etc/gshadow
rename to tests/chroot/grpck/01_grpck--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/grpck/01_grpck--root/config_chroot/etc/login.defs b/tests/chroot/grpck/01_grpck--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/grpck/01_grpck--root/config_chroot/etc/login.defs
rename to tests/chroot/grpck/01_grpck--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/grpck/01_grpck--root/config_chroot/etc/passwd b/tests/chroot/grpck/01_grpck--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/grpck/01_grpck--root/config_chroot/etc/passwd
rename to tests/chroot/grpck/01_grpck--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/grpck/01_grpck--root/config_chroot/etc/shadow b/tests/chroot/grpck/01_grpck--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/grpck/01_grpck--root/config_chroot/etc/shadow
rename to tests/chroot/grpck/01_grpck--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/grpck/01_grpck--root/data/group b/tests/chroot/grpck/01_grpck--root/data/group
similarity index 100%
rename from tests/tests/chroot/grpck/01_grpck--root/data/group
rename to tests/chroot/grpck/01_grpck--root/data/group
diff --git a/tests/tests/chroot/grpck/01_grpck--root/data/gshadow b/tests/chroot/grpck/01_grpck--root/data/gshadow
similarity index 100%
rename from tests/tests/chroot/grpck/01_grpck--root/data/gshadow
rename to tests/chroot/grpck/01_grpck--root/data/gshadow
diff --git a/tests/tests/chroot/grpck/01_grpck--root/grpck.test b/tests/chroot/grpck/01_grpck--root/grpck.test
similarity index 100%
rename from tests/tests/chroot/grpck/01_grpck--root/grpck.test
rename to tests/chroot/grpck/01_grpck--root/grpck.test
diff --git a/tests/tests/chroot/grpconv/01_grpconv--root/config.txt b/tests/chroot/grpconv/01_grpconv--root/config.txt
similarity index 100%
rename from tests/tests/chroot/grpconv/01_grpconv--root/config.txt
rename to tests/chroot/grpconv/01_grpconv--root/config.txt
diff --git a/tests/tests/chroot/grpconv/01_grpconv--root/config/etc/default/useradd b/tests/chroot/grpconv/01_grpconv--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/grpconv/01_grpconv--root/config/etc/default/useradd
rename to tests/chroot/grpconv/01_grpconv--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/grpconv/01_grpconv--root/config/etc/group b/tests/chroot/grpconv/01_grpconv--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/grpconv/01_grpconv--root/config/etc/group
rename to tests/chroot/grpconv/01_grpconv--root/config/etc/group
diff --git a/tests/tests/chroot/grpconv/01_grpconv--root/config/etc/gshadow b/tests/chroot/grpconv/01_grpconv--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/grpconv/01_grpconv--root/config/etc/gshadow
rename to tests/chroot/grpconv/01_grpconv--root/config/etc/gshadow
diff --git a/tests/tests/chroot/grpconv/01_grpconv--root/config/etc/passwd b/tests/chroot/grpconv/01_grpconv--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/grpconv/01_grpconv--root/config/etc/passwd
rename to tests/chroot/grpconv/01_grpconv--root/config/etc/passwd
diff --git a/tests/tests/chroot/grpconv/01_grpconv--root/config/etc/shadow b/tests/chroot/grpconv/01_grpconv--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/grpconv/01_grpconv--root/config/etc/shadow
rename to tests/chroot/grpconv/01_grpconv--root/config/etc/shadow
diff --git a/tests/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/group b/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/group
rename to tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/login.defs b/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/login.defs
rename to tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/passwd b/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/passwd
rename to tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/shadow b/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/shadow
rename to tests/chroot/grpconv/01_grpconv--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/grpconv/01_grpconv--root/data/group b/tests/chroot/grpconv/01_grpconv--root/data/group
similarity index 100%
rename from tests/tests/chroot/grpconv/01_grpconv--root/data/group
rename to tests/chroot/grpconv/01_grpconv--root/data/group
diff --git a/tests/tests/chroot/grpconv/01_grpconv--root/data/gshadow b/tests/chroot/grpconv/01_grpconv--root/data/gshadow
similarity index 100%
rename from tests/tests/chroot/grpconv/01_grpconv--root/data/gshadow
rename to tests/chroot/grpconv/01_grpconv--root/data/gshadow
diff --git a/tests/tests/chroot/grpconv/01_grpconv--root/grpconv.test b/tests/chroot/grpconv/01_grpconv--root/grpconv.test
similarity index 100%
rename from tests/tests/chroot/grpconv/01_grpconv--root/grpconv.test
rename to tests/chroot/grpconv/01_grpconv--root/grpconv.test
diff --git a/tests/tests/chroot/grpunconv/01_grpunconv--root/config.txt b/tests/chroot/grpunconv/01_grpunconv--root/config.txt
similarity index 100%
rename from tests/tests/chroot/grpunconv/01_grpunconv--root/config.txt
rename to tests/chroot/grpunconv/01_grpunconv--root/config.txt
diff --git a/tests/tests/chroot/grpunconv/01_grpunconv--root/config/etc/default/useradd b/tests/chroot/grpunconv/01_grpunconv--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/grpunconv/01_grpunconv--root/config/etc/default/useradd
rename to tests/chroot/grpunconv/01_grpunconv--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/grpunconv/01_grpunconv--root/config/etc/group b/tests/chroot/grpunconv/01_grpunconv--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/grpunconv/01_grpunconv--root/config/etc/group
rename to tests/chroot/grpunconv/01_grpunconv--root/config/etc/group
diff --git a/tests/tests/chroot/grpunconv/01_grpunconv--root/config/etc/gshadow b/tests/chroot/grpunconv/01_grpunconv--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/grpunconv/01_grpunconv--root/config/etc/gshadow
rename to tests/chroot/grpunconv/01_grpunconv--root/config/etc/gshadow
diff --git a/tests/tests/chroot/grpunconv/01_grpunconv--root/config/etc/passwd b/tests/chroot/grpunconv/01_grpunconv--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/grpunconv/01_grpunconv--root/config/etc/passwd
rename to tests/chroot/grpunconv/01_grpunconv--root/config/etc/passwd
diff --git a/tests/tests/chroot/grpunconv/01_grpunconv--root/config/etc/shadow b/tests/chroot/grpunconv/01_grpunconv--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/grpunconv/01_grpunconv--root/config/etc/shadow
rename to tests/chroot/grpunconv/01_grpunconv--root/config/etc/shadow
diff --git a/tests/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/group b/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/group
rename to tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/gshadow b/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/gshadow
rename to tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/login.defs b/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/login.defs
rename to tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/passwd b/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/passwd
rename to tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/shadow b/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/shadow
rename to tests/chroot/grpunconv/01_grpunconv--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/grpunconv/01_grpunconv--root/data/group b/tests/chroot/grpunconv/01_grpunconv--root/data/group
similarity index 100%
rename from tests/tests/chroot/grpunconv/01_grpunconv--root/data/group
rename to tests/chroot/grpunconv/01_grpunconv--root/data/group
diff --git a/tests/tests/chroot/grpunconv/01_grpunconv--root/grpunconv.test b/tests/chroot/grpunconv/01_grpunconv--root/grpunconv.test
similarity index 100%
rename from tests/tests/chroot/grpunconv/01_grpunconv--root/grpunconv.test
rename to tests/chroot/grpunconv/01_grpunconv--root/grpunconv.test
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/config.txt b/tests/chroot/lastlog/01_lastlog--root/config.txt
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/config.txt
rename to tests/chroot/lastlog/01_lastlog--root/config.txt
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/config/etc/default/useradd b/tests/chroot/lastlog/01_lastlog--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/config/etc/default/useradd
rename to tests/chroot/lastlog/01_lastlog--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/config/etc/group b/tests/chroot/lastlog/01_lastlog--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/config/etc/group
rename to tests/chroot/lastlog/01_lastlog--root/config/etc/group
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/config/etc/gshadow b/tests/chroot/lastlog/01_lastlog--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/config/etc/gshadow
rename to tests/chroot/lastlog/01_lastlog--root/config/etc/gshadow
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/config/etc/passwd b/tests/chroot/lastlog/01_lastlog--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/config/etc/passwd
rename to tests/chroot/lastlog/01_lastlog--root/config/etc/passwd
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/config/etc/shadow b/tests/chroot/lastlog/01_lastlog--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/config/etc/shadow
rename to tests/chroot/lastlog/01_lastlog--root/config/etc/shadow
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/group b/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/group
rename to tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/gshadow b/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/gshadow
rename to tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/login.defs b/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/login.defs
rename to tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/passwd b/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/passwd
rename to tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/shadow b/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/shadow
rename to tests/chroot/lastlog/01_lastlog--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/data/group b/tests/chroot/lastlog/01_lastlog--root/data/group
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/data/group
rename to tests/chroot/lastlog/01_lastlog--root/data/group
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/data/gshadow b/tests/chroot/lastlog/01_lastlog--root/data/gshadow
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/data/gshadow
rename to tests/chroot/lastlog/01_lastlog--root/data/gshadow
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/data/lastlog.list b/tests/chroot/lastlog/01_lastlog--root/data/lastlog.list
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/data/lastlog.list
rename to tests/chroot/lastlog/01_lastlog--root/data/lastlog.list
diff --git a/tests/tests/chroot/lastlog/01_lastlog--root/lastlog.test b/tests/chroot/lastlog/01_lastlog--root/lastlog.test
similarity index 100%
rename from tests/tests/chroot/lastlog/01_lastlog--root/lastlog.test
rename to tests/chroot/lastlog/01_lastlog--root/lastlog.test
diff --git a/tests/tests/chroot/login/01_login_sublogin/config.txt b/tests/chroot/login/01_login_sublogin/config.txt
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config.txt
rename to tests/chroot/login/01_login_sublogin/config.txt
diff --git a/tests/tests/chroot/login/01_login_sublogin/config/etc/group b/tests/chroot/login/01_login_sublogin/config/etc/group
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config/etc/group
rename to tests/chroot/login/01_login_sublogin/config/etc/group
diff --git a/tests/tests/chroot/login/01_login_sublogin/config/etc/gshadow b/tests/chroot/login/01_login_sublogin/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config/etc/gshadow
rename to tests/chroot/login/01_login_sublogin/config/etc/gshadow
diff --git a/tests/tests/chroot/login/01_login_sublogin/config/etc/login.defs b/tests/chroot/login/01_login_sublogin/config/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config/etc/login.defs
rename to tests/chroot/login/01_login_sublogin/config/etc/login.defs
diff --git a/tests/tests/chroot/login/01_login_sublogin/config/etc/passwd b/tests/chroot/login/01_login_sublogin/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config/etc/passwd
rename to tests/chroot/login/01_login_sublogin/config/etc/passwd
diff --git a/tests/tests/chroot/login/01_login_sublogin/config/etc/shadow b/tests/chroot/login/01_login_sublogin/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config/etc/shadow
rename to tests/chroot/login/01_login_sublogin/config/etc/shadow
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot.list b/tests/chroot/login/01_login_sublogin/config_chroot.list
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot.list
rename to tests/chroot/login/01_login_sublogin/config_chroot.list
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/group b/tests/chroot/login/01_login_sublogin/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/group
rename to tests/chroot/login/01_login_sublogin/config_chroot/etc/group
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/gshadow b/tests/chroot/login/01_login_sublogin/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/gshadow
rename to tests/chroot/login/01_login_sublogin/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/login.defs b/tests/chroot/login/01_login_sublogin/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/login.defs
rename to tests/chroot/login/01_login_sublogin/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-account b/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-account
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-account
rename to tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-account
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-auth b/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-auth
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-auth
rename to tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-auth
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-password b/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-password
rename to tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-password
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-session b/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-session
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-session
rename to tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-session
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-session-noninteractive b/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-session-noninteractive
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-session-noninteractive
rename to tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/common-session-noninteractive
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/login b/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/login
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/login
rename to tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/login
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/other b/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/other
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/other
rename to tests/chroot/login/01_login_sublogin/config_chroot/etc/pam.d/other
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/passwd b/tests/chroot/login/01_login_sublogin/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/passwd
rename to tests/chroot/login/01_login_sublogin/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/securetty b/tests/chroot/login/01_login_sublogin/config_chroot/etc/securetty
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/securetty
rename to tests/chroot/login/01_login_sublogin/config_chroot/etc/securetty
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/security/limits.conf b/tests/chroot/login/01_login_sublogin/config_chroot/etc/security/limits.conf
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/security/limits.conf
rename to tests/chroot/login/01_login_sublogin/config_chroot/etc/security/limits.conf
diff --git a/tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/shadow b/tests/chroot/login/01_login_sublogin/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/config_chroot/etc/shadow
rename to tests/chroot/login/01_login_sublogin/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/login/01_login_sublogin/login.exp b/tests/chroot/login/01_login_sublogin/login.exp
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/login.exp
rename to tests/chroot/login/01_login_sublogin/login.exp
diff --git a/tests/tests/chroot/login/01_login_sublogin/login.test b/tests/chroot/login/01_login_sublogin/login.test
similarity index 100%
rename from tests/tests/chroot/login/01_login_sublogin/login.test
rename to tests/chroot/login/01_login_sublogin/login.test
diff --git a/tests/tests/chroot/pwck/01_pwck--root/config.txt b/tests/chroot/pwck/01_pwck--root/config.txt
similarity index 100%
rename from tests/tests/chroot/pwck/01_pwck--root/config.txt
rename to tests/chroot/pwck/01_pwck--root/config.txt
diff --git a/tests/tests/chroot/pwck/01_pwck--root/config/etc/default/useradd b/tests/chroot/pwck/01_pwck--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/pwck/01_pwck--root/config/etc/default/useradd
rename to tests/chroot/pwck/01_pwck--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/pwck/01_pwck--root/config/etc/group b/tests/chroot/pwck/01_pwck--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/pwck/01_pwck--root/config/etc/group
rename to tests/chroot/pwck/01_pwck--root/config/etc/group
diff --git a/tests/tests/chroot/pwck/01_pwck--root/config/etc/gshadow b/tests/chroot/pwck/01_pwck--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/pwck/01_pwck--root/config/etc/gshadow
rename to tests/chroot/pwck/01_pwck--root/config/etc/gshadow
diff --git a/tests/tests/chroot/pwck/01_pwck--root/config/etc/passwd b/tests/chroot/pwck/01_pwck--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/pwck/01_pwck--root/config/etc/passwd
rename to tests/chroot/pwck/01_pwck--root/config/etc/passwd
diff --git a/tests/tests/chroot/pwck/01_pwck--root/config/etc/shadow b/tests/chroot/pwck/01_pwck--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/pwck/01_pwck--root/config/etc/shadow
rename to tests/chroot/pwck/01_pwck--root/config/etc/shadow
diff --git a/tests/tests/chroot/pwck/01_pwck--root/config_chroot/etc/group b/tests/chroot/pwck/01_pwck--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/pwck/01_pwck--root/config_chroot/etc/group
rename to tests/chroot/pwck/01_pwck--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/pwck/01_pwck--root/config_chroot/etc/gshadow b/tests/chroot/pwck/01_pwck--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/pwck/01_pwck--root/config_chroot/etc/gshadow
rename to tests/chroot/pwck/01_pwck--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/pwck/01_pwck--root/config_chroot/etc/login.defs b/tests/chroot/pwck/01_pwck--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/pwck/01_pwck--root/config_chroot/etc/login.defs
rename to tests/chroot/pwck/01_pwck--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/pwck/01_pwck--root/config_chroot/etc/passwd b/tests/chroot/pwck/01_pwck--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/pwck/01_pwck--root/config_chroot/etc/passwd
rename to tests/chroot/pwck/01_pwck--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/pwck/01_pwck--root/config_chroot/etc/shadow b/tests/chroot/pwck/01_pwck--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/pwck/01_pwck--root/config_chroot/etc/shadow
rename to tests/chroot/pwck/01_pwck--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/pwck/01_pwck--root/data/pwck.out b/tests/chroot/pwck/01_pwck--root/data/pwck.out
similarity index 100%
rename from tests/tests/chroot/pwck/01_pwck--root/data/pwck.out
rename to tests/chroot/pwck/01_pwck--root/data/pwck.out
diff --git a/tests/tests/chroot/pwck/01_pwck--root/pwck.test b/tests/chroot/pwck/01_pwck--root/pwck.test
similarity index 100%
rename from tests/tests/chroot/pwck/01_pwck--root/pwck.test
rename to tests/chroot/pwck/01_pwck--root/pwck.test
diff --git a/tests/tests/chroot/pwconv/01_pwconv--root/config.txt b/tests/chroot/pwconv/01_pwconv--root/config.txt
similarity index 100%
rename from tests/tests/chroot/pwconv/01_pwconv--root/config.txt
rename to tests/chroot/pwconv/01_pwconv--root/config.txt
diff --git a/tests/tests/chroot/pwconv/01_pwconv--root/config/etc/default/useradd b/tests/chroot/pwconv/01_pwconv--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/pwconv/01_pwconv--root/config/etc/default/useradd
rename to tests/chroot/pwconv/01_pwconv--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/pwconv/01_pwconv--root/config/etc/group b/tests/chroot/pwconv/01_pwconv--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/pwconv/01_pwconv--root/config/etc/group
rename to tests/chroot/pwconv/01_pwconv--root/config/etc/group
diff --git a/tests/tests/chroot/pwconv/01_pwconv--root/config/etc/gshadow b/tests/chroot/pwconv/01_pwconv--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/pwconv/01_pwconv--root/config/etc/gshadow
rename to tests/chroot/pwconv/01_pwconv--root/config/etc/gshadow
diff --git a/tests/tests/chroot/pwconv/01_pwconv--root/config/etc/passwd b/tests/chroot/pwconv/01_pwconv--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/pwconv/01_pwconv--root/config/etc/passwd
rename to tests/chroot/pwconv/01_pwconv--root/config/etc/passwd
diff --git a/tests/tests/chroot/pwconv/01_pwconv--root/config/etc/shadow b/tests/chroot/pwconv/01_pwconv--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/pwconv/01_pwconv--root/config/etc/shadow
rename to tests/chroot/pwconv/01_pwconv--root/config/etc/shadow
diff --git a/tests/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/group b/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/group
rename to tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/gshadow b/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/gshadow
rename to tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/login.defs b/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/login.defs
rename to tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/passwd b/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/passwd
rename to tests/chroot/pwconv/01_pwconv--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/pwconv/01_pwconv--root/data/passwd b/tests/chroot/pwconv/01_pwconv--root/data/passwd
similarity index 100%
rename from tests/tests/chroot/pwconv/01_pwconv--root/data/passwd
rename to tests/chroot/pwconv/01_pwconv--root/data/passwd
diff --git a/tests/tests/chroot/pwconv/01_pwconv--root/data/shadow b/tests/chroot/pwconv/01_pwconv--root/data/shadow
similarity index 100%
rename from tests/tests/chroot/pwconv/01_pwconv--root/data/shadow
rename to tests/chroot/pwconv/01_pwconv--root/data/shadow
diff --git a/tests/tests/chroot/pwconv/01_pwconv--root/pwconv.test b/tests/chroot/pwconv/01_pwconv--root/pwconv.test
similarity index 100%
rename from tests/tests/chroot/pwconv/01_pwconv--root/pwconv.test
rename to tests/chroot/pwconv/01_pwconv--root/pwconv.test
diff --git a/tests/tests/chroot/pwunconv/01_pwunconv--root/config.txt b/tests/chroot/pwunconv/01_pwunconv--root/config.txt
similarity index 100%
rename from tests/tests/chroot/pwunconv/01_pwunconv--root/config.txt
rename to tests/chroot/pwunconv/01_pwunconv--root/config.txt
diff --git a/tests/tests/chroot/pwunconv/01_pwunconv--root/config/etc/default/useradd b/tests/chroot/pwunconv/01_pwunconv--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/pwunconv/01_pwunconv--root/config/etc/default/useradd
rename to tests/chroot/pwunconv/01_pwunconv--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/pwunconv/01_pwunconv--root/config/etc/group b/tests/chroot/pwunconv/01_pwunconv--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/pwunconv/01_pwunconv--root/config/etc/group
rename to tests/chroot/pwunconv/01_pwunconv--root/config/etc/group
diff --git a/tests/tests/chroot/pwunconv/01_pwunconv--root/config/etc/gshadow b/tests/chroot/pwunconv/01_pwunconv--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/pwunconv/01_pwunconv--root/config/etc/gshadow
rename to tests/chroot/pwunconv/01_pwunconv--root/config/etc/gshadow
diff --git a/tests/tests/chroot/pwunconv/01_pwunconv--root/config/etc/passwd b/tests/chroot/pwunconv/01_pwunconv--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/pwunconv/01_pwunconv--root/config/etc/passwd
rename to tests/chroot/pwunconv/01_pwunconv--root/config/etc/passwd
diff --git a/tests/tests/chroot/pwunconv/01_pwunconv--root/config/etc/shadow b/tests/chroot/pwunconv/01_pwunconv--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/pwunconv/01_pwunconv--root/config/etc/shadow
rename to tests/chroot/pwunconv/01_pwunconv--root/config/etc/shadow
diff --git a/tests/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/group b/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/group
rename to tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/gshadow b/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/gshadow
rename to tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/login.defs b/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/login.defs
rename to tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/passwd b/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/passwd
rename to tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/shadow b/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/shadow
rename to tests/chroot/pwunconv/01_pwunconv--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/pwunconv/01_pwunconv--root/data/passwd b/tests/chroot/pwunconv/01_pwunconv--root/data/passwd
similarity index 100%
rename from tests/tests/chroot/pwunconv/01_pwunconv--root/data/passwd
rename to tests/chroot/pwunconv/01_pwunconv--root/data/passwd
diff --git a/tests/tests/chroot/pwunconv/01_pwunconv--root/pwunconv.test b/tests/chroot/pwunconv/01_pwunconv--root/pwunconv.test
similarity index 100%
rename from tests/tests/chroot/pwunconv/01_pwunconv--root/pwunconv.test
rename to tests/chroot/pwunconv/01_pwunconv--root/pwunconv.test
diff --git a/tests/tests/chroot/useradd/01_useradd--root/config.txt b/tests/chroot/useradd/01_useradd--root/config.txt
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/config.txt
rename to tests/chroot/useradd/01_useradd--root/config.txt
diff --git a/tests/tests/chroot/useradd/01_useradd--root/config/etc/default/useradd b/tests/chroot/useradd/01_useradd--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/config/etc/default/useradd
rename to tests/chroot/useradd/01_useradd--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/useradd/01_useradd--root/config/etc/group b/tests/chroot/useradd/01_useradd--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/config/etc/group
rename to tests/chroot/useradd/01_useradd--root/config/etc/group
diff --git a/tests/tests/chroot/useradd/01_useradd--root/config/etc/gshadow b/tests/chroot/useradd/01_useradd--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/config/etc/gshadow
rename to tests/chroot/useradd/01_useradd--root/config/etc/gshadow
diff --git a/tests/tests/chroot/useradd/01_useradd--root/config/etc/passwd b/tests/chroot/useradd/01_useradd--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/config/etc/passwd
rename to tests/chroot/useradd/01_useradd--root/config/etc/passwd
diff --git a/tests/tests/chroot/useradd/01_useradd--root/config/etc/shadow b/tests/chroot/useradd/01_useradd--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/config/etc/shadow
rename to tests/chroot/useradd/01_useradd--root/config/etc/shadow
diff --git a/tests/tests/chroot/useradd/01_useradd--root/config_chroot/etc/group b/tests/chroot/useradd/01_useradd--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/config_chroot/etc/group
rename to tests/chroot/useradd/01_useradd--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/useradd/01_useradd--root/config_chroot/etc/gshadow b/tests/chroot/useradd/01_useradd--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/config_chroot/etc/gshadow
rename to tests/chroot/useradd/01_useradd--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/useradd/01_useradd--root/config_chroot/etc/login.defs b/tests/chroot/useradd/01_useradd--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/config_chroot/etc/login.defs
rename to tests/chroot/useradd/01_useradd--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/useradd/01_useradd--root/config_chroot/etc/passwd b/tests/chroot/useradd/01_useradd--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/config_chroot/etc/passwd
rename to tests/chroot/useradd/01_useradd--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/useradd/01_useradd--root/config_chroot/etc/shadow b/tests/chroot/useradd/01_useradd--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/config_chroot/etc/shadow
rename to tests/chroot/useradd/01_useradd--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/useradd/01_useradd--root/data/group b/tests/chroot/useradd/01_useradd--root/data/group
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/data/group
rename to tests/chroot/useradd/01_useradd--root/data/group
diff --git a/tests/tests/chroot/useradd/01_useradd--root/data/gshadow b/tests/chroot/useradd/01_useradd--root/data/gshadow
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/data/gshadow
rename to tests/chroot/useradd/01_useradd--root/data/gshadow
diff --git a/tests/tests/chroot/useradd/01_useradd--root/data/passwd b/tests/chroot/useradd/01_useradd--root/data/passwd
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/data/passwd
rename to tests/chroot/useradd/01_useradd--root/data/passwd
diff --git a/tests/tests/chroot/useradd/01_useradd--root/data/shadow b/tests/chroot/useradd/01_useradd--root/data/shadow
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/data/shadow
rename to tests/chroot/useradd/01_useradd--root/data/shadow
diff --git a/tests/tests/chroot/useradd/01_useradd--root/useradd.test b/tests/chroot/useradd/01_useradd--root/useradd.test
similarity index 100%
rename from tests/tests/chroot/useradd/01_useradd--root/useradd.test
rename to tests/chroot/useradd/01_useradd--root/useradd.test
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/config.txt b/tests/chroot/useradd/02_useradd--root_login.defs/config.txt
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/config.txt
rename to tests/chroot/useradd/02_useradd--root_login.defs/config.txt
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/default/useradd b/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/default/useradd
rename to tests/chroot/useradd/02_useradd--root_login.defs/config/etc/default/useradd
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/group b/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/group
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/group
rename to tests/chroot/useradd/02_useradd--root_login.defs/config/etc/group
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/gshadow b/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/gshadow
rename to tests/chroot/useradd/02_useradd--root_login.defs/config/etc/gshadow
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/passwd b/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/passwd
rename to tests/chroot/useradd/02_useradd--root_login.defs/config/etc/passwd
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/shadow b/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/config/etc/shadow
rename to tests/chroot/useradd/02_useradd--root_login.defs/config/etc/shadow
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/group b/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/group
rename to tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/group
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/gshadow b/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/gshadow
rename to tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/login.defs b/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/login.defs
rename to tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/passwd b/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/passwd
rename to tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/shadow b/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/shadow
rename to tests/chroot/useradd/02_useradd--root_login.defs/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/data/group b/tests/chroot/useradd/02_useradd--root_login.defs/data/group
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/data/group
rename to tests/chroot/useradd/02_useradd--root_login.defs/data/group
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/data/gshadow b/tests/chroot/useradd/02_useradd--root_login.defs/data/gshadow
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/data/gshadow
rename to tests/chroot/useradd/02_useradd--root_login.defs/data/gshadow
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/data/passwd b/tests/chroot/useradd/02_useradd--root_login.defs/data/passwd
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/data/passwd
rename to tests/chroot/useradd/02_useradd--root_login.defs/data/passwd
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/data/shadow b/tests/chroot/useradd/02_useradd--root_login.defs/data/shadow
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/data/shadow
rename to tests/chroot/useradd/02_useradd--root_login.defs/data/shadow
diff --git a/tests/tests/chroot/useradd/02_useradd--root_login.defs/useradd.test b/tests/chroot/useradd/02_useradd--root_login.defs/useradd.test
similarity index 100%
rename from tests/tests/chroot/useradd/02_useradd--root_login.defs/useradd.test
rename to tests/chroot/useradd/02_useradd--root_login.defs/useradd.test
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/config.txt b/tests/chroot/useradd/03_useradd--root_useradd.default/config.txt
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/config.txt
rename to tests/chroot/useradd/03_useradd--root_useradd.default/config.txt
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/default/useradd b/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/default/useradd
rename to tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/default/useradd
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/group b/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/group
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/group
rename to tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/group
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/gshadow b/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/gshadow
rename to tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/gshadow
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/passwd b/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/passwd
rename to tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/passwd
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/shadow b/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/shadow
rename to tests/chroot/useradd/03_useradd--root_useradd.default/config/etc/shadow
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/default/useradd b/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/default/useradd
rename to tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/default/useradd
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/group b/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/group
rename to tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/group
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/gshadow b/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/gshadow
rename to tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/login.defs b/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/login.defs
rename to tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/passwd b/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/passwd
rename to tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/shadow b/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/shadow
rename to tests/chroot/useradd/03_useradd--root_useradd.default/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/data/group b/tests/chroot/useradd/03_useradd--root_useradd.default/data/group
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/data/group
rename to tests/chroot/useradd/03_useradd--root_useradd.default/data/group
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/data/gshadow b/tests/chroot/useradd/03_useradd--root_useradd.default/data/gshadow
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/data/gshadow
rename to tests/chroot/useradd/03_useradd--root_useradd.default/data/gshadow
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/data/passwd b/tests/chroot/useradd/03_useradd--root_useradd.default/data/passwd
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/data/passwd
rename to tests/chroot/useradd/03_useradd--root_useradd.default/data/passwd
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/data/shadow b/tests/chroot/useradd/03_useradd--root_useradd.default/data/shadow
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/data/shadow
rename to tests/chroot/useradd/03_useradd--root_useradd.default/data/shadow
diff --git a/tests/tests/chroot/useradd/03_useradd--root_useradd.default/useradd.test b/tests/chroot/useradd/03_useradd--root_useradd.default/useradd.test
similarity index 100%
rename from tests/tests/chroot/useradd/03_useradd--root_useradd.default/useradd.test
rename to tests/chroot/useradd/03_useradd--root_useradd.default/useradd.test
diff --git a/tests/tests/chroot/useradd/04_useradd--root_useradd-D/config.txt b/tests/chroot/useradd/04_useradd--root_useradd-D/config.txt
similarity index 100%
rename from tests/tests/chroot/useradd/04_useradd--root_useradd-D/config.txt
rename to tests/chroot/useradd/04_useradd--root_useradd-D/config.txt
diff --git a/tests/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/default/useradd b/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/default/useradd
rename to tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/default/useradd
diff --git a/tests/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/group b/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/group
similarity index 100%
rename from tests/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/group
rename to tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/group
diff --git a/tests/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/gshadow b/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/gshadow
rename to tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/gshadow
diff --git a/tests/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/passwd b/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/passwd
rename to tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/passwd
diff --git a/tests/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/shadow b/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/shadow
rename to tests/chroot/useradd/04_useradd--root_useradd-D/config/etc/shadow
diff --git a/tests/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/default/useradd b/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/default/useradd
rename to tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/default/useradd
diff --git a/tests/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/group b/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/group
rename to tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/group
diff --git a/tests/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/gshadow b/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/gshadow
rename to tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/login.defs b/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/login.defs
rename to tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/passwd b/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/passwd
rename to tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/shadow b/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/shadow
rename to tests/chroot/useradd/04_useradd--root_useradd-D/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/useradd/04_useradd--root_useradd-D/data/useradd.out b/tests/chroot/useradd/04_useradd--root_useradd-D/data/useradd.out
similarity index 100%
rename from tests/tests/chroot/useradd/04_useradd--root_useradd-D/data/useradd.out
rename to tests/chroot/useradd/04_useradd--root_useradd-D/data/useradd.out
diff --git a/tests/tests/chroot/useradd/04_useradd--root_useradd-D/useradd.test b/tests/chroot/useradd/04_useradd--root_useradd-D/useradd.test
similarity index 100%
rename from tests/tests/chroot/useradd/04_useradd--root_useradd-D/useradd.test
rename to tests/chroot/useradd/04_useradd--root_useradd-D/useradd.test
diff --git a/tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config.txt b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config.txt
similarity index 100%
rename from tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config.txt
rename to tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config.txt
diff --git a/tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/default/useradd b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/default/useradd
rename to tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/default/useradd
diff --git a/tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/group b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/group
similarity index 100%
rename from tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/group
rename to tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/group
diff --git a/tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/gshadow b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/gshadow
rename to tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/gshadow
diff --git a/tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/passwd b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/passwd
rename to tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/passwd
diff --git a/tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/shadow b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/shadow
rename to tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config/etc/shadow
diff --git a/tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/default/useradd b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/default/useradd
rename to tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/default/useradd
diff --git a/tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/group b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/group
rename to tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/group
diff --git a/tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/gshadow b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/gshadow
rename to tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/login.defs b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/login.defs
rename to tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/passwd b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/passwd
rename to tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/shadow b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/shadow
rename to tests/chroot/useradd/05_useradd--root_useradd-D-e-g/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/data/useradd.default b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/data/useradd.default
similarity index 100%
rename from tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/data/useradd.default
rename to tests/chroot/useradd/05_useradd--root_useradd-D-e-g/data/useradd.default
diff --git a/tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/useradd.test b/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/useradd.test
similarity index 100%
rename from tests/tests/chroot/useradd/05_useradd--root_useradd-D-e-g/useradd.test
rename to tests/chroot/useradd/05_useradd--root_useradd-D-e-g/useradd.test
diff --git a/tests/tests/chroot/userdel/01_userdel--root/config.txt b/tests/chroot/userdel/01_userdel--root/config.txt
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/config.txt
rename to tests/chroot/userdel/01_userdel--root/config.txt
diff --git a/tests/tests/chroot/userdel/01_userdel--root/config/etc/default/useradd b/tests/chroot/userdel/01_userdel--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/config/etc/default/useradd
rename to tests/chroot/userdel/01_userdel--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/userdel/01_userdel--root/config/etc/group b/tests/chroot/userdel/01_userdel--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/config/etc/group
rename to tests/chroot/userdel/01_userdel--root/config/etc/group
diff --git a/tests/tests/chroot/userdel/01_userdel--root/config/etc/gshadow b/tests/chroot/userdel/01_userdel--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/config/etc/gshadow
rename to tests/chroot/userdel/01_userdel--root/config/etc/gshadow
diff --git a/tests/tests/chroot/userdel/01_userdel--root/config/etc/passwd b/tests/chroot/userdel/01_userdel--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/config/etc/passwd
rename to tests/chroot/userdel/01_userdel--root/config/etc/passwd
diff --git a/tests/tests/chroot/userdel/01_userdel--root/config/etc/shadow b/tests/chroot/userdel/01_userdel--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/config/etc/shadow
rename to tests/chroot/userdel/01_userdel--root/config/etc/shadow
diff --git a/tests/tests/chroot/userdel/01_userdel--root/config_chroot/etc/group b/tests/chroot/userdel/01_userdel--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/config_chroot/etc/group
rename to tests/chroot/userdel/01_userdel--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/userdel/01_userdel--root/config_chroot/etc/gshadow b/tests/chroot/userdel/01_userdel--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/config_chroot/etc/gshadow
rename to tests/chroot/userdel/01_userdel--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/userdel/01_userdel--root/config_chroot/etc/login.defs b/tests/chroot/userdel/01_userdel--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/config_chroot/etc/login.defs
rename to tests/chroot/userdel/01_userdel--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/userdel/01_userdel--root/config_chroot/etc/passwd b/tests/chroot/userdel/01_userdel--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/config_chroot/etc/passwd
rename to tests/chroot/userdel/01_userdel--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/userdel/01_userdel--root/config_chroot/etc/shadow b/tests/chroot/userdel/01_userdel--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/config_chroot/etc/shadow
rename to tests/chroot/userdel/01_userdel--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/userdel/01_userdel--root/data/group b/tests/chroot/userdel/01_userdel--root/data/group
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/data/group
rename to tests/chroot/userdel/01_userdel--root/data/group
diff --git a/tests/tests/chroot/userdel/01_userdel--root/data/gshadow b/tests/chroot/userdel/01_userdel--root/data/gshadow
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/data/gshadow
rename to tests/chroot/userdel/01_userdel--root/data/gshadow
diff --git a/tests/tests/chroot/userdel/01_userdel--root/data/passwd b/tests/chroot/userdel/01_userdel--root/data/passwd
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/data/passwd
rename to tests/chroot/userdel/01_userdel--root/data/passwd
diff --git a/tests/tests/chroot/userdel/01_userdel--root/data/shadow b/tests/chroot/userdel/01_userdel--root/data/shadow
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/data/shadow
rename to tests/chroot/userdel/01_userdel--root/data/shadow
diff --git a/tests/tests/chroot/userdel/01_userdel--root/userdel.test b/tests/chroot/userdel/01_userdel--root/userdel.test
similarity index 100%
rename from tests/tests/chroot/userdel/01_userdel--root/userdel.test
rename to tests/chroot/userdel/01_userdel--root/userdel.test
diff --git a/tests/tests/chroot/usermod/01_usermod--root/config.txt b/tests/chroot/usermod/01_usermod--root/config.txt
similarity index 100%
rename from tests/tests/chroot/usermod/01_usermod--root/config.txt
rename to tests/chroot/usermod/01_usermod--root/config.txt
diff --git a/tests/tests/chroot/usermod/01_usermod--root/config/etc/default/useradd b/tests/chroot/usermod/01_usermod--root/config/etc/default/useradd
similarity index 100%
rename from tests/tests/chroot/usermod/01_usermod--root/config/etc/default/useradd
rename to tests/chroot/usermod/01_usermod--root/config/etc/default/useradd
diff --git a/tests/tests/chroot/usermod/01_usermod--root/config/etc/group b/tests/chroot/usermod/01_usermod--root/config/etc/group
similarity index 100%
rename from tests/tests/chroot/usermod/01_usermod--root/config/etc/group
rename to tests/chroot/usermod/01_usermod--root/config/etc/group
diff --git a/tests/tests/chroot/usermod/01_usermod--root/config/etc/gshadow b/tests/chroot/usermod/01_usermod--root/config/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/usermod/01_usermod--root/config/etc/gshadow
rename to tests/chroot/usermod/01_usermod--root/config/etc/gshadow
diff --git a/tests/tests/chroot/usermod/01_usermod--root/config/etc/passwd b/tests/chroot/usermod/01_usermod--root/config/etc/passwd
similarity index 100%
rename from tests/tests/chroot/usermod/01_usermod--root/config/etc/passwd
rename to tests/chroot/usermod/01_usermod--root/config/etc/passwd
diff --git a/tests/tests/chroot/usermod/01_usermod--root/config/etc/shadow b/tests/chroot/usermod/01_usermod--root/config/etc/shadow
similarity index 100%
rename from tests/tests/chroot/usermod/01_usermod--root/config/etc/shadow
rename to tests/chroot/usermod/01_usermod--root/config/etc/shadow
diff --git a/tests/tests/chroot/usermod/01_usermod--root/config_chroot/etc/group b/tests/chroot/usermod/01_usermod--root/config_chroot/etc/group
similarity index 100%
rename from tests/tests/chroot/usermod/01_usermod--root/config_chroot/etc/group
rename to tests/chroot/usermod/01_usermod--root/config_chroot/etc/group
diff --git a/tests/tests/chroot/usermod/01_usermod--root/config_chroot/etc/gshadow b/tests/chroot/usermod/01_usermod--root/config_chroot/etc/gshadow
similarity index 100%
rename from tests/tests/chroot/usermod/01_usermod--root/config_chroot/etc/gshadow
rename to tests/chroot/usermod/01_usermod--root/config_chroot/etc/gshadow
diff --git a/tests/tests/chroot/usermod/01_usermod--root/config_chroot/etc/login.defs b/tests/chroot/usermod/01_usermod--root/config_chroot/etc/login.defs
similarity index 100%
rename from tests/tests/chroot/usermod/01_usermod--root/config_chroot/etc/login.defs
rename to tests/chroot/usermod/01_usermod--root/config_chroot/etc/login.defs
diff --git a/tests/tests/chroot/usermod/01_usermod--root/config_chroot/etc/passwd b/tests/chroot/usermod/01_usermod--root/config_chroot/etc/passwd
similarity index 100%
rename from tests/tests/chroot/usermod/01_usermod--root/config_chroot/etc/passwd
rename to tests/chroot/usermod/01_usermod--root/config_chroot/etc/passwd
diff --git a/tests/tests/chroot/usermod/01_usermod--root/config_chroot/etc/shadow b/tests/chroot/usermod/01_usermod--root/config_chroot/etc/shadow
similarity index 100%
rename from tests/tests/chroot/usermod/01_usermod--root/config_chroot/etc/shadow
rename to tests/chroot/usermod/01_usermod--root/config_chroot/etc/shadow
diff --git a/tests/tests/chroot/usermod/01_usermod--root/data/passwd b/tests/chroot/usermod/01_usermod--root/data/passwd
similarity index 100%
rename from tests/tests/chroot/usermod/01_usermod--root/data/passwd
rename to tests/chroot/usermod/01_usermod--root/data/passwd
diff --git a/tests/tests/chroot/usermod/01_usermod--root/usermod.test b/tests/chroot/usermod/01_usermod--root/usermod.test
similarity index 100%
rename from tests/tests/chroot/usermod/01_usermod--root/usermod.test
rename to tests/chroot/usermod/01_usermod--root/usermod.test
diff --git a/tests/tests/chsh/01/data/chsh1 b/tests/chsh/01/data/chsh1
similarity index 100%
rename from tests/tests/chsh/01/data/chsh1
rename to tests/chsh/01/data/chsh1
diff --git a/tests/tests/chsh/01/data/chsh2 b/tests/chsh/01/data/chsh2
similarity index 100%
rename from tests/tests/chsh/01/data/chsh2
rename to tests/chsh/01/data/chsh2
diff --git a/tests/tests/chsh/01/data/group b/tests/chsh/01/data/group
similarity index 100%
rename from tests/tests/chsh/01/data/group
rename to tests/chsh/01/data/group
diff --git a/tests/tests/chsh/01/data/gshadow b/tests/chsh/01/data/gshadow
similarity index 100%
rename from tests/tests/chsh/01/data/gshadow
rename to tests/chsh/01/data/gshadow
diff --git a/tests/tests/chsh/01/data/passwd b/tests/chsh/01/data/passwd
similarity index 100%
rename from tests/tests/chsh/01/data/passwd
rename to tests/chsh/01/data/passwd
diff --git a/tests/tests/chsh/01/data/shadow b/tests/chsh/01/data/shadow
similarity index 100%
rename from tests/tests/chsh/01/data/shadow
rename to tests/chsh/01/data/shadow
diff --git a/tests/tests/chsh/01/data/shells b/tests/chsh/01/data/shells
similarity index 100%
rename from tests/tests/chsh/01/data/shells
rename to tests/chsh/01/data/shells
diff --git a/tests/tests/chsh/01/run b/tests/chsh/01/run
similarity index 100%
rename from tests/tests/chsh/01/run
rename to tests/chsh/01/run
diff --git a/tests/tests/chsh/01/run.exp b/tests/chsh/01/run.exp
similarity index 100%
rename from tests/tests/chsh/01/run.exp
rename to tests/chsh/01/run.exp
diff --git a/tests/tests/chsh/02_chsh_usage/chsh.test b/tests/chsh/02_chsh_usage/chsh.test
similarity index 100%
rename from tests/tests/chsh/02_chsh_usage/chsh.test
rename to tests/chsh/02_chsh_usage/chsh.test
diff --git a/tests/tests/chsh/02_chsh_usage/config.txt b/tests/chsh/02_chsh_usage/config.txt
similarity index 100%
rename from tests/tests/chsh/02_chsh_usage/config.txt
rename to tests/chsh/02_chsh_usage/config.txt
diff --git a/tests/tests/chsh/02_chsh_usage/config/etc/group b/tests/chsh/02_chsh_usage/config/etc/group
similarity index 100%
rename from tests/tests/chsh/02_chsh_usage/config/etc/group
rename to tests/chsh/02_chsh_usage/config/etc/group
diff --git a/tests/tests/chsh/02_chsh_usage/config/etc/gshadow b/tests/chsh/02_chsh_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/chsh/02_chsh_usage/config/etc/gshadow
rename to tests/chsh/02_chsh_usage/config/etc/gshadow
diff --git a/tests/tests/chsh/02_chsh_usage/config/etc/passwd b/tests/chsh/02_chsh_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/chsh/02_chsh_usage/config/etc/passwd
rename to tests/chsh/02_chsh_usage/config/etc/passwd
diff --git a/tests/tests/chsh/02_chsh_usage/config/etc/shadow b/tests/chsh/02_chsh_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/chsh/02_chsh_usage/config/etc/shadow
rename to tests/chsh/02_chsh_usage/config/etc/shadow
diff --git a/tests/tests/chsh/02_chsh_usage/data/usage.out b/tests/chsh/02_chsh_usage/data/usage.out
similarity index 100%
rename from tests/tests/chsh/02_chsh_usage/data/usage.out
rename to tests/chsh/02_chsh_usage/data/usage.out
diff --git a/tests/tests/chsh/03_chsh_usage_invalid_option/chsh.test b/tests/chsh/03_chsh_usage_invalid_option/chsh.test
similarity index 100%
rename from tests/tests/chsh/03_chsh_usage_invalid_option/chsh.test
rename to tests/chsh/03_chsh_usage_invalid_option/chsh.test
diff --git a/tests/tests/chsh/03_chsh_usage_invalid_option/config.txt b/tests/chsh/03_chsh_usage_invalid_option/config.txt
similarity index 100%
rename from tests/tests/chsh/03_chsh_usage_invalid_option/config.txt
rename to tests/chsh/03_chsh_usage_invalid_option/config.txt
diff --git a/tests/tests/chsh/03_chsh_usage_invalid_option/config/etc/group b/tests/chsh/03_chsh_usage_invalid_option/config/etc/group
similarity index 100%
rename from tests/tests/chsh/03_chsh_usage_invalid_option/config/etc/group
rename to tests/chsh/03_chsh_usage_invalid_option/config/etc/group
diff --git a/tests/tests/chsh/03_chsh_usage_invalid_option/config/etc/gshadow b/tests/chsh/03_chsh_usage_invalid_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/chsh/03_chsh_usage_invalid_option/config/etc/gshadow
rename to tests/chsh/03_chsh_usage_invalid_option/config/etc/gshadow
diff --git a/tests/tests/chsh/03_chsh_usage_invalid_option/config/etc/passwd b/tests/chsh/03_chsh_usage_invalid_option/config/etc/passwd
similarity index 100%
rename from tests/tests/chsh/03_chsh_usage_invalid_option/config/etc/passwd
rename to tests/chsh/03_chsh_usage_invalid_option/config/etc/passwd
diff --git a/tests/tests/chsh/03_chsh_usage_invalid_option/config/etc/shadow b/tests/chsh/03_chsh_usage_invalid_option/config/etc/shadow
similarity index 100%
rename from tests/tests/chsh/03_chsh_usage_invalid_option/config/etc/shadow
rename to tests/chsh/03_chsh_usage_invalid_option/config/etc/shadow
diff --git a/tests/tests/chsh/03_chsh_usage_invalid_option/data/usage.out b/tests/chsh/03_chsh_usage_invalid_option/data/usage.out
similarity index 100%
rename from tests/tests/chsh/03_chsh_usage_invalid_option/data/usage.out
rename to tests/chsh/03_chsh_usage_invalid_option/data/usage.out
diff --git a/tests/tests/chsh/04_chsh_usage_2_users/chsh.test b/tests/chsh/04_chsh_usage_2_users/chsh.test
similarity index 100%
rename from tests/tests/chsh/04_chsh_usage_2_users/chsh.test
rename to tests/chsh/04_chsh_usage_2_users/chsh.test
diff --git a/tests/tests/chsh/04_chsh_usage_2_users/config.txt b/tests/chsh/04_chsh_usage_2_users/config.txt
similarity index 100%
rename from tests/tests/chsh/04_chsh_usage_2_users/config.txt
rename to tests/chsh/04_chsh_usage_2_users/config.txt
diff --git a/tests/tests/chsh/04_chsh_usage_2_users/config/etc/group b/tests/chsh/04_chsh_usage_2_users/config/etc/group
similarity index 100%
rename from tests/tests/chsh/04_chsh_usage_2_users/config/etc/group
rename to tests/chsh/04_chsh_usage_2_users/config/etc/group
diff --git a/tests/tests/chsh/04_chsh_usage_2_users/config/etc/gshadow b/tests/chsh/04_chsh_usage_2_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/chsh/04_chsh_usage_2_users/config/etc/gshadow
rename to tests/chsh/04_chsh_usage_2_users/config/etc/gshadow
diff --git a/tests/tests/chsh/04_chsh_usage_2_users/config/etc/passwd b/tests/chsh/04_chsh_usage_2_users/config/etc/passwd
similarity index 100%
rename from tests/tests/chsh/04_chsh_usage_2_users/config/etc/passwd
rename to tests/chsh/04_chsh_usage_2_users/config/etc/passwd
diff --git a/tests/tests/chsh/04_chsh_usage_2_users/config/etc/shadow b/tests/chsh/04_chsh_usage_2_users/config/etc/shadow
similarity index 100%
rename from tests/tests/chsh/04_chsh_usage_2_users/config/etc/shadow
rename to tests/chsh/04_chsh_usage_2_users/config/etc/shadow
diff --git a/tests/tests/chsh/04_chsh_usage_2_users/data/usage.out b/tests/chsh/04_chsh_usage_2_users/data/usage.out
similarity index 100%
rename from tests/tests/chsh/04_chsh_usage_2_users/data/usage.out
rename to tests/chsh/04_chsh_usage_2_users/data/usage.out
diff --git a/tests/tests/chsh/05_chsh_myuser_restricted_shell/chsh.test b/tests/chsh/05_chsh_myuser_restricted_shell/chsh.test
similarity index 100%
rename from tests/tests/chsh/05_chsh_myuser_restricted_shell/chsh.test
rename to tests/chsh/05_chsh_myuser_restricted_shell/chsh.test
diff --git a/tests/tests/chsh/05_chsh_myuser_restricted_shell/config.txt b/tests/chsh/05_chsh_myuser_restricted_shell/config.txt
similarity index 100%
rename from tests/tests/chsh/05_chsh_myuser_restricted_shell/config.txt
rename to tests/chsh/05_chsh_myuser_restricted_shell/config.txt
diff --git a/tests/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/group b/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/group
similarity index 100%
rename from tests/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/group
rename to tests/chsh/05_chsh_myuser_restricted_shell/config/etc/group
diff --git a/tests/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/gshadow b/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/gshadow
similarity index 100%
rename from tests/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/gshadow
rename to tests/chsh/05_chsh_myuser_restricted_shell/config/etc/gshadow
diff --git a/tests/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/passwd b/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/passwd
similarity index 100%
rename from tests/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/passwd
rename to tests/chsh/05_chsh_myuser_restricted_shell/config/etc/passwd
diff --git a/tests/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/shadow b/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/shadow
similarity index 100%
rename from tests/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/shadow
rename to tests/chsh/05_chsh_myuser_restricted_shell/config/etc/shadow
diff --git a/tests/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/shells b/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/shells
similarity index 100%
rename from tests/tests/chsh/05_chsh_myuser_restricted_shell/config/etc/shells
rename to tests/chsh/05_chsh_myuser_restricted_shell/config/etc/shells
diff --git a/tests/tests/chsh/05_chsh_myuser_restricted_shell/run.exp b/tests/chsh/05_chsh_myuser_restricted_shell/run.exp
similarity index 100%
rename from tests/tests/chsh/05_chsh_myuser_restricted_shell/run.exp
rename to tests/chsh/05_chsh_myuser_restricted_shell/run.exp
diff --git a/tests/tests/chsh/06_chsh_myuser_non_restricted_shell/chsh.test b/tests/chsh/06_chsh_myuser_non_restricted_shell/chsh.test
similarity index 100%
rename from tests/tests/chsh/06_chsh_myuser_non_restricted_shell/chsh.test
rename to tests/chsh/06_chsh_myuser_non_restricted_shell/chsh.test
diff --git a/tests/tests/chsh/06_chsh_myuser_non_restricted_shell/config.txt b/tests/chsh/06_chsh_myuser_non_restricted_shell/config.txt
similarity index 100%
rename from tests/tests/chsh/06_chsh_myuser_non_restricted_shell/config.txt
rename to tests/chsh/06_chsh_myuser_non_restricted_shell/config.txt
diff --git a/tests/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/group b/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/group
similarity index 100%
rename from tests/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/group
rename to tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/group
diff --git a/tests/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/gshadow b/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/gshadow
similarity index 100%
rename from tests/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/gshadow
rename to tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/gshadow
diff --git a/tests/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/passwd b/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/passwd
similarity index 100%
rename from tests/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/passwd
rename to tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/passwd
diff --git a/tests/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/shadow b/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/shadow
similarity index 100%
rename from tests/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/shadow
rename to tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/shadow
diff --git a/tests/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/shells b/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/shells
similarity index 100%
rename from tests/tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/shells
rename to tests/chsh/06_chsh_myuser_non_restricted_shell/config/etc/shells
diff --git a/tests/tests/chsh/06_chsh_myuser_non_restricted_shell/data/passwd b/tests/chsh/06_chsh_myuser_non_restricted_shell/data/passwd
similarity index 100%
rename from tests/tests/chsh/06_chsh_myuser_non_restricted_shell/data/passwd
rename to tests/chsh/06_chsh_myuser_non_restricted_shell/data/passwd
diff --git a/tests/tests/chsh/06_chsh_myuser_non_restricted_shell/run.exp b/tests/chsh/06_chsh_myuser_non_restricted_shell/run.exp
similarity index 100%
rename from tests/tests/chsh/06_chsh_myuser_non_restricted_shell/run.exp
rename to tests/chsh/06_chsh_myuser_non_restricted_shell/run.exp
diff --git a/tests/tests/chsh/07_chsh_usage_invalid_user/chsh.test b/tests/chsh/07_chsh_usage_invalid_user/chsh.test
similarity index 100%
rename from tests/tests/chsh/07_chsh_usage_invalid_user/chsh.test
rename to tests/chsh/07_chsh_usage_invalid_user/chsh.test
diff --git a/tests/tests/chsh/07_chsh_usage_invalid_user/config.txt b/tests/chsh/07_chsh_usage_invalid_user/config.txt
similarity index 100%
rename from tests/tests/chsh/07_chsh_usage_invalid_user/config.txt
rename to tests/chsh/07_chsh_usage_invalid_user/config.txt
diff --git a/tests/tests/chsh/07_chsh_usage_invalid_user/config/etc/group b/tests/chsh/07_chsh_usage_invalid_user/config/etc/group
similarity index 100%
rename from tests/tests/chsh/07_chsh_usage_invalid_user/config/etc/group
rename to tests/chsh/07_chsh_usage_invalid_user/config/etc/group
diff --git a/tests/tests/chsh/07_chsh_usage_invalid_user/config/etc/gshadow b/tests/chsh/07_chsh_usage_invalid_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/chsh/07_chsh_usage_invalid_user/config/etc/gshadow
rename to tests/chsh/07_chsh_usage_invalid_user/config/etc/gshadow
diff --git a/tests/tests/chsh/07_chsh_usage_invalid_user/config/etc/passwd b/tests/chsh/07_chsh_usage_invalid_user/config/etc/passwd
similarity index 100%
rename from tests/tests/chsh/07_chsh_usage_invalid_user/config/etc/passwd
rename to tests/chsh/07_chsh_usage_invalid_user/config/etc/passwd
diff --git a/tests/tests/chsh/07_chsh_usage_invalid_user/config/etc/shadow b/tests/chsh/07_chsh_usage_invalid_user/config/etc/shadow
similarity index 100%
rename from tests/tests/chsh/07_chsh_usage_invalid_user/config/etc/shadow
rename to tests/chsh/07_chsh_usage_invalid_user/config/etc/shadow
diff --git a/tests/tests/chsh/07_chsh_usage_invalid_user/data/usage.out b/tests/chsh/07_chsh_usage_invalid_user/data/usage.out
similarity index 100%
rename from tests/tests/chsh/07_chsh_usage_invalid_user/data/usage.out
rename to tests/chsh/07_chsh_usage_invalid_user/data/usage.out
diff --git a/tests/tests/chsh/08_chsh_myuser_to_restricted_shell/chsh.test b/tests/chsh/08_chsh_myuser_to_restricted_shell/chsh.test
similarity index 100%
rename from tests/tests/chsh/08_chsh_myuser_to_restricted_shell/chsh.test
rename to tests/chsh/08_chsh_myuser_to_restricted_shell/chsh.test
diff --git a/tests/tests/chsh/08_chsh_myuser_to_restricted_shell/config.txt b/tests/chsh/08_chsh_myuser_to_restricted_shell/config.txt
similarity index 100%
rename from tests/tests/chsh/08_chsh_myuser_to_restricted_shell/config.txt
rename to tests/chsh/08_chsh_myuser_to_restricted_shell/config.txt
diff --git a/tests/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/group b/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/group
similarity index 100%
rename from tests/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/group
rename to tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/group
diff --git a/tests/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/gshadow b/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/gshadow
similarity index 100%
rename from tests/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/gshadow
rename to tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/gshadow
diff --git a/tests/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/passwd b/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/passwd
similarity index 100%
rename from tests/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/passwd
rename to tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/passwd
diff --git a/tests/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/shadow b/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/shadow
similarity index 100%
rename from tests/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/shadow
rename to tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/shadow
diff --git a/tests/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/shells b/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/shells
similarity index 100%
rename from tests/tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/shells
rename to tests/chsh/08_chsh_myuser_to_restricted_shell/config/etc/shells
diff --git a/tests/tests/chsh/08_chsh_myuser_to_restricted_shell/data/passwd b/tests/chsh/08_chsh_myuser_to_restricted_shell/data/passwd
similarity index 100%
rename from tests/tests/chsh/08_chsh_myuser_to_restricted_shell/data/passwd
rename to tests/chsh/08_chsh_myuser_to_restricted_shell/data/passwd
diff --git a/tests/tests/chsh/08_chsh_myuser_to_restricted_shell/run.exp b/tests/chsh/08_chsh_myuser_to_restricted_shell/run.exp
similarity index 100%
rename from tests/tests/chsh/08_chsh_myuser_to_restricted_shell/run.exp
rename to tests/chsh/08_chsh_myuser_to_restricted_shell/run.exp
diff --git a/tests/tests/chsh/09_chsh_myuser_to_missing_shell/chsh.test b/tests/chsh/09_chsh_myuser_to_missing_shell/chsh.test
similarity index 100%
rename from tests/tests/chsh/09_chsh_myuser_to_missing_shell/chsh.test
rename to tests/chsh/09_chsh_myuser_to_missing_shell/chsh.test
diff --git a/tests/tests/chsh/09_chsh_myuser_to_missing_shell/config.txt b/tests/chsh/09_chsh_myuser_to_missing_shell/config.txt
similarity index 100%
rename from tests/tests/chsh/09_chsh_myuser_to_missing_shell/config.txt
rename to tests/chsh/09_chsh_myuser_to_missing_shell/config.txt
diff --git a/tests/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/group b/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/group
similarity index 100%
rename from tests/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/group
rename to tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/group
diff --git a/tests/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/gshadow b/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/gshadow
similarity index 100%
rename from tests/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/gshadow
rename to tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/gshadow
diff --git a/tests/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/passwd b/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/passwd
similarity index 100%
rename from tests/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/passwd
rename to tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/passwd
diff --git a/tests/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/shadow b/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/shadow
similarity index 100%
rename from tests/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/shadow
rename to tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/shadow
diff --git a/tests/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/shells b/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/shells
similarity index 100%
rename from tests/tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/shells
rename to tests/chsh/09_chsh_myuser_to_missing_shell/config/etc/shells
diff --git a/tests/tests/chsh/09_chsh_myuser_to_missing_shell/data/passwd b/tests/chsh/09_chsh_myuser_to_missing_shell/data/passwd
similarity index 100%
rename from tests/tests/chsh/09_chsh_myuser_to_missing_shell/data/passwd
rename to tests/chsh/09_chsh_myuser_to_missing_shell/data/passwd
diff --git a/tests/tests/chsh/09_chsh_myuser_to_missing_shell/run.exp b/tests/chsh/09_chsh_myuser_to_missing_shell/run.exp
similarity index 100%
rename from tests/tests/chsh/09_chsh_myuser_to_missing_shell/run.exp
rename to tests/chsh/09_chsh_myuser_to_missing_shell/run.exp
diff --git a/tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/chsh.test b/tests/chsh/10_chsh_myuser_to_non_executable_shell/chsh.test
similarity index 100%
rename from tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/chsh.test
rename to tests/chsh/10_chsh_myuser_to_non_executable_shell/chsh.test
diff --git a/tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/config.txt b/tests/chsh/10_chsh_myuser_to_non_executable_shell/config.txt
similarity index 100%
rename from tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/config.txt
rename to tests/chsh/10_chsh_myuser_to_non_executable_shell/config.txt
diff --git a/tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/group b/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/group
similarity index 100%
rename from tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/group
rename to tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/group
diff --git a/tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/gshadow b/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/gshadow
similarity index 100%
rename from tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/gshadow
rename to tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/gshadow
diff --git a/tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/passwd b/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/passwd
similarity index 100%
rename from tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/passwd
rename to tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/passwd
diff --git a/tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/shadow b/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/shadow
similarity index 100%
rename from tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/shadow
rename to tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/shadow
diff --git a/tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/shells b/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/shells
similarity index 100%
rename from tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/shells
rename to tests/chsh/10_chsh_myuser_to_non_executable_shell/config/etc/shells
diff --git a/tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/data/passwd b/tests/chsh/10_chsh_myuser_to_non_executable_shell/data/passwd
similarity index 100%
rename from tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/data/passwd
rename to tests/chsh/10_chsh_myuser_to_non_executable_shell/data/passwd
diff --git a/tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/run.exp b/tests/chsh/10_chsh_myuser_to_non_executable_shell/run.exp
similarity index 100%
rename from tests/tests/chsh/10_chsh_myuser_to_non_executable_shell/run.exp
rename to tests/chsh/10_chsh_myuser_to_non_executable_shell/run.exp
diff --git a/tests/tests/chsh/11_chsh_auth_failure/chsh.test b/tests/chsh/11_chsh_auth_failure/chsh.test
similarity index 100%
rename from tests/tests/chsh/11_chsh_auth_failure/chsh.test
rename to tests/chsh/11_chsh_auth_failure/chsh.test
diff --git a/tests/tests/chsh/11_chsh_auth_failure/config.txt b/tests/chsh/11_chsh_auth_failure/config.txt
similarity index 100%
rename from tests/tests/chsh/11_chsh_auth_failure/config.txt
rename to tests/chsh/11_chsh_auth_failure/config.txt
diff --git a/tests/tests/chsh/11_chsh_auth_failure/config/etc/group b/tests/chsh/11_chsh_auth_failure/config/etc/group
similarity index 100%
rename from tests/tests/chsh/11_chsh_auth_failure/config/etc/group
rename to tests/chsh/11_chsh_auth_failure/config/etc/group
diff --git a/tests/tests/chsh/11_chsh_auth_failure/config/etc/gshadow b/tests/chsh/11_chsh_auth_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/chsh/11_chsh_auth_failure/config/etc/gshadow
rename to tests/chsh/11_chsh_auth_failure/config/etc/gshadow
diff --git a/tests/tests/chsh/11_chsh_auth_failure/config/etc/passwd b/tests/chsh/11_chsh_auth_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/chsh/11_chsh_auth_failure/config/etc/passwd
rename to tests/chsh/11_chsh_auth_failure/config/etc/passwd
diff --git a/tests/tests/chsh/11_chsh_auth_failure/config/etc/shadow b/tests/chsh/11_chsh_auth_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/chsh/11_chsh_auth_failure/config/etc/shadow
rename to tests/chsh/11_chsh_auth_failure/config/etc/shadow
diff --git a/tests/tests/chsh/11_chsh_auth_failure/config/etc/shells b/tests/chsh/11_chsh_auth_failure/config/etc/shells
similarity index 100%
rename from tests/tests/chsh/11_chsh_auth_failure/config/etc/shells
rename to tests/chsh/11_chsh_auth_failure/config/etc/shells
diff --git a/tests/tests/chsh/11_chsh_auth_failure/data/passwd b/tests/chsh/11_chsh_auth_failure/data/passwd
similarity index 100%
rename from tests/tests/chsh/11_chsh_auth_failure/data/passwd
rename to tests/chsh/11_chsh_auth_failure/data/passwd
diff --git a/tests/tests/chsh/11_chsh_auth_failure/run.exp b/tests/chsh/11_chsh_auth_failure/run.exp
similarity index 100%
rename from tests/tests/chsh/11_chsh_auth_failure/run.exp
rename to tests/chsh/11_chsh_auth_failure/run.exp
diff --git a/tests/tests/chsh/12_chsh_warning_missing_shell/chsh.test b/tests/chsh/12_chsh_warning_missing_shell/chsh.test
similarity index 100%
rename from tests/tests/chsh/12_chsh_warning_missing_shell/chsh.test
rename to tests/chsh/12_chsh_warning_missing_shell/chsh.test
diff --git a/tests/tests/chsh/12_chsh_warning_missing_shell/config.txt b/tests/chsh/12_chsh_warning_missing_shell/config.txt
similarity index 100%
rename from tests/tests/chsh/12_chsh_warning_missing_shell/config.txt
rename to tests/chsh/12_chsh_warning_missing_shell/config.txt
diff --git a/tests/tests/chsh/12_chsh_warning_missing_shell/config/etc/group b/tests/chsh/12_chsh_warning_missing_shell/config/etc/group
similarity index 100%
rename from tests/tests/chsh/12_chsh_warning_missing_shell/config/etc/group
rename to tests/chsh/12_chsh_warning_missing_shell/config/etc/group
diff --git a/tests/tests/chsh/12_chsh_warning_missing_shell/config/etc/gshadow b/tests/chsh/12_chsh_warning_missing_shell/config/etc/gshadow
similarity index 100%
rename from tests/tests/chsh/12_chsh_warning_missing_shell/config/etc/gshadow
rename to tests/chsh/12_chsh_warning_missing_shell/config/etc/gshadow
diff --git a/tests/tests/chsh/12_chsh_warning_missing_shell/config/etc/pam.d/chsh b/tests/chsh/12_chsh_warning_missing_shell/config/etc/pam.d/chsh
similarity index 100%
rename from tests/tests/chsh/12_chsh_warning_missing_shell/config/etc/pam.d/chsh
rename to tests/chsh/12_chsh_warning_missing_shell/config/etc/pam.d/chsh
diff --git a/tests/tests/chsh/12_chsh_warning_missing_shell/config/etc/passwd b/tests/chsh/12_chsh_warning_missing_shell/config/etc/passwd
similarity index 100%
rename from tests/tests/chsh/12_chsh_warning_missing_shell/config/etc/passwd
rename to tests/chsh/12_chsh_warning_missing_shell/config/etc/passwd
diff --git a/tests/tests/chsh/12_chsh_warning_missing_shell/config/etc/shadow b/tests/chsh/12_chsh_warning_missing_shell/config/etc/shadow
similarity index 100%
rename from tests/tests/chsh/12_chsh_warning_missing_shell/config/etc/shadow
rename to tests/chsh/12_chsh_warning_missing_shell/config/etc/shadow
diff --git a/tests/tests/chsh/12_chsh_warning_missing_shell/config/etc/shells b/tests/chsh/12_chsh_warning_missing_shell/config/etc/shells
similarity index 100%
rename from tests/tests/chsh/12_chsh_warning_missing_shell/config/etc/shells
rename to tests/chsh/12_chsh_warning_missing_shell/config/etc/shells
diff --git a/tests/tests/chsh/12_chsh_warning_missing_shell/data/chsh.err b/tests/chsh/12_chsh_warning_missing_shell/data/chsh.err
similarity index 100%
rename from tests/tests/chsh/12_chsh_warning_missing_shell/data/chsh.err
rename to tests/chsh/12_chsh_warning_missing_shell/data/chsh.err
diff --git a/tests/tests/chsh/12_chsh_warning_missing_shell/data/passwd b/tests/chsh/12_chsh_warning_missing_shell/data/passwd
similarity index 100%
rename from tests/tests/chsh/12_chsh_warning_missing_shell/data/passwd
rename to tests/chsh/12_chsh_warning_missing_shell/data/passwd
diff --git a/tests/tests/chsh/13_chsh_warning_non_executable/chsh.test b/tests/chsh/13_chsh_warning_non_executable/chsh.test
similarity index 100%
rename from tests/tests/chsh/13_chsh_warning_non_executable/chsh.test
rename to tests/chsh/13_chsh_warning_non_executable/chsh.test
diff --git a/tests/tests/chsh/13_chsh_warning_non_executable/config.txt b/tests/chsh/13_chsh_warning_non_executable/config.txt
similarity index 100%
rename from tests/tests/chsh/13_chsh_warning_non_executable/config.txt
rename to tests/chsh/13_chsh_warning_non_executable/config.txt
diff --git a/tests/tests/chsh/13_chsh_warning_non_executable/config/etc/group b/tests/chsh/13_chsh_warning_non_executable/config/etc/group
similarity index 100%
rename from tests/tests/chsh/13_chsh_warning_non_executable/config/etc/group
rename to tests/chsh/13_chsh_warning_non_executable/config/etc/group
diff --git a/tests/tests/chsh/13_chsh_warning_non_executable/config/etc/gshadow b/tests/chsh/13_chsh_warning_non_executable/config/etc/gshadow
similarity index 100%
rename from tests/tests/chsh/13_chsh_warning_non_executable/config/etc/gshadow
rename to tests/chsh/13_chsh_warning_non_executable/config/etc/gshadow
diff --git a/tests/tests/chsh/13_chsh_warning_non_executable/config/etc/pam.d/chsh b/tests/chsh/13_chsh_warning_non_executable/config/etc/pam.d/chsh
similarity index 100%
rename from tests/tests/chsh/13_chsh_warning_non_executable/config/etc/pam.d/chsh
rename to tests/chsh/13_chsh_warning_non_executable/config/etc/pam.d/chsh
diff --git a/tests/tests/chsh/13_chsh_warning_non_executable/config/etc/passwd b/tests/chsh/13_chsh_warning_non_executable/config/etc/passwd
similarity index 100%
rename from tests/tests/chsh/13_chsh_warning_non_executable/config/etc/passwd
rename to tests/chsh/13_chsh_warning_non_executable/config/etc/passwd
diff --git a/tests/tests/chsh/13_chsh_warning_non_executable/config/etc/shadow b/tests/chsh/13_chsh_warning_non_executable/config/etc/shadow
similarity index 100%
rename from tests/tests/chsh/13_chsh_warning_non_executable/config/etc/shadow
rename to tests/chsh/13_chsh_warning_non_executable/config/etc/shadow
diff --git a/tests/tests/chsh/13_chsh_warning_non_executable/config/etc/shells b/tests/chsh/13_chsh_warning_non_executable/config/etc/shells
similarity index 100%
rename from tests/tests/chsh/13_chsh_warning_non_executable/config/etc/shells
rename to tests/chsh/13_chsh_warning_non_executable/config/etc/shells
diff --git a/tests/tests/chsh/13_chsh_warning_non_executable/data/chsh.err b/tests/chsh/13_chsh_warning_non_executable/data/chsh.err
similarity index 100%
rename from tests/tests/chsh/13_chsh_warning_non_executable/data/chsh.err
rename to tests/chsh/13_chsh_warning_non_executable/data/chsh.err
diff --git a/tests/tests/chsh/13_chsh_warning_non_executable/data/passwd b/tests/chsh/13_chsh_warning_non_executable/data/passwd
similarity index 100%
rename from tests/tests/chsh/13_chsh_warning_non_executable/data/passwd
rename to tests/chsh/13_chsh_warning_non_executable/data/passwd
diff --git a/tests/tests/chsh/14_chsh_locked_passwd/chsh.test b/tests/chsh/14_chsh_locked_passwd/chsh.test
similarity index 100%
rename from tests/tests/chsh/14_chsh_locked_passwd/chsh.test
rename to tests/chsh/14_chsh_locked_passwd/chsh.test
diff --git a/tests/tests/chsh/14_chsh_locked_passwd/config.txt b/tests/chsh/14_chsh_locked_passwd/config.txt
similarity index 100%
rename from tests/tests/chsh/14_chsh_locked_passwd/config.txt
rename to tests/chsh/14_chsh_locked_passwd/config.txt
diff --git a/tests/tests/chsh/14_chsh_locked_passwd/config/etc/group b/tests/chsh/14_chsh_locked_passwd/config/etc/group
similarity index 100%
rename from tests/tests/chsh/14_chsh_locked_passwd/config/etc/group
rename to tests/chsh/14_chsh_locked_passwd/config/etc/group
diff --git a/tests/tests/chsh/14_chsh_locked_passwd/config/etc/gshadow b/tests/chsh/14_chsh_locked_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/chsh/14_chsh_locked_passwd/config/etc/gshadow
rename to tests/chsh/14_chsh_locked_passwd/config/etc/gshadow
diff --git a/tests/tests/chsh/14_chsh_locked_passwd/config/etc/passwd b/tests/chsh/14_chsh_locked_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/chsh/14_chsh_locked_passwd/config/etc/passwd
rename to tests/chsh/14_chsh_locked_passwd/config/etc/passwd
diff --git a/tests/tests/chsh/14_chsh_locked_passwd/config/etc/shadow b/tests/chsh/14_chsh_locked_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/chsh/14_chsh_locked_passwd/config/etc/shadow
rename to tests/chsh/14_chsh_locked_passwd/config/etc/shadow
diff --git a/tests/tests/chsh/14_chsh_locked_passwd/data/chsh.err b/tests/chsh/14_chsh_locked_passwd/data/chsh.err
similarity index 100%
rename from tests/tests/chsh/14_chsh_locked_passwd/data/chsh.err
rename to tests/chsh/14_chsh_locked_passwd/data/chsh.err
diff --git a/tests/tests/chsh/15_chsh_PAM_error/chsh.test b/tests/chsh/15_chsh_PAM_error/chsh.test
similarity index 100%
rename from tests/tests/chsh/15_chsh_PAM_error/chsh.test
rename to tests/chsh/15_chsh_PAM_error/chsh.test
diff --git a/tests/tests/chsh/15_chsh_PAM_error/config.txt b/tests/chsh/15_chsh_PAM_error/config.txt
similarity index 100%
rename from tests/tests/chsh/15_chsh_PAM_error/config.txt
rename to tests/chsh/15_chsh_PAM_error/config.txt
diff --git a/tests/tests/chsh/15_chsh_PAM_error/config/etc/group b/tests/chsh/15_chsh_PAM_error/config/etc/group
similarity index 100%
rename from tests/tests/chsh/15_chsh_PAM_error/config/etc/group
rename to tests/chsh/15_chsh_PAM_error/config/etc/group
diff --git a/tests/tests/chsh/15_chsh_PAM_error/config/etc/gshadow b/tests/chsh/15_chsh_PAM_error/config/etc/gshadow
similarity index 100%
rename from tests/tests/chsh/15_chsh_PAM_error/config/etc/gshadow
rename to tests/chsh/15_chsh_PAM_error/config/etc/gshadow
diff --git a/tests/tests/chsh/15_chsh_PAM_error/config/etc/pam.d/chsh b/tests/chsh/15_chsh_PAM_error/config/etc/pam.d/chsh
similarity index 100%
rename from tests/tests/chsh/15_chsh_PAM_error/config/etc/pam.d/chsh
rename to tests/chsh/15_chsh_PAM_error/config/etc/pam.d/chsh
diff --git a/tests/tests/chsh/15_chsh_PAM_error/config/etc/pam.d/other b/tests/chsh/15_chsh_PAM_error/config/etc/pam.d/other
similarity index 100%
rename from tests/tests/chsh/15_chsh_PAM_error/config/etc/pam.d/other
rename to tests/chsh/15_chsh_PAM_error/config/etc/pam.d/other
diff --git a/tests/tests/chsh/15_chsh_PAM_error/config/etc/passwd b/tests/chsh/15_chsh_PAM_error/config/etc/passwd
similarity index 100%
rename from tests/tests/chsh/15_chsh_PAM_error/config/etc/passwd
rename to tests/chsh/15_chsh_PAM_error/config/etc/passwd
diff --git a/tests/tests/chsh/15_chsh_PAM_error/config/etc/shadow b/tests/chsh/15_chsh_PAM_error/config/etc/shadow
similarity index 100%
rename from tests/tests/chsh/15_chsh_PAM_error/config/etc/shadow
rename to tests/chsh/15_chsh_PAM_error/config/etc/shadow
diff --git a/tests/tests/chsh/15_chsh_PAM_error/data/chsh.err b/tests/chsh/15_chsh_PAM_error/data/chsh.err
similarity index 100%
rename from tests/tests/chsh/15_chsh_PAM_error/data/chsh.err
rename to tests/chsh/15_chsh_PAM_error/data/chsh.err
diff --git a/tests/tests/cktools/01/data/group b/tests/cktools/01/data/group
similarity index 100%
rename from tests/tests/cktools/01/data/group
rename to tests/cktools/01/data/group
diff --git a/tests/tests/cktools/01/data/gshadow b/tests/cktools/01/data/gshadow
similarity index 100%
rename from tests/tests/cktools/01/data/gshadow
rename to tests/cktools/01/data/gshadow
diff --git a/tests/tests/cktools/01/data/passwd b/tests/cktools/01/data/passwd
similarity index 100%
rename from tests/tests/cktools/01/data/passwd
rename to tests/cktools/01/data/passwd
diff --git a/tests/tests/cktools/01/data/run2.err b/tests/cktools/01/data/run2.err
similarity index 100%
rename from tests/tests/cktools/01/data/run2.err
rename to tests/cktools/01/data/run2.err
diff --git a/tests/tests/cktools/01/data/run2.out b/tests/cktools/01/data/run2.out
similarity index 100%
rename from tests/tests/cktools/01/data/run2.out
rename to tests/cktools/01/data/run2.out
diff --git a/tests/tests/cktools/01/data/shadow b/tests/cktools/01/data/shadow
similarity index 100%
rename from tests/tests/cktools/01/data/shadow
rename to tests/cktools/01/data/shadow
diff --git a/tests/tests/cktools/01/run1 b/tests/cktools/01/run1
similarity index 100%
rename from tests/tests/cktools/01/run1
rename to tests/cktools/01/run1
diff --git a/tests/tests/cktools/01/run2 b/tests/cktools/01/run2
similarity index 100%
rename from tests/tests/cktools/01/run2
rename to tests/cktools/01/run2
diff --git a/tests/tests/cktools/02_pwck_sort/config.txt b/tests/cktools/02_pwck_sort/config.txt
similarity index 100%
rename from tests/tests/cktools/02_pwck_sort/config.txt
rename to tests/cktools/02_pwck_sort/config.txt
diff --git a/tests/tests/cktools/02_pwck_sort/config/etc/group b/tests/cktools/02_pwck_sort/config/etc/group
similarity index 100%
rename from tests/tests/cktools/02_pwck_sort/config/etc/group
rename to tests/cktools/02_pwck_sort/config/etc/group
diff --git a/tests/tests/cktools/02_pwck_sort/config/etc/gshadow b/tests/cktools/02_pwck_sort/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/02_pwck_sort/config/etc/gshadow
rename to tests/cktools/02_pwck_sort/config/etc/gshadow
diff --git a/tests/tests/cktools/02_pwck_sort/config/etc/passwd b/tests/cktools/02_pwck_sort/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/02_pwck_sort/config/etc/passwd
rename to tests/cktools/02_pwck_sort/config/etc/passwd
diff --git a/tests/tests/cktools/02_pwck_sort/config/etc/shadow b/tests/cktools/02_pwck_sort/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/02_pwck_sort/config/etc/shadow
rename to tests/cktools/02_pwck_sort/config/etc/shadow
diff --git a/tests/tests/cktools/02_pwck_sort/data/passwd b/tests/cktools/02_pwck_sort/data/passwd
similarity index 100%
rename from tests/tests/cktools/02_pwck_sort/data/passwd
rename to tests/cktools/02_pwck_sort/data/passwd
diff --git a/tests/tests/cktools/02_pwck_sort/data/shadow b/tests/cktools/02_pwck_sort/data/shadow
similarity index 100%
rename from tests/tests/cktools/02_pwck_sort/data/shadow
rename to tests/cktools/02_pwck_sort/data/shadow
diff --git a/tests/tests/cktools/02_pwck_sort/pwck.test b/tests/cktools/02_pwck_sort/pwck.test
similarity index 100%
rename from tests/tests/cktools/02_pwck_sort/pwck.test
rename to tests/cktools/02_pwck_sort/pwck.test
diff --git a/tests/tests/cktools/03_grpck_sort/config.txt b/tests/cktools/03_grpck_sort/config.txt
similarity index 100%
rename from tests/tests/cktools/03_grpck_sort/config.txt
rename to tests/cktools/03_grpck_sort/config.txt
diff --git a/tests/tests/cktools/03_grpck_sort/config/etc/group b/tests/cktools/03_grpck_sort/config/etc/group
similarity index 100%
rename from tests/tests/cktools/03_grpck_sort/config/etc/group
rename to tests/cktools/03_grpck_sort/config/etc/group
diff --git a/tests/tests/cktools/03_grpck_sort/config/etc/gshadow b/tests/cktools/03_grpck_sort/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/03_grpck_sort/config/etc/gshadow
rename to tests/cktools/03_grpck_sort/config/etc/gshadow
diff --git a/tests/tests/cktools/03_grpck_sort/config/etc/passwd b/tests/cktools/03_grpck_sort/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/03_grpck_sort/config/etc/passwd
rename to tests/cktools/03_grpck_sort/config/etc/passwd
diff --git a/tests/tests/cktools/03_grpck_sort/config/etc/shadow b/tests/cktools/03_grpck_sort/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/03_grpck_sort/config/etc/shadow
rename to tests/cktools/03_grpck_sort/config/etc/shadow
diff --git a/tests/tests/cktools/03_grpck_sort/data/group b/tests/cktools/03_grpck_sort/data/group
similarity index 100%
rename from tests/tests/cktools/03_grpck_sort/data/group
rename to tests/cktools/03_grpck_sort/data/group
diff --git a/tests/tests/cktools/03_grpck_sort/data/gshadow b/tests/cktools/03_grpck_sort/data/gshadow
similarity index 100%
rename from tests/tests/cktools/03_grpck_sort/data/gshadow
rename to tests/cktools/03_grpck_sort/data/gshadow
diff --git a/tests/tests/cktools/03_grpck_sort/grpck.test b/tests/cktools/03_grpck_sort/grpck.test
similarity index 100%
rename from tests/tests/cktools/03_grpck_sort/grpck.test
rename to tests/cktools/03_grpck_sort/grpck.test
diff --git a/tests/tests/cktools/04_pwck_sort_missing_shadow_user/config.txt b/tests/cktools/04_pwck_sort_missing_shadow_user/config.txt
similarity index 100%
rename from tests/tests/cktools/04_pwck_sort_missing_shadow_user/config.txt
rename to tests/cktools/04_pwck_sort_missing_shadow_user/config.txt
diff --git a/tests/tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/group b/tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/group
similarity index 100%
rename from tests/tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/group
rename to tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/group
diff --git a/tests/tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/gshadow b/tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/gshadow
rename to tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/gshadow
diff --git a/tests/tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/passwd b/tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/passwd
rename to tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/passwd
diff --git a/tests/tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/shadow b/tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/shadow
rename to tests/cktools/04_pwck_sort_missing_shadow_user/config/etc/shadow
diff --git a/tests/tests/cktools/04_pwck_sort_missing_shadow_user/data/passwd b/tests/cktools/04_pwck_sort_missing_shadow_user/data/passwd
similarity index 100%
rename from tests/tests/cktools/04_pwck_sort_missing_shadow_user/data/passwd
rename to tests/cktools/04_pwck_sort_missing_shadow_user/data/passwd
diff --git a/tests/tests/cktools/04_pwck_sort_missing_shadow_user/data/shadow b/tests/cktools/04_pwck_sort_missing_shadow_user/data/shadow
similarity index 100%
rename from tests/tests/cktools/04_pwck_sort_missing_shadow_user/data/shadow
rename to tests/cktools/04_pwck_sort_missing_shadow_user/data/shadow
diff --git a/tests/tests/cktools/04_pwck_sort_missing_shadow_user/pwck.test b/tests/cktools/04_pwck_sort_missing_shadow_user/pwck.test
similarity index 100%
rename from tests/tests/cktools/04_pwck_sort_missing_shadow_user/pwck.test
rename to tests/cktools/04_pwck_sort_missing_shadow_user/pwck.test
diff --git a/tests/tests/cktools/05_grpck_sort_missing_shadow_group/config.txt b/tests/cktools/05_grpck_sort_missing_shadow_group/config.txt
similarity index 100%
rename from tests/tests/cktools/05_grpck_sort_missing_shadow_group/config.txt
rename to tests/cktools/05_grpck_sort_missing_shadow_group/config.txt
diff --git a/tests/tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/group b/tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/group
rename to tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/group
diff --git a/tests/tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/gshadow b/tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/gshadow
rename to tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/gshadow
diff --git a/tests/tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/passwd b/tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/passwd
rename to tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/passwd
diff --git a/tests/tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/shadow b/tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/shadow
rename to tests/cktools/05_grpck_sort_missing_shadow_group/config/etc/shadow
diff --git a/tests/tests/cktools/05_grpck_sort_missing_shadow_group/data/group b/tests/cktools/05_grpck_sort_missing_shadow_group/data/group
similarity index 100%
rename from tests/tests/cktools/05_grpck_sort_missing_shadow_group/data/group
rename to tests/cktools/05_grpck_sort_missing_shadow_group/data/group
diff --git a/tests/tests/cktools/05_grpck_sort_missing_shadow_group/data/gshadow b/tests/cktools/05_grpck_sort_missing_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/cktools/05_grpck_sort_missing_shadow_group/data/gshadow
rename to tests/cktools/05_grpck_sort_missing_shadow_group/data/gshadow
diff --git a/tests/tests/cktools/05_grpck_sort_missing_shadow_group/grpck.test b/tests/cktools/05_grpck_sort_missing_shadow_group/grpck.test
similarity index 100%
rename from tests/tests/cktools/05_grpck_sort_missing_shadow_group/grpck.test
rename to tests/cktools/05_grpck_sort_missing_shadow_group/grpck.test
diff --git a/tests/tests/cktools/06_pwck_sort_NIS_server/config.txt b/tests/cktools/06_pwck_sort_NIS_server/config.txt
similarity index 100%
rename from tests/tests/cktools/06_pwck_sort_NIS_server/config.txt
rename to tests/cktools/06_pwck_sort_NIS_server/config.txt
diff --git a/tests/tests/cktools/06_pwck_sort_NIS_server/config/etc/group b/tests/cktools/06_pwck_sort_NIS_server/config/etc/group
similarity index 100%
rename from tests/tests/cktools/06_pwck_sort_NIS_server/config/etc/group
rename to tests/cktools/06_pwck_sort_NIS_server/config/etc/group
diff --git a/tests/tests/cktools/06_pwck_sort_NIS_server/config/etc/gshadow b/tests/cktools/06_pwck_sort_NIS_server/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/06_pwck_sort_NIS_server/config/etc/gshadow
rename to tests/cktools/06_pwck_sort_NIS_server/config/etc/gshadow
diff --git a/tests/tests/cktools/06_pwck_sort_NIS_server/config/etc/passwd b/tests/cktools/06_pwck_sort_NIS_server/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/06_pwck_sort_NIS_server/config/etc/passwd
rename to tests/cktools/06_pwck_sort_NIS_server/config/etc/passwd
diff --git a/tests/tests/cktools/06_pwck_sort_NIS_server/config/etc/shadow b/tests/cktools/06_pwck_sort_NIS_server/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/06_pwck_sort_NIS_server/config/etc/shadow
rename to tests/cktools/06_pwck_sort_NIS_server/config/etc/shadow
diff --git a/tests/tests/cktools/06_pwck_sort_NIS_server/data/passwd b/tests/cktools/06_pwck_sort_NIS_server/data/passwd
similarity index 100%
rename from tests/tests/cktools/06_pwck_sort_NIS_server/data/passwd
rename to tests/cktools/06_pwck_sort_NIS_server/data/passwd
diff --git a/tests/tests/cktools/06_pwck_sort_NIS_server/data/shadow b/tests/cktools/06_pwck_sort_NIS_server/data/shadow
similarity index 100%
rename from tests/tests/cktools/06_pwck_sort_NIS_server/data/shadow
rename to tests/cktools/06_pwck_sort_NIS_server/data/shadow
diff --git a/tests/tests/cktools/06_pwck_sort_NIS_server/pwck.test b/tests/cktools/06_pwck_sort_NIS_server/pwck.test
similarity index 100%
rename from tests/tests/cktools/06_pwck_sort_NIS_server/pwck.test
rename to tests/cktools/06_pwck_sort_NIS_server/pwck.test
diff --git a/tests/tests/cktools/07_pwck_sort_NIS_client/config.txt b/tests/cktools/07_pwck_sort_NIS_client/config.txt
similarity index 100%
rename from tests/tests/cktools/07_pwck_sort_NIS_client/config.txt
rename to tests/cktools/07_pwck_sort_NIS_client/config.txt
diff --git a/tests/tests/cktools/07_pwck_sort_NIS_client/config/etc/group b/tests/cktools/07_pwck_sort_NIS_client/config/etc/group
similarity index 100%
rename from tests/tests/cktools/07_pwck_sort_NIS_client/config/etc/group
rename to tests/cktools/07_pwck_sort_NIS_client/config/etc/group
diff --git a/tests/tests/cktools/07_pwck_sort_NIS_client/config/etc/gshadow b/tests/cktools/07_pwck_sort_NIS_client/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/07_pwck_sort_NIS_client/config/etc/gshadow
rename to tests/cktools/07_pwck_sort_NIS_client/config/etc/gshadow
diff --git a/tests/tests/cktools/07_pwck_sort_NIS_client/config/etc/passwd b/tests/cktools/07_pwck_sort_NIS_client/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/07_pwck_sort_NIS_client/config/etc/passwd
rename to tests/cktools/07_pwck_sort_NIS_client/config/etc/passwd
diff --git a/tests/tests/cktools/07_pwck_sort_NIS_client/config/etc/shadow b/tests/cktools/07_pwck_sort_NIS_client/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/07_pwck_sort_NIS_client/config/etc/shadow
rename to tests/cktools/07_pwck_sort_NIS_client/config/etc/shadow
diff --git a/tests/tests/cktools/07_pwck_sort_NIS_client/data/passwd b/tests/cktools/07_pwck_sort_NIS_client/data/passwd
similarity index 100%
rename from tests/tests/cktools/07_pwck_sort_NIS_client/data/passwd
rename to tests/cktools/07_pwck_sort_NIS_client/data/passwd
diff --git a/tests/tests/cktools/07_pwck_sort_NIS_client/data/shadow b/tests/cktools/07_pwck_sort_NIS_client/data/shadow
similarity index 100%
rename from tests/tests/cktools/07_pwck_sort_NIS_client/data/shadow
rename to tests/cktools/07_pwck_sort_NIS_client/data/shadow
diff --git a/tests/tests/cktools/07_pwck_sort_NIS_client/pwck.test b/tests/cktools/07_pwck_sort_NIS_client/pwck.test
similarity index 100%
rename from tests/tests/cktools/07_pwck_sort_NIS_client/pwck.test
rename to tests/cktools/07_pwck_sort_NIS_client/pwck.test
diff --git a/tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/config.txt b/tests/cktools/grpck/04_grpck_missing_field_group_delete/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/config.txt
rename to tests/cktools/grpck/04_grpck_missing_field_group_delete/config.txt
diff --git a/tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/group b/tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/group
rename to tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/group
diff --git a/tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/gshadow b/tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/gshadow
rename to tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/passwd b/tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/passwd
rename to tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/shadow b/tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/shadow
rename to tests/cktools/grpck/04_grpck_missing_field_group_delete/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/group b/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/group
similarity index 100%
rename from tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/group
rename to tests/cktools/grpck/04_grpck_missing_field_group_delete/data/group
diff --git a/tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/gshadow b/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/gshadow
rename to tests/cktools/grpck/04_grpck_missing_field_group_delete/data/gshadow
diff --git a/tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.exp b/tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.exp
rename to tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.exp
diff --git a/tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.test b/tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.test
rename to tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.test
diff --git a/tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/config.txt b/tests/cktools/grpck/05_grpck_missing_field_group_keep/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/config.txt
rename to tests/cktools/grpck/05_grpck_missing_field_group_keep/config.txt
diff --git a/tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/group b/tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/group
rename to tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/group
diff --git a/tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/gshadow b/tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/gshadow
rename to tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/passwd b/tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/passwd
rename to tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/shadow b/tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/shadow
rename to tests/cktools/grpck/05_grpck_missing_field_group_keep/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/gshadow b/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/gshadow
rename to tests/cktools/grpck/05_grpck_missing_field_group_keep/data/gshadow
diff --git a/tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.exp b/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.exp
rename to tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.exp
diff --git a/tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.test b/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.test
rename to tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.test
diff --git a/tests/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config.txt b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config.txt
rename to tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config.txt
diff --git a/tests/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/group b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/group
rename to tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/group
diff --git a/tests/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/gshadow b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/gshadow
rename to tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/passwd b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/passwd
rename to tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/shadow b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/shadow
rename to tests/cktools/grpck/06_grpck_missing_field_group_no_changes/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.exp b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.exp
rename to tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.exp
diff --git a/tests/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.test b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.test
rename to tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.test
diff --git a/tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config.txt b/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config.txt
rename to tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config.txt
diff --git a/tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/group b/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/group
rename to tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/group
diff --git a/tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/gshadow b/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/gshadow
rename to tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/passwd b/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/passwd
rename to tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/shadow b/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/shadow
rename to tests/cktools/grpck/07_grpck_missing_field_gshadow_add/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/gshadow b/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/gshadow
rename to tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/gshadow
diff --git a/tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.exp b/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.exp
rename to tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.exp
diff --git a/tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.test b/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.test
rename to tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.test
diff --git a/tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config.txt b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config.txt
rename to tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config.txt
diff --git a/tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/group b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/group
rename to tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/group
diff --git a/tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/gshadow b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/gshadow
rename to tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/passwd b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/passwd
rename to tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/shadow b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/shadow
rename to tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/gshadow b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/gshadow
rename to tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/gshadow
diff --git a/tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.exp b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.exp
rename to tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.exp
diff --git a/tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.test b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.test
rename to tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.test
diff --git a/tests/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config.txt b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config.txt
rename to tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config.txt
diff --git a/tests/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/group b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/group
rename to tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/group
diff --git a/tests/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/gshadow b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/gshadow
rename to tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/passwd b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/passwd
rename to tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/shadow b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/shadow
rename to tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.exp b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.exp
rename to tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.exp
diff --git a/tests/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.test b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.test
rename to tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.test
diff --git a/tests/tests/cktools/grpck/10_grpck_missing_field_group_local/config.txt b/tests/cktools/grpck/10_grpck_missing_field_group_local/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/10_grpck_missing_field_group_local/config.txt
rename to tests/cktools/grpck/10_grpck_missing_field_group_local/config.txt
diff --git a/tests/tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/group b/tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/group
rename to tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/group
diff --git a/tests/tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/gshadow b/tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/gshadow
rename to tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/passwd b/tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/passwd
rename to tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/shadow b/tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/shadow
rename to tests/cktools/grpck/10_grpck_missing_field_group_local/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/10_grpck_missing_field_group_local/data/group b/tests/cktools/grpck/10_grpck_missing_field_group_local/data/group
similarity index 100%
rename from tests/tests/cktools/grpck/10_grpck_missing_field_group_local/data/group
rename to tests/cktools/grpck/10_grpck_missing_field_group_local/data/group
diff --git a/tests/tests/cktools/grpck/10_grpck_missing_field_group_local/data/gshadow b/tests/cktools/grpck/10_grpck_missing_field_group_local/data/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/10_grpck_missing_field_group_local/data/gshadow
rename to tests/cktools/grpck/10_grpck_missing_field_group_local/data/gshadow
diff --git a/tests/tests/cktools/grpck/10_grpck_missing_field_group_local/grpck.exp b/tests/cktools/grpck/10_grpck_missing_field_group_local/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/10_grpck_missing_field_group_local/grpck.exp
rename to tests/cktools/grpck/10_grpck_missing_field_group_local/grpck.exp
diff --git a/tests/tests/cktools/grpck/10_grpck_missing_field_group_local/grpck.test b/tests/cktools/grpck/10_grpck_missing_field_group_local/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/10_grpck_missing_field_group_local/grpck.test
rename to tests/cktools/grpck/10_grpck_missing_field_group_local/grpck.test
diff --git a/tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config.txt b/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config.txt
rename to tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config.txt
diff --git a/tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/group b/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/group
rename to tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/group
diff --git a/tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/gshadow b/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/gshadow
rename to tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/passwd b/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/passwd
rename to tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/shadow b/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/shadow
rename to tests/cktools/grpck/11_grpck_missing_field_gshadow_local/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/group b/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/group
similarity index 100%
rename from tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/group
rename to tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/group
diff --git a/tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/gshadow b/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/gshadow
rename to tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/gshadow
diff --git a/tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/shadow b/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/shadow
rename to tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/shadow
diff --git a/tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/grpck.exp b/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/grpck.exp
rename to tests/cktools/grpck/11_grpck_missing_field_gshadow_local/grpck.exp
diff --git a/tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/grpck.test b/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/grpck.test
rename to tests/cktools/grpck/11_grpck_missing_field_gshadow_local/grpck.test
diff --git a/tests/tests/cktools/grpck/12_grpck_unknown_user_group/config.txt b/tests/cktools/grpck/12_grpck_unknown_user_group/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/12_grpck_unknown_user_group/config.txt
rename to tests/cktools/grpck/12_grpck_unknown_user_group/config.txt
diff --git a/tests/tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/group b/tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/group
rename to tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/group
diff --git a/tests/tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/gshadow b/tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/gshadow
rename to tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/passwd b/tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/passwd
rename to tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/shadow b/tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/shadow
rename to tests/cktools/grpck/12_grpck_unknown_user_group/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/12_grpck_unknown_user_group/data/group b/tests/cktools/grpck/12_grpck_unknown_user_group/data/group
similarity index 100%
rename from tests/tests/cktools/grpck/12_grpck_unknown_user_group/data/group
rename to tests/cktools/grpck/12_grpck_unknown_user_group/data/group
diff --git a/tests/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.exp b/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.exp
rename to tests/cktools/grpck/12_grpck_unknown_user_group/grpck.exp
diff --git a/tests/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.test b/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.test
rename to tests/cktools/grpck/12_grpck_unknown_user_group/grpck.test
diff --git a/tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config.txt b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config.txt
rename to tests/cktools/grpck/13_grpck_unknown_user_gshadow/config.txt
diff --git a/tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/group b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/group
rename to tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/group
diff --git a/tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/gshadow b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/gshadow
rename to tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/passwd b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/passwd
rename to tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/shadow b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/shadow
rename to tests/cktools/grpck/13_grpck_unknown_user_gshadow/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/gshadow b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/gshadow
rename to tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/gshadow
diff --git a/tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.exp b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.exp
rename to tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.exp
diff --git a/tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.test b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.test
rename to tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.test
diff --git a/tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config.txt b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config.txt
rename to tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config.txt
diff --git a/tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/group b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/group
rename to tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/group
diff --git a/tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/gshadow b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/gshadow
rename to tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/passwd b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/passwd
rename to tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/shadow b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/shadow
rename to tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/gshadow b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/gshadow
rename to tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/gshadow
diff --git a/tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.exp b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.exp
rename to tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.exp
diff --git a/tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.test b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.test
rename to tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.test
diff --git a/tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config.txt b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config.txt
rename to tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config.txt
diff --git a/tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/group b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/group
rename to tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/group
diff --git a/tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/gshadow b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/gshadow
rename to tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/passwd b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/passwd
rename to tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/shadow b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/shadow
rename to tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/group b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/group
similarity index 100%
rename from tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/group
rename to tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/group
diff --git a/tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.exp b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.exp
rename to tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.exp
diff --git a/tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.test b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.test
rename to tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.test
diff --git a/tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/config.txt b/tests/cktools/grpck/16_grpck_duplicate_entry_group/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/config.txt
rename to tests/cktools/grpck/16_grpck_duplicate_entry_group/config.txt
diff --git a/tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/group b/tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/group
rename to tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/group
diff --git a/tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/gshadow b/tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/gshadow
rename to tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/passwd b/tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/passwd
rename to tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/shadow b/tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/shadow
rename to tests/cktools/grpck/16_grpck_duplicate_entry_group/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/group b/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/group
similarity index 100%
rename from tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/group
rename to tests/cktools/grpck/16_grpck_duplicate_entry_group/data/group
diff --git a/tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.exp b/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.exp
rename to tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.exp
diff --git a/tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.test b/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.test
rename to tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.test
diff --git a/tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config.txt b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config.txt
rename to tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config.txt
diff --git a/tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/group b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/group
rename to tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/group
diff --git a/tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/gshadow b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/gshadow
rename to tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/passwd b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/passwd
rename to tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/shadow b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/shadow
rename to tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/gshadow b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/gshadow
rename to tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/gshadow
diff --git a/tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.exp b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.exp
rename to tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.exp
diff --git a/tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.test b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.test
rename to tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.test
diff --git a/tests/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config.txt b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config.txt
rename to tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config.txt
diff --git a/tests/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/group b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/group
rename to tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/group
diff --git a/tests/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/gshadow b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/gshadow
rename to tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/passwd b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/passwd
rename to tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/shadow b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/shadow
rename to tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.exp b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.exp
rename to tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.exp
diff --git a/tests/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.test b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.test
rename to tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.test
diff --git a/tests/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config.txt b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config.txt
rename to tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config.txt
diff --git a/tests/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/group b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/group
rename to tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/group
diff --git a/tests/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/gshadow b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/gshadow
rename to tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/passwd b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/passwd
rename to tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/shadow b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/shadow
rename to tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.exp b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.exp
rename to tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.exp
diff --git a/tests/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.test b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.test
rename to tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.test
diff --git a/tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config.txt b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config.txt
rename to tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config.txt
diff --git a/tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/group b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/group
rename to tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/group
diff --git a/tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/gshadow b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/gshadow
rename to tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/passwd b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/passwd
rename to tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/shadow b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/shadow
rename to tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/gshadow b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/gshadow
rename to tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/gshadow
diff --git a/tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.exp b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.exp
rename to tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.exp
diff --git a/tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.test b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.test
rename to tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.test
diff --git a/tests/tests/cktools/grpck/21_grpck_invalid_group_name/config.txt b/tests/cktools/grpck/21_grpck_invalid_group_name/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/21_grpck_invalid_group_name/config.txt
rename to tests/cktools/grpck/21_grpck_invalid_group_name/config.txt
diff --git a/tests/tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/group b/tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/group
rename to tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/group
diff --git a/tests/tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/gshadow b/tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/gshadow
rename to tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/passwd b/tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/passwd
rename to tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/shadow b/tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/shadow
rename to tests/cktools/grpck/21_grpck_invalid_group_name/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.exp b/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.exp
rename to tests/cktools/grpck/21_grpck_invalid_group_name/grpck.exp
diff --git a/tests/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.test b/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.test
rename to tests/cktools/grpck/21_grpck_invalid_group_name/grpck.test
diff --git a/tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config.txt b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config.txt
rename to tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config.txt
diff --git a/tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/group b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/group
rename to tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/group
diff --git a/tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/gshadow b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/gshadow
rename to tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/passwd b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/passwd
rename to tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/shadow b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/shadow
rename to tests/cktools/grpck/22_grpck_invalid_group_ID_-1/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/group b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/group
similarity index 100%
rename from tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/group
rename to tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/group
diff --git a/tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/gshadow b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/gshadow
rename to tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/gshadow
diff --git a/tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.exp b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.exp
rename to tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.exp
diff --git a/tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.test b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.test
rename to tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.test
diff --git a/tests/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config.txt b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config.txt
rename to tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config.txt
diff --git a/tests/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/group b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/group
rename to tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/group
diff --git a/tests/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/gshadow b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/gshadow
rename to tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/passwd b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/passwd
rename to tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/shadow b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/shadow
rename to tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.exp b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.exp
rename to tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.exp
diff --git a/tests/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.test b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.test
rename to tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.test
diff --git a/tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config.txt b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config.txt
rename to tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config.txt
diff --git a/tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/group b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/group
rename to tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/group
diff --git a/tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/gshadow b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/gshadow
rename to tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/passwd b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/passwd
rename to tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/shadow b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/shadow
rename to tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/group b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/group
similarity index 100%
rename from tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/group
rename to tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/group
diff --git a/tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/gshadow b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/gshadow
rename to tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/gshadow
diff --git a/tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.exp b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.exp
rename to tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.exp
diff --git a/tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.test b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.test
rename to tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.test
diff --git a/tests/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config.txt b/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config.txt
rename to tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config.txt
diff --git a/tests/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/group b/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/group
rename to tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/group
diff --git a/tests/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/gshadow b/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/gshadow
rename to tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/passwd b/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/passwd
rename to tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/shadow b/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/shadow
rename to tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/grpck.exp b/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/grpck.exp
rename to tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/grpck.exp
diff --git a/tests/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/grpck.test b/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/grpck.test
rename to tests/cktools/grpck/25_grpck_unknown_user_group_no_changes/grpck.test
diff --git a/tests/tests/cktools/grpck/26_grpck_no_gshadow_file/config.txt b/tests/cktools/grpck/26_grpck_no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/26_grpck_no_gshadow_file/config.txt
rename to tests/cktools/grpck/26_grpck_no_gshadow_file/config.txt
diff --git a/tests/tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/group b/tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/group
rename to tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/group
diff --git a/tests/tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/gshadow b/tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/gshadow
rename to tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/passwd b/tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/passwd
rename to tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/shadow b/tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/shadow
rename to tests/cktools/grpck/26_grpck_no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/26_grpck_no_gshadow_file/data/grpck.out b/tests/cktools/grpck/26_grpck_no_gshadow_file/data/grpck.out
similarity index 100%
rename from tests/tests/cktools/grpck/26_grpck_no_gshadow_file/data/grpck.out
rename to tests/cktools/grpck/26_grpck_no_gshadow_file/data/grpck.out
diff --git a/tests/tests/cktools/grpck/26_grpck_no_gshadow_file/grpck.test b/tests/cktools/grpck/26_grpck_no_gshadow_file/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/26_grpck_no_gshadow_file/grpck.test
rename to tests/cktools/grpck/26_grpck_no_gshadow_file/grpck.test
diff --git a/tests/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config.txt b/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config.txt
rename to tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config.txt
diff --git a/tests/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/group b/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/group
rename to tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/group
diff --git a/tests/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/gshadow b/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/gshadow
rename to tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/passwd b/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/passwd
rename to tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/shadow b/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/shadow
rename to tests/cktools/grpck/27_grpck_sort_no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/group b/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/group
rename to tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/group
diff --git a/tests/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/grpck.test b/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/grpck.test
rename to tests/cktools/grpck/27_grpck_sort_no_gshadow_file/grpck.test
diff --git a/tests/tests/cktools/grpck/28_grpck_usage/config.txt b/tests/cktools/grpck/28_grpck_usage/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/28_grpck_usage/config.txt
rename to tests/cktools/grpck/28_grpck_usage/config.txt
diff --git a/tests/tests/cktools/grpck/28_grpck_usage/config/etc/default/useradd b/tests/cktools/grpck/28_grpck_usage/config/etc/default/useradd
similarity index 100%
rename from tests/tests/cktools/grpck/28_grpck_usage/config/etc/default/useradd
rename to tests/cktools/grpck/28_grpck_usage/config/etc/default/useradd
diff --git a/tests/tests/cktools/grpck/28_grpck_usage/config/etc/group b/tests/cktools/grpck/28_grpck_usage/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/28_grpck_usage/config/etc/group
rename to tests/cktools/grpck/28_grpck_usage/config/etc/group
diff --git a/tests/tests/cktools/grpck/28_grpck_usage/config/etc/gshadow b/tests/cktools/grpck/28_grpck_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/28_grpck_usage/config/etc/gshadow
rename to tests/cktools/grpck/28_grpck_usage/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/28_grpck_usage/config/etc/passwd b/tests/cktools/grpck/28_grpck_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/28_grpck_usage/config/etc/passwd
rename to tests/cktools/grpck/28_grpck_usage/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/28_grpck_usage/config/etc/shadow b/tests/cktools/grpck/28_grpck_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/28_grpck_usage/config/etc/shadow
rename to tests/cktools/grpck/28_grpck_usage/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/28_grpck_usage/data/usage.out b/tests/cktools/grpck/28_grpck_usage/data/usage.out
similarity index 100%
rename from tests/tests/cktools/grpck/28_grpck_usage/data/usage.out
rename to tests/cktools/grpck/28_grpck_usage/data/usage.out
diff --git a/tests/tests/cktools/grpck/28_grpck_usage/grpck.test b/tests/cktools/grpck/28_grpck_usage/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/28_grpck_usage/grpck.test
rename to tests/cktools/grpck/28_grpck_usage/grpck.test
diff --git a/tests/tests/cktools/grpck/29_grpck_sort_readonly/config.txt b/tests/cktools/grpck/29_grpck_sort_readonly/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/29_grpck_sort_readonly/config.txt
rename to tests/cktools/grpck/29_grpck_sort_readonly/config.txt
diff --git a/tests/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/default/useradd b/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/default/useradd
similarity index 100%
rename from tests/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/default/useradd
rename to tests/cktools/grpck/29_grpck_sort_readonly/config/etc/default/useradd
diff --git a/tests/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/group b/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/group
rename to tests/cktools/grpck/29_grpck_sort_readonly/config/etc/group
diff --git a/tests/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/gshadow b/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/gshadow
rename to tests/cktools/grpck/29_grpck_sort_readonly/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/passwd b/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/passwd
rename to tests/cktools/grpck/29_grpck_sort_readonly/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/shadow b/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/29_grpck_sort_readonly/config/etc/shadow
rename to tests/cktools/grpck/29_grpck_sort_readonly/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/29_grpck_sort_readonly/data/usage.out b/tests/cktools/grpck/29_grpck_sort_readonly/data/usage.out
similarity index 100%
rename from tests/tests/cktools/grpck/29_grpck_sort_readonly/data/usage.out
rename to tests/cktools/grpck/29_grpck_sort_readonly/data/usage.out
diff --git a/tests/tests/cktools/grpck/29_grpck_sort_readonly/grpck.test b/tests/cktools/grpck/29_grpck_sort_readonly/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/29_grpck_sort_readonly/grpck.test
rename to tests/cktools/grpck/29_grpck_sort_readonly/grpck.test
diff --git a/tests/tests/cktools/grpck/30_grpck_3_files/config.txt b/tests/cktools/grpck/30_grpck_3_files/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/30_grpck_3_files/config.txt
rename to tests/cktools/grpck/30_grpck_3_files/config.txt
diff --git a/tests/tests/cktools/grpck/30_grpck_3_files/config/etc/default/useradd b/tests/cktools/grpck/30_grpck_3_files/config/etc/default/useradd
similarity index 100%
rename from tests/tests/cktools/grpck/30_grpck_3_files/config/etc/default/useradd
rename to tests/cktools/grpck/30_grpck_3_files/config/etc/default/useradd
diff --git a/tests/tests/cktools/grpck/30_grpck_3_files/config/etc/group b/tests/cktools/grpck/30_grpck_3_files/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/30_grpck_3_files/config/etc/group
rename to tests/cktools/grpck/30_grpck_3_files/config/etc/group
diff --git a/tests/tests/cktools/grpck/30_grpck_3_files/config/etc/gshadow b/tests/cktools/grpck/30_grpck_3_files/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/30_grpck_3_files/config/etc/gshadow
rename to tests/cktools/grpck/30_grpck_3_files/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/30_grpck_3_files/config/etc/passwd b/tests/cktools/grpck/30_grpck_3_files/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/30_grpck_3_files/config/etc/passwd
rename to tests/cktools/grpck/30_grpck_3_files/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/30_grpck_3_files/config/etc/shadow b/tests/cktools/grpck/30_grpck_3_files/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/30_grpck_3_files/config/etc/shadow
rename to tests/cktools/grpck/30_grpck_3_files/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/30_grpck_3_files/data/usage.out b/tests/cktools/grpck/30_grpck_3_files/data/usage.out
similarity index 100%
rename from tests/tests/cktools/grpck/30_grpck_3_files/data/usage.out
rename to tests/cktools/grpck/30_grpck_3_files/data/usage.out
diff --git a/tests/tests/cktools/grpck/30_grpck_3_files/grpck.test b/tests/cktools/grpck/30_grpck_3_files/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/30_grpck_3_files/grpck.test
rename to tests/cktools/grpck/30_grpck_3_files/grpck.test
diff --git a/tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config.txt b/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config.txt
rename to tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config.txt
diff --git a/tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/group b/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/group
rename to tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/group
diff --git a/tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/gshadow b/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/gshadow
rename to tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/passwd b/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/passwd
rename to tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/shadow b/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/shadow
rename to tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/data/group b/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/data/group
similarity index 100%
rename from tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/data/group
rename to tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/data/group
diff --git a/tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/grpck.exp b/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/grpck.exp
rename to tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/grpck.exp
diff --git a/tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/grpck.test b/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/grpck.test
rename to tests/cktools/grpck/31_grpck_missing_field_group_local_no_gshadow/grpck.test
diff --git a/tests/tests/cktools/grpck/32_grpck_sort_nis/config.txt b/tests/cktools/grpck/32_grpck_sort_nis/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/32_grpck_sort_nis/config.txt
rename to tests/cktools/grpck/32_grpck_sort_nis/config.txt
diff --git a/tests/tests/cktools/grpck/32_grpck_sort_nis/config/etc/group b/tests/cktools/grpck/32_grpck_sort_nis/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/32_grpck_sort_nis/config/etc/group
rename to tests/cktools/grpck/32_grpck_sort_nis/config/etc/group
diff --git a/tests/tests/cktools/grpck/32_grpck_sort_nis/config/etc/gshadow b/tests/cktools/grpck/32_grpck_sort_nis/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/32_grpck_sort_nis/config/etc/gshadow
rename to tests/cktools/grpck/32_grpck_sort_nis/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/32_grpck_sort_nis/config/etc/passwd b/tests/cktools/grpck/32_grpck_sort_nis/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/32_grpck_sort_nis/config/etc/passwd
rename to tests/cktools/grpck/32_grpck_sort_nis/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/32_grpck_sort_nis/config/etc/shadow b/tests/cktools/grpck/32_grpck_sort_nis/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/32_grpck_sort_nis/config/etc/shadow
rename to tests/cktools/grpck/32_grpck_sort_nis/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/32_grpck_sort_nis/data/group b/tests/cktools/grpck/32_grpck_sort_nis/data/group
similarity index 100%
rename from tests/tests/cktools/grpck/32_grpck_sort_nis/data/group
rename to tests/cktools/grpck/32_grpck_sort_nis/data/group
diff --git a/tests/tests/cktools/grpck/32_grpck_sort_nis/data/gshadow b/tests/cktools/grpck/32_grpck_sort_nis/data/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/32_grpck_sort_nis/data/gshadow
rename to tests/cktools/grpck/32_grpck_sort_nis/data/gshadow
diff --git a/tests/tests/cktools/grpck/32_grpck_sort_nis/grpck.test b/tests/cktools/grpck/32_grpck_sort_nis/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/32_grpck_sort_nis/grpck.test
rename to tests/cktools/grpck/32_grpck_sort_nis/grpck.test
diff --git a/tests/tests/cktools/grpck/33_grpck_locked_group/config.txt b/tests/cktools/grpck/33_grpck_locked_group/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/33_grpck_locked_group/config.txt
rename to tests/cktools/grpck/33_grpck_locked_group/config.txt
diff --git a/tests/tests/cktools/grpck/33_grpck_locked_group/config/etc/default/useradd b/tests/cktools/grpck/33_grpck_locked_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/cktools/grpck/33_grpck_locked_group/config/etc/default/useradd
rename to tests/cktools/grpck/33_grpck_locked_group/config/etc/default/useradd
diff --git a/tests/tests/cktools/grpck/33_grpck_locked_group/config/etc/group b/tests/cktools/grpck/33_grpck_locked_group/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/33_grpck_locked_group/config/etc/group
rename to tests/cktools/grpck/33_grpck_locked_group/config/etc/group
diff --git a/tests/tests/cktools/grpck/33_grpck_locked_group/config/etc/gshadow b/tests/cktools/grpck/33_grpck_locked_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/33_grpck_locked_group/config/etc/gshadow
rename to tests/cktools/grpck/33_grpck_locked_group/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/33_grpck_locked_group/config/etc/passwd b/tests/cktools/grpck/33_grpck_locked_group/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/33_grpck_locked_group/config/etc/passwd
rename to tests/cktools/grpck/33_grpck_locked_group/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/33_grpck_locked_group/config/etc/shadow b/tests/cktools/grpck/33_grpck_locked_group/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/33_grpck_locked_group/config/etc/shadow
rename to tests/cktools/grpck/33_grpck_locked_group/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/33_grpck_locked_group/data/grpck.err b/tests/cktools/grpck/33_grpck_locked_group/data/grpck.err
similarity index 100%
rename from tests/tests/cktools/grpck/33_grpck_locked_group/data/grpck.err
rename to tests/cktools/grpck/33_grpck_locked_group/data/grpck.err
diff --git a/tests/tests/cktools/grpck/33_grpck_locked_group/grpck.test b/tests/cktools/grpck/33_grpck_locked_group/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/33_grpck_locked_group/grpck.test
rename to tests/cktools/grpck/33_grpck_locked_group/grpck.test
diff --git a/tests/tests/cktools/grpck/34_grpck_locked_gshadow/config.txt b/tests/cktools/grpck/34_grpck_locked_gshadow/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/34_grpck_locked_gshadow/config.txt
rename to tests/cktools/grpck/34_grpck_locked_gshadow/config.txt
diff --git a/tests/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/default/useradd b/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/default/useradd
rename to tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/default/useradd
diff --git a/tests/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/group b/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/group
rename to tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/group
diff --git a/tests/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/gshadow b/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/gshadow
rename to tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/passwd b/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/passwd
rename to tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/shadow b/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/shadow
rename to tests/cktools/grpck/34_grpck_locked_gshadow/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/34_grpck_locked_gshadow/data/grpck.err b/tests/cktools/grpck/34_grpck_locked_gshadow/data/grpck.err
similarity index 100%
rename from tests/tests/cktools/grpck/34_grpck_locked_gshadow/data/grpck.err
rename to tests/cktools/grpck/34_grpck_locked_gshadow/data/grpck.err
diff --git a/tests/tests/cktools/grpck/34_grpck_locked_gshadow/grpck.test b/tests/cktools/grpck/34_grpck_locked_gshadow/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/34_grpck_locked_gshadow/grpck.test
rename to tests/cktools/grpck/34_grpck_locked_gshadow/grpck.test
diff --git a/tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config.txt b/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config.txt
rename to tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config.txt
diff --git a/tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/group b/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/group
rename to tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/group
diff --git a/tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/gshadow b/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/gshadow
rename to tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/passwd b/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/passwd
rename to tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/shadow b/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/shadow
rename to tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/group b/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/group
similarity index 100%
rename from tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/group
rename to tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/group
diff --git a/tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.exp b/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.exp
similarity index 100%
rename from tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.exp
rename to tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.exp
diff --git a/tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.test b/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.test
rename to tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.test
diff --git a/tests/tests/cktools/grpck/36_grpck_password_group_gshadow/config.txt b/tests/cktools/grpck/36_grpck_password_group_gshadow/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/36_grpck_password_group_gshadow/config.txt
rename to tests/cktools/grpck/36_grpck_password_group_gshadow/config.txt
diff --git a/tests/tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/group b/tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/group
rename to tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/group
diff --git a/tests/tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/gshadow b/tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/gshadow
rename to tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/passwd b/tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/passwd
rename to tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/shadow b/tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/shadow
rename to tests/cktools/grpck/36_grpck_password_group_gshadow/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/36_grpck_password_group_gshadow/data/grpck.out b/tests/cktools/grpck/36_grpck_password_group_gshadow/data/grpck.out
similarity index 100%
rename from tests/tests/cktools/grpck/36_grpck_password_group_gshadow/data/grpck.out
rename to tests/cktools/grpck/36_grpck_password_group_gshadow/data/grpck.out
diff --git a/tests/tests/cktools/grpck/36_grpck_password_group_gshadow/grpck.test b/tests/cktools/grpck/36_grpck_password_group_gshadow/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/36_grpck_password_group_gshadow/grpck.test
rename to tests/cktools/grpck/36_grpck_password_group_gshadow/grpck.test
diff --git a/tests/tests/cktools/grpck/37_grpck_invalid_option/config.txt b/tests/cktools/grpck/37_grpck_invalid_option/config.txt
similarity index 100%
rename from tests/tests/cktools/grpck/37_grpck_invalid_option/config.txt
rename to tests/cktools/grpck/37_grpck_invalid_option/config.txt
diff --git a/tests/tests/cktools/grpck/37_grpck_invalid_option/config/etc/group b/tests/cktools/grpck/37_grpck_invalid_option/config/etc/group
similarity index 100%
rename from tests/tests/cktools/grpck/37_grpck_invalid_option/config/etc/group
rename to tests/cktools/grpck/37_grpck_invalid_option/config/etc/group
diff --git a/tests/tests/cktools/grpck/37_grpck_invalid_option/config/etc/gshadow b/tests/cktools/grpck/37_grpck_invalid_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/grpck/37_grpck_invalid_option/config/etc/gshadow
rename to tests/cktools/grpck/37_grpck_invalid_option/config/etc/gshadow
diff --git a/tests/tests/cktools/grpck/37_grpck_invalid_option/config/etc/passwd b/tests/cktools/grpck/37_grpck_invalid_option/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/grpck/37_grpck_invalid_option/config/etc/passwd
rename to tests/cktools/grpck/37_grpck_invalid_option/config/etc/passwd
diff --git a/tests/tests/cktools/grpck/37_grpck_invalid_option/config/etc/shadow b/tests/cktools/grpck/37_grpck_invalid_option/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/grpck/37_grpck_invalid_option/config/etc/shadow
rename to tests/cktools/grpck/37_grpck_invalid_option/config/etc/shadow
diff --git a/tests/tests/cktools/grpck/37_grpck_invalid_option/data/usage.out b/tests/cktools/grpck/37_grpck_invalid_option/data/usage.out
similarity index 100%
rename from tests/tests/cktools/grpck/37_grpck_invalid_option/data/usage.out
rename to tests/cktools/grpck/37_grpck_invalid_option/data/usage.out
diff --git a/tests/tests/cktools/grpck/37_grpck_invalid_option/grpck.test b/tests/cktools/grpck/37_grpck_invalid_option/grpck.test
similarity index 100%
rename from tests/tests/cktools/grpck/37_grpck_invalid_option/grpck.test
rename to tests/cktools/grpck/37_grpck_invalid_option/grpck.test
diff --git a/tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config.txt b/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config.txt
rename to tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config.txt
diff --git a/tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/group b/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/group
rename to tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/group
diff --git a/tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/gshadow b/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/gshadow
rename to tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/passwd b/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/passwd
rename to tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/shadow b/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/shadow
rename to tests/cktools/pwck/04_pwck_missing_field_passwd_delete/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/data/passwd b/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/data/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/data/passwd
rename to tests/cktools/pwck/04_pwck_missing_field_passwd_delete/data/passwd
diff --git a/tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/data/shadow b/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/data/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/data/shadow
rename to tests/cktools/pwck/04_pwck_missing_field_passwd_delete/data/shadow
diff --git a/tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/pwck.exp b/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/pwck.exp
rename to tests/cktools/pwck/04_pwck_missing_field_passwd_delete/pwck.exp
diff --git a/tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/pwck.test b/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/04_pwck_missing_field_passwd_delete/pwck.test
rename to tests/cktools/pwck/04_pwck_missing_field_passwd_delete/pwck.test
diff --git a/tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config.txt b/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config.txt
rename to tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config.txt
diff --git a/tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/group b/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/group
rename to tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/group
diff --git a/tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/gshadow b/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/gshadow
rename to tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/passwd b/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/passwd
rename to tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/shadow b/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/shadow
rename to tests/cktools/pwck/05_pwck_missing_field_passwd_keep/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/data/shadow b/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/data/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/data/shadow
rename to tests/cktools/pwck/05_pwck_missing_field_passwd_keep/data/shadow
diff --git a/tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.exp b/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.exp
rename to tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.exp
diff --git a/tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.test b/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.test
rename to tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.test
diff --git a/tests/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config.txt b/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config.txt
rename to tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config.txt
diff --git a/tests/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/group b/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/group
rename to tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/group
diff --git a/tests/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/gshadow b/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/gshadow
rename to tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/passwd b/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/passwd
rename to tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/shadow b/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/shadow
rename to tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/pwck.exp b/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/pwck.exp
rename to tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/pwck.exp
diff --git a/tests/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/pwck.test b/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/pwck.test
rename to tests/cktools/pwck/06_pwck_missing_field_passwd_no_changes/pwck.test
diff --git a/tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config.txt b/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config.txt
rename to tests/cktools/pwck/07_pwck_missing_field_shadow_add/config.txt
diff --git a/tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/group b/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/group
rename to tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/group
diff --git a/tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/gshadow b/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/gshadow
rename to tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/passwd b/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/passwd
rename to tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/shadow b/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/shadow
rename to tests/cktools/pwck/07_pwck_missing_field_shadow_add/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/data/shadow b/tests/cktools/pwck/07_pwck_missing_field_shadow_add/data/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/data/shadow
rename to tests/cktools/pwck/07_pwck_missing_field_shadow_add/data/shadow
diff --git a/tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.exp b/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.exp
rename to tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.exp
diff --git a/tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.test b/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.test
rename to tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.test
diff --git a/tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config.txt b/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config.txt
rename to tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config.txt
diff --git a/tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/group b/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/group
rename to tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/group
diff --git a/tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/gshadow b/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/gshadow
rename to tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/passwd b/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/passwd
rename to tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/shadow b/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/shadow
rename to tests/cktools/pwck/08_pwck_missing_field_shadow_delete/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/data/shadow b/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/data/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/data/shadow
rename to tests/cktools/pwck/08_pwck_missing_field_shadow_delete/data/shadow
diff --git a/tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.exp b/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.exp
rename to tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.exp
diff --git a/tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.test b/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.test
rename to tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.test
diff --git a/tests/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config.txt b/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config.txt
rename to tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config.txt
diff --git a/tests/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/group b/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/group
rename to tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/group
diff --git a/tests/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/gshadow b/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/gshadow
rename to tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/passwd b/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/passwd
rename to tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/shadow b/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/shadow
rename to tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/pwck.exp b/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/pwck.exp
rename to tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/pwck.exp
diff --git a/tests/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/pwck.test b/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/pwck.test
rename to tests/cktools/pwck/09_pwck_missing_field_shadow_no_changes/pwck.test
diff --git a/tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config.txt b/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config.txt
rename to tests/cktools/pwck/10_pwck_missing_field_passwd_local/config.txt
diff --git a/tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/group b/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/group
rename to tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/group
diff --git a/tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/gshadow b/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/gshadow
rename to tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/passwd b/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/passwd
rename to tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/shadow b/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/shadow
rename to tests/cktools/pwck/10_pwck_missing_field_passwd_local/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/data/passwd b/tests/cktools/pwck/10_pwck_missing_field_passwd_local/data/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/data/passwd
rename to tests/cktools/pwck/10_pwck_missing_field_passwd_local/data/passwd
diff --git a/tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/data/shadow b/tests/cktools/pwck/10_pwck_missing_field_passwd_local/data/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/data/shadow
rename to tests/cktools/pwck/10_pwck_missing_field_passwd_local/data/shadow
diff --git a/tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/pwck.exp b/tests/cktools/pwck/10_pwck_missing_field_passwd_local/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/pwck.exp
rename to tests/cktools/pwck/10_pwck_missing_field_passwd_local/pwck.exp
diff --git a/tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/pwck.test b/tests/cktools/pwck/10_pwck_missing_field_passwd_local/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/10_pwck_missing_field_passwd_local/pwck.test
rename to tests/cktools/pwck/10_pwck_missing_field_passwd_local/pwck.test
diff --git a/tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config.txt b/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config.txt
rename to tests/cktools/pwck/11_pwck_missing_field_shadow_local/config.txt
diff --git a/tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/group b/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/group
rename to tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/group
diff --git a/tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/gshadow b/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/gshadow
rename to tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/passwd b/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/passwd
rename to tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/shadow b/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/shadow
rename to tests/cktools/pwck/11_pwck_missing_field_shadow_local/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/data/passwd b/tests/cktools/pwck/11_pwck_missing_field_shadow_local/data/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/data/passwd
rename to tests/cktools/pwck/11_pwck_missing_field_shadow_local/data/passwd
diff --git a/tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/data/shadow b/tests/cktools/pwck/11_pwck_missing_field_shadow_local/data/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/data/shadow
rename to tests/cktools/pwck/11_pwck_missing_field_shadow_local/data/shadow
diff --git a/tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/pwck.exp b/tests/cktools/pwck/11_pwck_missing_field_shadow_local/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/pwck.exp
rename to tests/cktools/pwck/11_pwck_missing_field_shadow_local/pwck.exp
diff --git a/tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/pwck.test b/tests/cktools/pwck/11_pwck_missing_field_shadow_local/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/11_pwck_missing_field_shadow_local/pwck.test
rename to tests/cktools/pwck/11_pwck_missing_field_shadow_local/pwck.test
diff --git a/tests/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config.txt b/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config.txt
rename to tests/cktools/pwck/12_pwck_unknown_user_group_ID/config.txt
diff --git a/tests/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/group b/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/group
rename to tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/group
diff --git a/tests/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/gshadow b/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/gshadow
rename to tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/passwd b/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/passwd
rename to tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/shadow b/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/shadow
rename to tests/cktools/pwck/12_pwck_unknown_user_group_ID/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/12_pwck_unknown_user_group_ID/pwck.exp b/tests/cktools/pwck/12_pwck_unknown_user_group_ID/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/12_pwck_unknown_user_group_ID/pwck.exp
rename to tests/cktools/pwck/12_pwck_unknown_user_group_ID/pwck.exp
diff --git a/tests/tests/cktools/pwck/12_pwck_unknown_user_group_ID/pwck.test b/tests/cktools/pwck/12_pwck_unknown_user_group_ID/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/12_pwck_unknown_user_group_ID/pwck.test
rename to tests/cktools/pwck/12_pwck_unknown_user_group_ID/pwck.test
diff --git a/tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config.txt b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config.txt
rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config.txt
diff --git a/tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/group b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/group
rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/group
diff --git a/tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/gshadow b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/gshadow
rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/passwd b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/passwd
rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/shadow b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/shadow
rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/data/passwd b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/data/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/data/passwd
rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/data/passwd
diff --git a/tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.exp b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.exp
rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.exp
diff --git a/tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.test b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.test
rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.test
diff --git a/tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config.txt b/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config.txt
rename to tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config.txt
diff --git a/tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/group b/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/group
rename to tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/group
diff --git a/tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/gshadow b/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/gshadow
rename to tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/passwd b/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/passwd
rename to tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/shadow b/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/shadow
rename to tests/cktools/pwck/14_pwck_duplicate_entry_shadow/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/data/shadow b/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/data/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/data/shadow
rename to tests/cktools/pwck/14_pwck_duplicate_entry_shadow/data/shadow
diff --git a/tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.exp b/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.exp
rename to tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.exp
diff --git a/tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.test b/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.test
rename to tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.test
diff --git a/tests/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config.txt b/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config.txt
rename to tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config.txt
diff --git a/tests/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/group b/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/group
rename to tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/group
diff --git a/tests/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/gshadow b/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/gshadow
rename to tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/passwd b/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/passwd
rename to tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/shadow b/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/shadow
rename to tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/pwck.exp b/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/pwck.exp
rename to tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/pwck.exp
diff --git a/tests/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/pwck.test b/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/pwck.test
rename to tests/cktools/pwck/15_pwck_duplicate_entry_passwd_no_changes/pwck.test
diff --git a/tests/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config.txt b/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config.txt
rename to tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config.txt
diff --git a/tests/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/group b/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/group
rename to tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/group
diff --git a/tests/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/gshadow b/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/gshadow
rename to tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/passwd b/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/passwd
rename to tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/shadow b/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/shadow
rename to tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/pwck.exp b/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/pwck.exp
rename to tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/pwck.exp
diff --git a/tests/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/pwck.test b/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/pwck.test
rename to tests/cktools/pwck/16_pwck_duplicate_entry_shadow_no_changes/pwck.test
diff --git a/tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config.txt b/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config.txt
rename to tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config.txt
diff --git a/tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/group b/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/group
rename to tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/group
diff --git a/tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/gshadow b/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/gshadow
rename to tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/passwd b/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/passwd
rename to tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/shadow b/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/shadow
rename to tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/data/passwd b/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/data/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/data/passwd
rename to tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/data/passwd
diff --git a/tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.exp b/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.exp
rename to tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.exp
diff --git a/tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.test b/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.test
rename to tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.test
diff --git a/tests/tests/cktools/pwck/18_pwck_invalid_user_name/config.txt b/tests/cktools/pwck/18_pwck_invalid_user_name/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/18_pwck_invalid_user_name/config.txt
rename to tests/cktools/pwck/18_pwck_invalid_user_name/config.txt
diff --git a/tests/tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/group b/tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/group
rename to tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/group
diff --git a/tests/tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/gshadow b/tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/gshadow
rename to tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/passwd b/tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/passwd
rename to tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/shadow b/tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/shadow
rename to tests/cktools/pwck/18_pwck_invalid_user_name/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/18_pwck_invalid_user_name/pwck.exp b/tests/cktools/pwck/18_pwck_invalid_user_name/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/18_pwck_invalid_user_name/pwck.exp
rename to tests/cktools/pwck/18_pwck_invalid_user_name/pwck.exp
diff --git a/tests/tests/cktools/pwck/18_pwck_invalid_user_name/pwck.test b/tests/cktools/pwck/18_pwck_invalid_user_name/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/18_pwck_invalid_user_name/pwck.test
rename to tests/cktools/pwck/18_pwck_invalid_user_name/pwck.test
diff --git a/tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config.txt b/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config.txt
rename to tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config.txt
diff --git a/tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/group b/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/group
rename to tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/group
diff --git a/tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/gshadow b/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/gshadow
rename to tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/passwd b/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/passwd
rename to tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/shadow b/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/shadow
rename to tests/cktools/pwck/19_pwck_invalid_user_ID_-1/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/data/passwd b/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/data/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/data/passwd
rename to tests/cktools/pwck/19_pwck_invalid_user_ID_-1/data/passwd
diff --git a/tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/data/shadow b/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/data/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/data/shadow
rename to tests/cktools/pwck/19_pwck_invalid_user_ID_-1/data/shadow
diff --git a/tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/pwck.exp b/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/pwck.exp
rename to tests/cktools/pwck/19_pwck_invalid_user_ID_-1/pwck.exp
diff --git a/tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/pwck.test b/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/19_pwck_invalid_user_ID_-1/pwck.test
rename to tests/cktools/pwck/19_pwck_invalid_user_ID_-1/pwck.test
diff --git a/tests/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config.txt b/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config.txt
rename to tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config.txt
diff --git a/tests/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/group b/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/group
rename to tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/group
diff --git a/tests/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/gshadow b/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/gshadow
rename to tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/passwd b/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/passwd
rename to tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/shadow b/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/shadow
rename to tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/pwck.exp b/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/pwck.exp
rename to tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/pwck.exp
diff --git a/tests/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/pwck.test b/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/pwck.test
rename to tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/pwck.test
diff --git a/tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config.txt b/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config.txt
rename to tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config.txt
diff --git a/tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/group b/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/group
rename to tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/group
diff --git a/tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/gshadow b/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/gshadow
rename to tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/passwd b/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/passwd
rename to tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/shadow b/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/shadow
rename to tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/data/passwd b/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/data/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/data/passwd
rename to tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/data/passwd
diff --git a/tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/data/shadow b/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/data/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/data/shadow
rename to tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/data/shadow
diff --git a/tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/pwck.exp b/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/pwck.exp
similarity index 100%
rename from tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/pwck.exp
rename to tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/pwck.exp
diff --git a/tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/pwck.test b/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/pwck.test
rename to tests/cktools/pwck/21_pwck_invalid_user_ID_4294967296/pwck.test
diff --git a/tests/tests/cktools/pwck/22_pwck_usage/config.txt b/tests/cktools/pwck/22_pwck_usage/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/22_pwck_usage/config.txt
rename to tests/cktools/pwck/22_pwck_usage/config.txt
diff --git a/tests/tests/cktools/pwck/22_pwck_usage/config/etc/group b/tests/cktools/pwck/22_pwck_usage/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/22_pwck_usage/config/etc/group
rename to tests/cktools/pwck/22_pwck_usage/config/etc/group
diff --git a/tests/tests/cktools/pwck/22_pwck_usage/config/etc/gshadow b/tests/cktools/pwck/22_pwck_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/22_pwck_usage/config/etc/gshadow
rename to tests/cktools/pwck/22_pwck_usage/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/22_pwck_usage/config/etc/passwd b/tests/cktools/pwck/22_pwck_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/22_pwck_usage/config/etc/passwd
rename to tests/cktools/pwck/22_pwck_usage/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/22_pwck_usage/config/etc/shadow b/tests/cktools/pwck/22_pwck_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/22_pwck_usage/config/etc/shadow
rename to tests/cktools/pwck/22_pwck_usage/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/22_pwck_usage/data/usage.out b/tests/cktools/pwck/22_pwck_usage/data/usage.out
similarity index 100%
rename from tests/tests/cktools/pwck/22_pwck_usage/data/usage.out
rename to tests/cktools/pwck/22_pwck_usage/data/usage.out
diff --git a/tests/tests/cktools/pwck/22_pwck_usage/pwck.test b/tests/cktools/pwck/22_pwck_usage/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/22_pwck_usage/pwck.test
rename to tests/cktools/pwck/22_pwck_usage/pwck.test
diff --git a/tests/tests/cktools/pwck/23_pwck_locked_passwd/config.txt b/tests/cktools/pwck/23_pwck_locked_passwd/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/23_pwck_locked_passwd/config.txt
rename to tests/cktools/pwck/23_pwck_locked_passwd/config.txt
diff --git a/tests/tests/cktools/pwck/23_pwck_locked_passwd/config/etc/group b/tests/cktools/pwck/23_pwck_locked_passwd/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/23_pwck_locked_passwd/config/etc/group
rename to tests/cktools/pwck/23_pwck_locked_passwd/config/etc/group
diff --git a/tests/tests/cktools/pwck/23_pwck_locked_passwd/config/etc/gshadow b/tests/cktools/pwck/23_pwck_locked_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/23_pwck_locked_passwd/config/etc/gshadow
rename to tests/cktools/pwck/23_pwck_locked_passwd/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/23_pwck_locked_passwd/config/etc/passwd b/tests/cktools/pwck/23_pwck_locked_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/23_pwck_locked_passwd/config/etc/passwd
rename to tests/cktools/pwck/23_pwck_locked_passwd/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/23_pwck_locked_passwd/config/etc/shadow b/tests/cktools/pwck/23_pwck_locked_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/23_pwck_locked_passwd/config/etc/shadow
rename to tests/cktools/pwck/23_pwck_locked_passwd/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/23_pwck_locked_passwd/data/pwck.err b/tests/cktools/pwck/23_pwck_locked_passwd/data/pwck.err
similarity index 100%
rename from tests/tests/cktools/pwck/23_pwck_locked_passwd/data/pwck.err
rename to tests/cktools/pwck/23_pwck_locked_passwd/data/pwck.err
diff --git a/tests/tests/cktools/pwck/23_pwck_locked_passwd/pwck.test b/tests/cktools/pwck/23_pwck_locked_passwd/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/23_pwck_locked_passwd/pwck.test
rename to tests/cktools/pwck/23_pwck_locked_passwd/pwck.test
diff --git a/tests/tests/cktools/pwck/24_pwck_locked_shadow/config.txt b/tests/cktools/pwck/24_pwck_locked_shadow/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/24_pwck_locked_shadow/config.txt
rename to tests/cktools/pwck/24_pwck_locked_shadow/config.txt
diff --git a/tests/tests/cktools/pwck/24_pwck_locked_shadow/config/etc/group b/tests/cktools/pwck/24_pwck_locked_shadow/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/24_pwck_locked_shadow/config/etc/group
rename to tests/cktools/pwck/24_pwck_locked_shadow/config/etc/group
diff --git a/tests/tests/cktools/pwck/24_pwck_locked_shadow/config/etc/gshadow b/tests/cktools/pwck/24_pwck_locked_shadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/24_pwck_locked_shadow/config/etc/gshadow
rename to tests/cktools/pwck/24_pwck_locked_shadow/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/24_pwck_locked_shadow/config/etc/passwd b/tests/cktools/pwck/24_pwck_locked_shadow/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/24_pwck_locked_shadow/config/etc/passwd
rename to tests/cktools/pwck/24_pwck_locked_shadow/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/24_pwck_locked_shadow/config/etc/shadow b/tests/cktools/pwck/24_pwck_locked_shadow/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/24_pwck_locked_shadow/config/etc/shadow
rename to tests/cktools/pwck/24_pwck_locked_shadow/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/24_pwck_locked_shadow/data/pwck.err b/tests/cktools/pwck/24_pwck_locked_shadow/data/pwck.err
similarity index 100%
rename from tests/tests/cktools/pwck/24_pwck_locked_shadow/data/pwck.err
rename to tests/cktools/pwck/24_pwck_locked_shadow/data/pwck.err
diff --git a/tests/tests/cktools/pwck/24_pwck_locked_shadow/pwck.test b/tests/cktools/pwck/24_pwck_locked_shadow/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/24_pwck_locked_shadow/pwck.test
rename to tests/cktools/pwck/24_pwck_locked_shadow/pwck.test
diff --git a/tests/tests/cktools/pwck/25_pwck_usage_invalid_option/config.txt b/tests/cktools/pwck/25_pwck_usage_invalid_option/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/25_pwck_usage_invalid_option/config.txt
rename to tests/cktools/pwck/25_pwck_usage_invalid_option/config.txt
diff --git a/tests/tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/group b/tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/group
rename to tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/group
diff --git a/tests/tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/gshadow b/tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/gshadow
rename to tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/passwd b/tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/passwd
rename to tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/shadow b/tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/shadow
rename to tests/cktools/pwck/25_pwck_usage_invalid_option/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/25_pwck_usage_invalid_option/data/pwck.err b/tests/cktools/pwck/25_pwck_usage_invalid_option/data/pwck.err
similarity index 100%
rename from tests/tests/cktools/pwck/25_pwck_usage_invalid_option/data/pwck.err
rename to tests/cktools/pwck/25_pwck_usage_invalid_option/data/pwck.err
diff --git a/tests/tests/cktools/pwck/25_pwck_usage_invalid_option/pwck.test b/tests/cktools/pwck/25_pwck_usage_invalid_option/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/25_pwck_usage_invalid_option/pwck.test
rename to tests/cktools/pwck/25_pwck_usage_invalid_option/pwck.test
diff --git a/tests/tests/cktools/pwck/26_pwck_usage-s-r/config.txt b/tests/cktools/pwck/26_pwck_usage-s-r/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/26_pwck_usage-s-r/config.txt
rename to tests/cktools/pwck/26_pwck_usage-s-r/config.txt
diff --git a/tests/tests/cktools/pwck/26_pwck_usage-s-r/config/etc/group b/tests/cktools/pwck/26_pwck_usage-s-r/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/26_pwck_usage-s-r/config/etc/group
rename to tests/cktools/pwck/26_pwck_usage-s-r/config/etc/group
diff --git a/tests/tests/cktools/pwck/26_pwck_usage-s-r/config/etc/gshadow b/tests/cktools/pwck/26_pwck_usage-s-r/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/26_pwck_usage-s-r/config/etc/gshadow
rename to tests/cktools/pwck/26_pwck_usage-s-r/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/26_pwck_usage-s-r/config/etc/passwd b/tests/cktools/pwck/26_pwck_usage-s-r/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/26_pwck_usage-s-r/config/etc/passwd
rename to tests/cktools/pwck/26_pwck_usage-s-r/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/26_pwck_usage-s-r/config/etc/shadow b/tests/cktools/pwck/26_pwck_usage-s-r/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/26_pwck_usage-s-r/config/etc/shadow
rename to tests/cktools/pwck/26_pwck_usage-s-r/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/26_pwck_usage-s-r/data/pwck.err b/tests/cktools/pwck/26_pwck_usage-s-r/data/pwck.err
similarity index 100%
rename from tests/tests/cktools/pwck/26_pwck_usage-s-r/data/pwck.err
rename to tests/cktools/pwck/26_pwck_usage-s-r/data/pwck.err
diff --git a/tests/tests/cktools/pwck/26_pwck_usage-s-r/pwck.test b/tests/cktools/pwck/26_pwck_usage-s-r/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/26_pwck_usage-s-r/pwck.test
rename to tests/cktools/pwck/26_pwck_usage-s-r/pwck.test
diff --git a/tests/tests/cktools/pwck/27_pwck_usage_3_files/config.txt b/tests/cktools/pwck/27_pwck_usage_3_files/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/27_pwck_usage_3_files/config.txt
rename to tests/cktools/pwck/27_pwck_usage_3_files/config.txt
diff --git a/tests/tests/cktools/pwck/27_pwck_usage_3_files/config/etc/group b/tests/cktools/pwck/27_pwck_usage_3_files/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/27_pwck_usage_3_files/config/etc/group
rename to tests/cktools/pwck/27_pwck_usage_3_files/config/etc/group
diff --git a/tests/tests/cktools/pwck/27_pwck_usage_3_files/config/etc/gshadow b/tests/cktools/pwck/27_pwck_usage_3_files/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/27_pwck_usage_3_files/config/etc/gshadow
rename to tests/cktools/pwck/27_pwck_usage_3_files/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/27_pwck_usage_3_files/config/etc/passwd b/tests/cktools/pwck/27_pwck_usage_3_files/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/27_pwck_usage_3_files/config/etc/passwd
rename to tests/cktools/pwck/27_pwck_usage_3_files/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/27_pwck_usage_3_files/config/etc/shadow b/tests/cktools/pwck/27_pwck_usage_3_files/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/27_pwck_usage_3_files/config/etc/shadow
rename to tests/cktools/pwck/27_pwck_usage_3_files/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/27_pwck_usage_3_files/data/pwck.err b/tests/cktools/pwck/27_pwck_usage_3_files/data/pwck.err
similarity index 100%
rename from tests/tests/cktools/pwck/27_pwck_usage_3_files/data/pwck.err
rename to tests/cktools/pwck/27_pwck_usage_3_files/data/pwck.err
diff --git a/tests/tests/cktools/pwck/27_pwck_usage_3_files/pwck.test b/tests/cktools/pwck/27_pwck_usage_3_files/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/27_pwck_usage_3_files/pwck.test
rename to tests/cktools/pwck/27_pwck_usage_3_files/pwck.test
diff --git a/tests/tests/cktools/pwck/28_pwck_no_shadow_file/config.txt b/tests/cktools/pwck/28_pwck_no_shadow_file/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/28_pwck_no_shadow_file/config.txt
rename to tests/cktools/pwck/28_pwck_no_shadow_file/config.txt
diff --git a/tests/tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/group b/tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/group
rename to tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/group
diff --git a/tests/tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/gshadow b/tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/gshadow
rename to tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/passwd b/tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/passwd
rename to tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/shadow b/tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/shadow
rename to tests/cktools/pwck/28_pwck_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/28_pwck_no_shadow_file/data/pwck.out b/tests/cktools/pwck/28_pwck_no_shadow_file/data/pwck.out
similarity index 100%
rename from tests/tests/cktools/pwck/28_pwck_no_shadow_file/data/pwck.out
rename to tests/cktools/pwck/28_pwck_no_shadow_file/data/pwck.out
diff --git a/tests/tests/cktools/pwck/28_pwck_no_shadow_file/pwck.test b/tests/cktools/pwck/28_pwck_no_shadow_file/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/28_pwck_no_shadow_file/pwck.test
rename to tests/cktools/pwck/28_pwck_no_shadow_file/pwck.test
diff --git a/tests/tests/cktools/pwck/29_pwck_password_change_in_future/config.txt b/tests/cktools/pwck/29_pwck_password_change_in_future/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/29_pwck_password_change_in_future/config.txt
rename to tests/cktools/pwck/29_pwck_password_change_in_future/config.txt
diff --git a/tests/tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/group b/tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/group
rename to tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/group
diff --git a/tests/tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/gshadow b/tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/gshadow
rename to tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/passwd b/tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/passwd
rename to tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/shadow b/tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/shadow
rename to tests/cktools/pwck/29_pwck_password_change_in_future/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/29_pwck_password_change_in_future/data/pwck.out b/tests/cktools/pwck/29_pwck_password_change_in_future/data/pwck.out
similarity index 100%
rename from tests/tests/cktools/pwck/29_pwck_password_change_in_future/data/pwck.out
rename to tests/cktools/pwck/29_pwck_password_change_in_future/data/pwck.out
diff --git a/tests/tests/cktools/pwck/29_pwck_password_change_in_future/pwck.test b/tests/cktools/pwck/29_pwck_password_change_in_future/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/29_pwck_password_change_in_future/pwck.test
rename to tests/cktools/pwck/29_pwck_password_change_in_future/pwck.test
diff --git a/tests/tests/cktools/pwck/30_pwck_NIS_entries/config.txt b/tests/cktools/pwck/30_pwck_NIS_entries/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/30_pwck_NIS_entries/config.txt
rename to tests/cktools/pwck/30_pwck_NIS_entries/config.txt
diff --git a/tests/tests/cktools/pwck/30_pwck_NIS_entries/config/etc/group b/tests/cktools/pwck/30_pwck_NIS_entries/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/30_pwck_NIS_entries/config/etc/group
rename to tests/cktools/pwck/30_pwck_NIS_entries/config/etc/group
diff --git a/tests/tests/cktools/pwck/30_pwck_NIS_entries/config/etc/gshadow b/tests/cktools/pwck/30_pwck_NIS_entries/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/30_pwck_NIS_entries/config/etc/gshadow
rename to tests/cktools/pwck/30_pwck_NIS_entries/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/30_pwck_NIS_entries/config/etc/passwd b/tests/cktools/pwck/30_pwck_NIS_entries/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/30_pwck_NIS_entries/config/etc/passwd
rename to tests/cktools/pwck/30_pwck_NIS_entries/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/30_pwck_NIS_entries/config/etc/shadow b/tests/cktools/pwck/30_pwck_NIS_entries/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/30_pwck_NIS_entries/config/etc/shadow
rename to tests/cktools/pwck/30_pwck_NIS_entries/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/30_pwck_NIS_entries/data/pwck.out b/tests/cktools/pwck/30_pwck_NIS_entries/data/pwck.out
similarity index 100%
rename from tests/tests/cktools/pwck/30_pwck_NIS_entries/data/pwck.out
rename to tests/cktools/pwck/30_pwck_NIS_entries/data/pwck.out
diff --git a/tests/tests/cktools/pwck/30_pwck_NIS_entries/pwck.test b/tests/cktools/pwck/30_pwck_NIS_entries/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/30_pwck_NIS_entries/pwck.test
rename to tests/cktools/pwck/30_pwck_NIS_entries/pwck.test
diff --git a/tests/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config.txt b/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config.txt
rename to tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config.txt
diff --git a/tests/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/group b/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/group
rename to tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/group
diff --git a/tests/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/gshadow b/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/gshadow
rename to tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/passwd b/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/passwd
rename to tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/shadow b/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/shadow
rename to tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/data/pwck.out b/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/data/pwck.out
similarity index 100%
rename from tests/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/data/pwck.out
rename to tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/data/pwck.out
diff --git a/tests/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/pwck.test b/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/pwck.test
rename to tests/cktools/pwck/31_pwck_shadow_entry_passwd_no_x/pwck.test
diff --git a/tests/tests/cktools/pwck/32_pwck_quiet/config.txt b/tests/cktools/pwck/32_pwck_quiet/config.txt
similarity index 100%
rename from tests/tests/cktools/pwck/32_pwck_quiet/config.txt
rename to tests/cktools/pwck/32_pwck_quiet/config.txt
diff --git a/tests/tests/cktools/pwck/32_pwck_quiet/config/etc/group b/tests/cktools/pwck/32_pwck_quiet/config/etc/group
similarity index 100%
rename from tests/tests/cktools/pwck/32_pwck_quiet/config/etc/group
rename to tests/cktools/pwck/32_pwck_quiet/config/etc/group
diff --git a/tests/tests/cktools/pwck/32_pwck_quiet/config/etc/gshadow b/tests/cktools/pwck/32_pwck_quiet/config/etc/gshadow
similarity index 100%
rename from tests/tests/cktools/pwck/32_pwck_quiet/config/etc/gshadow
rename to tests/cktools/pwck/32_pwck_quiet/config/etc/gshadow
diff --git a/tests/tests/cktools/pwck/32_pwck_quiet/config/etc/passwd b/tests/cktools/pwck/32_pwck_quiet/config/etc/passwd
similarity index 100%
rename from tests/tests/cktools/pwck/32_pwck_quiet/config/etc/passwd
rename to tests/cktools/pwck/32_pwck_quiet/config/etc/passwd
diff --git a/tests/tests/cktools/pwck/32_pwck_quiet/config/etc/shadow b/tests/cktools/pwck/32_pwck_quiet/config/etc/shadow
similarity index 100%
rename from tests/tests/cktools/pwck/32_pwck_quiet/config/etc/shadow
rename to tests/cktools/pwck/32_pwck_quiet/config/etc/shadow
diff --git a/tests/tests/cktools/pwck/32_pwck_quiet/data/pwck.out b/tests/cktools/pwck/32_pwck_quiet/data/pwck.out
similarity index 100%
rename from tests/tests/cktools/pwck/32_pwck_quiet/data/pwck.out
rename to tests/cktools/pwck/32_pwck_quiet/data/pwck.out
diff --git a/tests/tests/cktools/pwck/32_pwck_quiet/pwck.test b/tests/cktools/pwck/32_pwck_quiet/pwck.test
similarity index 100%
rename from tests/tests/cktools/pwck/32_pwck_quiet/pwck.test
rename to tests/cktools/pwck/32_pwck_quiet/pwck.test
diff --git a/tests/tests/cleanup.sh b/tests/cleanup.sh
similarity index 100%
rename from tests/tests/cleanup.sh
rename to tests/cleanup.sh
diff --git a/tests/tests/common/Makefile b/tests/common/Makefile
similarity index 100%
rename from tests/tests/common/Makefile
rename to tests/common/Makefile
diff --git a/tests/tests/common/compare_file.pl b/tests/common/compare_file.pl
similarity index 100%
rename from tests/tests/common/compare_file.pl
rename to tests/common/compare_file.pl
diff --git a/tests/tests/common/config.sh b/tests/common/config.sh
similarity index 92%
rename from tests/tests/common/config.sh
rename to tests/common/config.sh
index a2f8df03..926cdae5 100644
--- a/tests/tests/common/config.sh
+++ b/tests/common/config.sh
@@ -2,14 +2,16 @@
 
 set -e
 
-build_path=$(pwd)
-while [ "${build_path}" != "/" -a ! -e "${build_path}/.git" ]; do
-	build_path=$(dirname ${build_path})
-done
-if [ ! -e "${build_path}/.git" ]; then
-	echo "Not inside git directory" 1>&2
-	exit 1
+if [ -n "${BUILD_BASE_DIR}" ]; then
+    build_path="${BUILD_BASE_DIR}"
+else
+    build_path=$(git rev-parse --show-toplevel)
 fi
+if [ -z "${build_path}" ]; then
+    echo "Failed to find build base path"
+    exit 1
+fi
+export build_path
 
 # Save the configuration files in tmp.
 save_config ()
diff --git a/tests/tests/common/config_chroot-i386.list b/tests/common/config_chroot-i386.list
similarity index 100%
rename from tests/tests/common/config_chroot-i386.list
rename to tests/common/config_chroot-i386.list
diff --git a/tests/tests/common/config_chroot-powerpc.list b/tests/common/config_chroot-powerpc.list
similarity index 100%
rename from tests/tests/common/config_chroot-powerpc.list
rename to tests/common/config_chroot-powerpc.list
diff --git a/tests/tests/common/fopen_failure.c b/tests/common/fopen_failure.c
similarity index 100%
rename from tests/tests/common/fopen_failure.c
rename to tests/common/fopen_failure.c
diff --git a/tests/tests/common/link_failure.c b/tests/common/link_failure.c
similarity index 100%
rename from tests/tests/common/link_failure.c
rename to tests/common/link_failure.c
diff --git a/tests/tests/common/log.sh b/tests/common/log.sh
similarity index 100%
rename from tests/tests/common/log.sh
rename to tests/common/log.sh
diff --git a/tests/tests/common/open_RDONLY_failure.c b/tests/common/open_RDONLY_failure.c
similarity index 100%
rename from tests/tests/common/open_RDONLY_failure.c
rename to tests/common/open_RDONLY_failure.c
diff --git a/tests/tests/common/open_RDWR_failure.c b/tests/common/open_RDWR_failure.c
similarity index 100%
rename from tests/tests/common/open_RDWR_failure.c
rename to tests/common/open_RDWR_failure.c
diff --git a/tests/tests/common/rename_failure.c b/tests/common/rename_failure.c
similarity index 100%
rename from tests/tests/common/rename_failure.c
rename to tests/common/rename_failure.c
diff --git a/tests/tests/common/rmdir_failure.c b/tests/common/rmdir_failure.c
similarity index 100%
rename from tests/tests/common/rmdir_failure.c
rename to tests/common/rmdir_failure.c
diff --git a/tests/tests/common/time_0.c b/tests/common/time_0.c
similarity index 100%
rename from tests/tests/common/time_0.c
rename to tests/common/time_0.c
diff --git a/tests/tests/common/time_past.c b/tests/common/time_past.c
similarity index 100%
rename from tests/tests/common/time_past.c
rename to tests/common/time_past.c
diff --git a/tests/tests/common/unlink_failure.c b/tests/common/unlink_failure.c
similarity index 100%
rename from tests/tests/common/unlink_failure.c
rename to tests/common/unlink_failure.c
diff --git a/tests/tests/common/unlinkat_failure.c b/tests/common/unlinkat_failure.c
similarity index 100%
rename from tests/tests/common/unlinkat_failure.c
rename to tests/common/unlinkat_failure.c
diff --git a/tests/tests/convtools/01/data/1/group b/tests/convtools/01/data/1/group
similarity index 100%
rename from tests/tests/convtools/01/data/1/group
rename to tests/convtools/01/data/1/group
diff --git a/tests/tests/convtools/01/data/1/passwd b/tests/convtools/01/data/1/passwd
similarity index 100%
rename from tests/tests/convtools/01/data/1/passwd
rename to tests/convtools/01/data/1/passwd
diff --git a/tests/tests/convtools/01/data/2/group b/tests/convtools/01/data/2/group
similarity index 100%
rename from tests/tests/convtools/01/data/2/group
rename to tests/convtools/01/data/2/group
diff --git a/tests/tests/convtools/01/data/2/gshadow b/tests/convtools/01/data/2/gshadow
similarity index 100%
rename from tests/tests/convtools/01/data/2/gshadow
rename to tests/convtools/01/data/2/gshadow
diff --git a/tests/tests/convtools/01/data/2/passwd b/tests/convtools/01/data/2/passwd
similarity index 100%
rename from tests/tests/convtools/01/data/2/passwd
rename to tests/convtools/01/data/2/passwd
diff --git a/tests/tests/convtools/01/data/2/shadow b/tests/convtools/01/data/2/shadow
similarity index 100%
rename from tests/tests/convtools/01/data/2/shadow
rename to tests/convtools/01/data/2/shadow
diff --git a/tests/tests/convtools/01/run b/tests/convtools/01/run
similarity index 100%
rename from tests/tests/convtools/01/run
rename to tests/convtools/01/run
diff --git a/tests/tests/convtools/02_grpconv_remove_gshadow_only_entries/config.txt b/tests/convtools/02_grpconv_remove_gshadow_only_entries/config.txt
similarity index 100%
rename from tests/tests/convtools/02_grpconv_remove_gshadow_only_entries/config.txt
rename to tests/convtools/02_grpconv_remove_gshadow_only_entries/config.txt
diff --git a/tests/tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/group b/tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/group
similarity index 100%
rename from tests/tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/group
rename to tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/group
diff --git a/tests/tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/gshadow b/tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/gshadow
rename to tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/gshadow
diff --git a/tests/tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/passwd b/tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/passwd
rename to tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/passwd
diff --git a/tests/tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/shadow b/tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/shadow
rename to tests/convtools/02_grpconv_remove_gshadow_only_entries/config/etc/shadow
diff --git a/tests/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/gshadow b/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/gshadow
similarity index 100%
rename from tests/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/gshadow
rename to tests/convtools/02_grpconv_remove_gshadow_only_entries/data/gshadow
diff --git a/tests/tests/convtools/02_grpconv_remove_gshadow_only_entries/grpconv.test b/tests/convtools/02_grpconv_remove_gshadow_only_entries/grpconv.test
similarity index 100%
rename from tests/tests/convtools/02_grpconv_remove_gshadow_only_entries/grpconv.test
rename to tests/convtools/02_grpconv_remove_gshadow_only_entries/grpconv.test
diff --git a/tests/tests/convtools/03_grpconv_copy_passwd/config.txt b/tests/convtools/03_grpconv_copy_passwd/config.txt
similarity index 100%
rename from tests/tests/convtools/03_grpconv_copy_passwd/config.txt
rename to tests/convtools/03_grpconv_copy_passwd/config.txt
diff --git a/tests/tests/convtools/03_grpconv_copy_passwd/config/etc/group b/tests/convtools/03_grpconv_copy_passwd/config/etc/group
similarity index 100%
rename from tests/tests/convtools/03_grpconv_copy_passwd/config/etc/group
rename to tests/convtools/03_grpconv_copy_passwd/config/etc/group
diff --git a/tests/tests/convtools/03_grpconv_copy_passwd/config/etc/gshadow b/tests/convtools/03_grpconv_copy_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/03_grpconv_copy_passwd/config/etc/gshadow
rename to tests/convtools/03_grpconv_copy_passwd/config/etc/gshadow
diff --git a/tests/tests/convtools/03_grpconv_copy_passwd/config/etc/passwd b/tests/convtools/03_grpconv_copy_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/03_grpconv_copy_passwd/config/etc/passwd
rename to tests/convtools/03_grpconv_copy_passwd/config/etc/passwd
diff --git a/tests/tests/convtools/03_grpconv_copy_passwd/config/etc/shadow b/tests/convtools/03_grpconv_copy_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/03_grpconv_copy_passwd/config/etc/shadow
rename to tests/convtools/03_grpconv_copy_passwd/config/etc/shadow
diff --git a/tests/tests/convtools/03_grpconv_copy_passwd/data/group b/tests/convtools/03_grpconv_copy_passwd/data/group
similarity index 100%
rename from tests/tests/convtools/03_grpconv_copy_passwd/data/group
rename to tests/convtools/03_grpconv_copy_passwd/data/group
diff --git a/tests/tests/convtools/03_grpconv_copy_passwd/data/gshadow b/tests/convtools/03_grpconv_copy_passwd/data/gshadow
similarity index 100%
rename from tests/tests/convtools/03_grpconv_copy_passwd/data/gshadow
rename to tests/convtools/03_grpconv_copy_passwd/data/gshadow
diff --git a/tests/tests/convtools/03_grpconv_copy_passwd/grpconv.test b/tests/convtools/03_grpconv_copy_passwd/grpconv.test
similarity index 100%
rename from tests/tests/convtools/03_grpconv_copy_passwd/grpconv.test
rename to tests/convtools/03_grpconv_copy_passwd/grpconv.test
diff --git a/tests/tests/convtools/04_grpconv_no_password/config.txt b/tests/convtools/04_grpconv_no_password/config.txt
similarity index 100%
rename from tests/tests/convtools/04_grpconv_no_password/config.txt
rename to tests/convtools/04_grpconv_no_password/config.txt
diff --git a/tests/tests/convtools/04_grpconv_no_password/config/etc/group b/tests/convtools/04_grpconv_no_password/config/etc/group
similarity index 100%
rename from tests/tests/convtools/04_grpconv_no_password/config/etc/group
rename to tests/convtools/04_grpconv_no_password/config/etc/group
diff --git a/tests/tests/convtools/04_grpconv_no_password/config/etc/gshadow b/tests/convtools/04_grpconv_no_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/04_grpconv_no_password/config/etc/gshadow
rename to tests/convtools/04_grpconv_no_password/config/etc/gshadow
diff --git a/tests/tests/convtools/04_grpconv_no_password/config/etc/passwd b/tests/convtools/04_grpconv_no_password/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/04_grpconv_no_password/config/etc/passwd
rename to tests/convtools/04_grpconv_no_password/config/etc/passwd
diff --git a/tests/tests/convtools/04_grpconv_no_password/config/etc/shadow b/tests/convtools/04_grpconv_no_password/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/04_grpconv_no_password/config/etc/shadow
rename to tests/convtools/04_grpconv_no_password/config/etc/shadow
diff --git a/tests/tests/convtools/04_grpconv_no_password/data/group b/tests/convtools/04_grpconv_no_password/data/group
similarity index 100%
rename from tests/tests/convtools/04_grpconv_no_password/data/group
rename to tests/convtools/04_grpconv_no_password/data/group
diff --git a/tests/tests/convtools/04_grpconv_no_password/data/gshadow b/tests/convtools/04_grpconv_no_password/data/gshadow
similarity index 100%
rename from tests/tests/convtools/04_grpconv_no_password/data/gshadow
rename to tests/convtools/04_grpconv_no_password/data/gshadow
diff --git a/tests/tests/convtools/04_grpconv_no_password/grpconv.test b/tests/convtools/04_grpconv_no_password/grpconv.test
similarity index 100%
rename from tests/tests/convtools/04_grpconv_no_password/grpconv.test
rename to tests/convtools/04_grpconv_no_password/grpconv.test
diff --git a/tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config.txt b/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config.txt
similarity index 100%
rename from tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config.txt
rename to tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config.txt
diff --git a/tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/group b/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/group
rename to tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/group
diff --git a/tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/gshadow b/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/gshadow
rename to tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/gshadow
diff --git a/tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/passwd b/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/passwd
rename to tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/passwd
diff --git a/tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/shadow b/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/shadow
rename to tests/convtools/05_grpconv_copy_passwd_existing_gshadow/config/etc/shadow
diff --git a/tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/group b/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/group
similarity index 100%
rename from tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/group
rename to tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/group
diff --git a/tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/gshadow b/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/gshadow
similarity index 100%
rename from tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/gshadow
rename to tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/gshadow
diff --git a/tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/grpconv.test b/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/grpconv.test
similarity index 100%
rename from tests/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/grpconv.test
rename to tests/convtools/05_grpconv_copy_passwd_existing_gshadow/grpconv.test
diff --git a/tests/tests/convtools/06_grpconv_error_group_locked/config.txt b/tests/convtools/06_grpconv_error_group_locked/config.txt
similarity index 100%
rename from tests/tests/convtools/06_grpconv_error_group_locked/config.txt
rename to tests/convtools/06_grpconv_error_group_locked/config.txt
diff --git a/tests/tests/convtools/06_grpconv_error_group_locked/config/etc/group b/tests/convtools/06_grpconv_error_group_locked/config/etc/group
similarity index 100%
rename from tests/tests/convtools/06_grpconv_error_group_locked/config/etc/group
rename to tests/convtools/06_grpconv_error_group_locked/config/etc/group
diff --git a/tests/tests/convtools/06_grpconv_error_group_locked/config/etc/gshadow b/tests/convtools/06_grpconv_error_group_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/06_grpconv_error_group_locked/config/etc/gshadow
rename to tests/convtools/06_grpconv_error_group_locked/config/etc/gshadow
diff --git a/tests/tests/convtools/06_grpconv_error_group_locked/config/etc/passwd b/tests/convtools/06_grpconv_error_group_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/06_grpconv_error_group_locked/config/etc/passwd
rename to tests/convtools/06_grpconv_error_group_locked/config/etc/passwd
diff --git a/tests/tests/convtools/06_grpconv_error_group_locked/config/etc/shadow b/tests/convtools/06_grpconv_error_group_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/06_grpconv_error_group_locked/config/etc/shadow
rename to tests/convtools/06_grpconv_error_group_locked/config/etc/shadow
diff --git a/tests/tests/convtools/06_grpconv_error_group_locked/data/grpconv.err b/tests/convtools/06_grpconv_error_group_locked/data/grpconv.err
similarity index 100%
rename from tests/tests/convtools/06_grpconv_error_group_locked/data/grpconv.err
rename to tests/convtools/06_grpconv_error_group_locked/data/grpconv.err
diff --git a/tests/tests/convtools/06_grpconv_error_group_locked/grpconv.test b/tests/convtools/06_grpconv_error_group_locked/grpconv.test
similarity index 100%
rename from tests/tests/convtools/06_grpconv_error_group_locked/grpconv.test
rename to tests/convtools/06_grpconv_error_group_locked/grpconv.test
diff --git a/tests/tests/convtools/07_grpconv_error_gshadow_locked/config.txt b/tests/convtools/07_grpconv_error_gshadow_locked/config.txt
similarity index 100%
rename from tests/tests/convtools/07_grpconv_error_gshadow_locked/config.txt
rename to tests/convtools/07_grpconv_error_gshadow_locked/config.txt
diff --git a/tests/tests/convtools/07_grpconv_error_gshadow_locked/config/etc/group b/tests/convtools/07_grpconv_error_gshadow_locked/config/etc/group
similarity index 100%
rename from tests/tests/convtools/07_grpconv_error_gshadow_locked/config/etc/group
rename to tests/convtools/07_grpconv_error_gshadow_locked/config/etc/group
diff --git a/tests/tests/convtools/07_grpconv_error_gshadow_locked/config/etc/gshadow b/tests/convtools/07_grpconv_error_gshadow_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/07_grpconv_error_gshadow_locked/config/etc/gshadow
rename to tests/convtools/07_grpconv_error_gshadow_locked/config/etc/gshadow
diff --git a/tests/tests/convtools/07_grpconv_error_gshadow_locked/config/etc/passwd b/tests/convtools/07_grpconv_error_gshadow_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/07_grpconv_error_gshadow_locked/config/etc/passwd
rename to tests/convtools/07_grpconv_error_gshadow_locked/config/etc/passwd
diff --git a/tests/tests/convtools/07_grpconv_error_gshadow_locked/config/etc/shadow b/tests/convtools/07_grpconv_error_gshadow_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/07_grpconv_error_gshadow_locked/config/etc/shadow
rename to tests/convtools/07_grpconv_error_gshadow_locked/config/etc/shadow
diff --git a/tests/tests/convtools/07_grpconv_error_gshadow_locked/data/grpconv.err b/tests/convtools/07_grpconv_error_gshadow_locked/data/grpconv.err
similarity index 100%
rename from tests/tests/convtools/07_grpconv_error_gshadow_locked/data/grpconv.err
rename to tests/convtools/07_grpconv_error_gshadow_locked/data/grpconv.err
diff --git a/tests/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test b/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test
similarity index 100%
rename from tests/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test
rename to tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test
diff --git a/tests/tests/convtools/08_grpunconv_no_gshadow_file/config.txt b/tests/convtools/08_grpunconv_no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/convtools/08_grpunconv_no_gshadow_file/config.txt
rename to tests/convtools/08_grpunconv_no_gshadow_file/config.txt
diff --git a/tests/tests/convtools/08_grpunconv_no_gshadow_file/config/etc/group b/tests/convtools/08_grpunconv_no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/convtools/08_grpunconv_no_gshadow_file/config/etc/group
rename to tests/convtools/08_grpunconv_no_gshadow_file/config/etc/group
diff --git a/tests/tests/convtools/08_grpunconv_no_gshadow_file/config/etc/gshadow b/tests/convtools/08_grpunconv_no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/08_grpunconv_no_gshadow_file/config/etc/gshadow
rename to tests/convtools/08_grpunconv_no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/convtools/08_grpunconv_no_gshadow_file/config/etc/passwd b/tests/convtools/08_grpunconv_no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/08_grpunconv_no_gshadow_file/config/etc/passwd
rename to tests/convtools/08_grpunconv_no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/convtools/08_grpunconv_no_gshadow_file/config/etc/shadow b/tests/convtools/08_grpunconv_no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/08_grpunconv_no_gshadow_file/config/etc/shadow
rename to tests/convtools/08_grpunconv_no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/convtools/08_grpunconv_no_gshadow_file/grpunconv.test b/tests/convtools/08_grpunconv_no_gshadow_file/grpunconv.test
similarity index 100%
rename from tests/tests/convtools/08_grpunconv_no_gshadow_file/grpunconv.test
rename to tests/convtools/08_grpunconv_no_gshadow_file/grpunconv.test
diff --git a/tests/tests/convtools/09_grpunconv_error_group_locked/config.txt b/tests/convtools/09_grpunconv_error_group_locked/config.txt
similarity index 100%
rename from tests/tests/convtools/09_grpunconv_error_group_locked/config.txt
rename to tests/convtools/09_grpunconv_error_group_locked/config.txt
diff --git a/tests/tests/convtools/09_grpunconv_error_group_locked/config/etc/group b/tests/convtools/09_grpunconv_error_group_locked/config/etc/group
similarity index 100%
rename from tests/tests/convtools/09_grpunconv_error_group_locked/config/etc/group
rename to tests/convtools/09_grpunconv_error_group_locked/config/etc/group
diff --git a/tests/tests/convtools/09_grpunconv_error_group_locked/config/etc/gshadow b/tests/convtools/09_grpunconv_error_group_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/09_grpunconv_error_group_locked/config/etc/gshadow
rename to tests/convtools/09_grpunconv_error_group_locked/config/etc/gshadow
diff --git a/tests/tests/convtools/09_grpunconv_error_group_locked/config/etc/passwd b/tests/convtools/09_grpunconv_error_group_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/09_grpunconv_error_group_locked/config/etc/passwd
rename to tests/convtools/09_grpunconv_error_group_locked/config/etc/passwd
diff --git a/tests/tests/convtools/09_grpunconv_error_group_locked/config/etc/shadow b/tests/convtools/09_grpunconv_error_group_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/09_grpunconv_error_group_locked/config/etc/shadow
rename to tests/convtools/09_grpunconv_error_group_locked/config/etc/shadow
diff --git a/tests/tests/convtools/09_grpunconv_error_group_locked/data/grpunconv.err b/tests/convtools/09_grpunconv_error_group_locked/data/grpunconv.err
similarity index 100%
rename from tests/tests/convtools/09_grpunconv_error_group_locked/data/grpunconv.err
rename to tests/convtools/09_grpunconv_error_group_locked/data/grpunconv.err
diff --git a/tests/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test b/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test
similarity index 100%
rename from tests/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test
rename to tests/convtools/09_grpunconv_error_group_locked/grpunconv.test
diff --git a/tests/tests/convtools/10_grpunconv_error_gshadow_locked/config.txt b/tests/convtools/10_grpunconv_error_gshadow_locked/config.txt
similarity index 100%
rename from tests/tests/convtools/10_grpunconv_error_gshadow_locked/config.txt
rename to tests/convtools/10_grpunconv_error_gshadow_locked/config.txt
diff --git a/tests/tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/group b/tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/group
similarity index 100%
rename from tests/tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/group
rename to tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/group
diff --git a/tests/tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/gshadow b/tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/gshadow
rename to tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/gshadow
diff --git a/tests/tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/passwd b/tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/passwd
rename to tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/passwd
diff --git a/tests/tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/shadow b/tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/shadow
rename to tests/convtools/10_grpunconv_error_gshadow_locked/config/etc/shadow
diff --git a/tests/tests/convtools/10_grpunconv_error_gshadow_locked/data/grpunconv.err b/tests/convtools/10_grpunconv_error_gshadow_locked/data/grpunconv.err
similarity index 100%
rename from tests/tests/convtools/10_grpunconv_error_gshadow_locked/data/grpunconv.err
rename to tests/convtools/10_grpunconv_error_gshadow_locked/data/grpunconv.err
diff --git a/tests/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test b/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test
similarity index 100%
rename from tests/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test
rename to tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test
diff --git a/tests/tests/convtools/11_pwconv_error_passwd_locked/config.txt b/tests/convtools/11_pwconv_error_passwd_locked/config.txt
similarity index 100%
rename from tests/tests/convtools/11_pwconv_error_passwd_locked/config.txt
rename to tests/convtools/11_pwconv_error_passwd_locked/config.txt
diff --git a/tests/tests/convtools/11_pwconv_error_passwd_locked/config/etc/group b/tests/convtools/11_pwconv_error_passwd_locked/config/etc/group
similarity index 100%
rename from tests/tests/convtools/11_pwconv_error_passwd_locked/config/etc/group
rename to tests/convtools/11_pwconv_error_passwd_locked/config/etc/group
diff --git a/tests/tests/convtools/11_pwconv_error_passwd_locked/config/etc/gshadow b/tests/convtools/11_pwconv_error_passwd_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/11_pwconv_error_passwd_locked/config/etc/gshadow
rename to tests/convtools/11_pwconv_error_passwd_locked/config/etc/gshadow
diff --git a/tests/tests/convtools/11_pwconv_error_passwd_locked/config/etc/passwd b/tests/convtools/11_pwconv_error_passwd_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/11_pwconv_error_passwd_locked/config/etc/passwd
rename to tests/convtools/11_pwconv_error_passwd_locked/config/etc/passwd
diff --git a/tests/tests/convtools/11_pwconv_error_passwd_locked/config/etc/shadow b/tests/convtools/11_pwconv_error_passwd_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/11_pwconv_error_passwd_locked/config/etc/shadow
rename to tests/convtools/11_pwconv_error_passwd_locked/config/etc/shadow
diff --git a/tests/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err b/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err
similarity index 100%
rename from tests/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err
rename to tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err
diff --git a/tests/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test b/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test
similarity index 100%
rename from tests/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test
rename to tests/convtools/11_pwconv_error_passwd_locked/pwconv.test
diff --git a/tests/tests/convtools/12_pwconv_error_shadow_locked/config.txt b/tests/convtools/12_pwconv_error_shadow_locked/config.txt
similarity index 100%
rename from tests/tests/convtools/12_pwconv_error_shadow_locked/config.txt
rename to tests/convtools/12_pwconv_error_shadow_locked/config.txt
diff --git a/tests/tests/convtools/12_pwconv_error_shadow_locked/config/etc/group b/tests/convtools/12_pwconv_error_shadow_locked/config/etc/group
similarity index 100%
rename from tests/tests/convtools/12_pwconv_error_shadow_locked/config/etc/group
rename to tests/convtools/12_pwconv_error_shadow_locked/config/etc/group
diff --git a/tests/tests/convtools/12_pwconv_error_shadow_locked/config/etc/gshadow b/tests/convtools/12_pwconv_error_shadow_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/12_pwconv_error_shadow_locked/config/etc/gshadow
rename to tests/convtools/12_pwconv_error_shadow_locked/config/etc/gshadow
diff --git a/tests/tests/convtools/12_pwconv_error_shadow_locked/config/etc/passwd b/tests/convtools/12_pwconv_error_shadow_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/12_pwconv_error_shadow_locked/config/etc/passwd
rename to tests/convtools/12_pwconv_error_shadow_locked/config/etc/passwd
diff --git a/tests/tests/convtools/12_pwconv_error_shadow_locked/config/etc/shadow b/tests/convtools/12_pwconv_error_shadow_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/12_pwconv_error_shadow_locked/config/etc/shadow
rename to tests/convtools/12_pwconv_error_shadow_locked/config/etc/shadow
diff --git a/tests/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err b/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err
similarity index 100%
rename from tests/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err
rename to tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err
diff --git a/tests/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test b/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test
similarity index 100%
rename from tests/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test
rename to tests/convtools/12_pwconv_error_shadow_locked/pwconv.test
diff --git a/tests/tests/convtools/13_pwunconv_error_passwd_locked/config.txt b/tests/convtools/13_pwunconv_error_passwd_locked/config.txt
similarity index 100%
rename from tests/tests/convtools/13_pwunconv_error_passwd_locked/config.txt
rename to tests/convtools/13_pwunconv_error_passwd_locked/config.txt
diff --git a/tests/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/group b/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/group
similarity index 100%
rename from tests/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/group
rename to tests/convtools/13_pwunconv_error_passwd_locked/config/etc/group
diff --git a/tests/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/gshadow b/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/gshadow
rename to tests/convtools/13_pwunconv_error_passwd_locked/config/etc/gshadow
diff --git a/tests/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/passwd b/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/passwd
rename to tests/convtools/13_pwunconv_error_passwd_locked/config/etc/passwd
diff --git a/tests/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/shadow b/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/13_pwunconv_error_passwd_locked/config/etc/shadow
rename to tests/convtools/13_pwunconv_error_passwd_locked/config/etc/shadow
diff --git a/tests/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err b/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err
similarity index 100%
rename from tests/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err
rename to tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err
diff --git a/tests/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test b/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test
similarity index 100%
rename from tests/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test
rename to tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test
diff --git a/tests/tests/convtools/14_pwunconv_error_shadow_locked/config.txt b/tests/convtools/14_pwunconv_error_shadow_locked/config.txt
similarity index 100%
rename from tests/tests/convtools/14_pwunconv_error_shadow_locked/config.txt
rename to tests/convtools/14_pwunconv_error_shadow_locked/config.txt
diff --git a/tests/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/group b/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/group
similarity index 100%
rename from tests/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/group
rename to tests/convtools/14_pwunconv_error_shadow_locked/config/etc/group
diff --git a/tests/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/gshadow b/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/gshadow
rename to tests/convtools/14_pwunconv_error_shadow_locked/config/etc/gshadow
diff --git a/tests/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/passwd b/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/passwd
rename to tests/convtools/14_pwunconv_error_shadow_locked/config/etc/passwd
diff --git a/tests/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/shadow b/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/14_pwunconv_error_shadow_locked/config/etc/shadow
rename to tests/convtools/14_pwunconv_error_shadow_locked/config/etc/shadow
diff --git a/tests/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err b/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err
similarity index 100%
rename from tests/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err
rename to tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err
diff --git a/tests/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test b/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test
similarity index 100%
rename from tests/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test
rename to tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test
diff --git a/tests/tests/convtools/15_pwconv_remove_shadow_only_entries/config.txt b/tests/convtools/15_pwconv_remove_shadow_only_entries/config.txt
similarity index 100%
rename from tests/tests/convtools/15_pwconv_remove_shadow_only_entries/config.txt
rename to tests/convtools/15_pwconv_remove_shadow_only_entries/config.txt
diff --git a/tests/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/group b/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/group
similarity index 100%
rename from tests/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/group
rename to tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/group
diff --git a/tests/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/gshadow b/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/gshadow
rename to tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/gshadow
diff --git a/tests/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/passwd b/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/passwd
rename to tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/passwd
diff --git a/tests/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/shadow b/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/shadow
rename to tests/convtools/15_pwconv_remove_shadow_only_entries/config/etc/shadow
diff --git a/tests/tests/convtools/15_pwconv_remove_shadow_only_entries/data/shadow b/tests/convtools/15_pwconv_remove_shadow_only_entries/data/shadow
similarity index 100%
rename from tests/tests/convtools/15_pwconv_remove_shadow_only_entries/data/shadow
rename to tests/convtools/15_pwconv_remove_shadow_only_entries/data/shadow
diff --git a/tests/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test b/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test
similarity index 100%
rename from tests/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test
rename to tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test
diff --git a/tests/tests/convtools/16_pwconv_copy_passwd/config.txt b/tests/convtools/16_pwconv_copy_passwd/config.txt
similarity index 100%
rename from tests/tests/convtools/16_pwconv_copy_passwd/config.txt
rename to tests/convtools/16_pwconv_copy_passwd/config.txt
diff --git a/tests/tests/convtools/16_pwconv_copy_passwd/config/etc/group b/tests/convtools/16_pwconv_copy_passwd/config/etc/group
similarity index 100%
rename from tests/tests/convtools/16_pwconv_copy_passwd/config/etc/group
rename to tests/convtools/16_pwconv_copy_passwd/config/etc/group
diff --git a/tests/tests/convtools/16_pwconv_copy_passwd/config/etc/gshadow b/tests/convtools/16_pwconv_copy_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/16_pwconv_copy_passwd/config/etc/gshadow
rename to tests/convtools/16_pwconv_copy_passwd/config/etc/gshadow
diff --git a/tests/tests/convtools/16_pwconv_copy_passwd/config/etc/passwd b/tests/convtools/16_pwconv_copy_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/16_pwconv_copy_passwd/config/etc/passwd
rename to tests/convtools/16_pwconv_copy_passwd/config/etc/passwd
diff --git a/tests/tests/convtools/16_pwconv_copy_passwd/config/etc/shadow b/tests/convtools/16_pwconv_copy_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/16_pwconv_copy_passwd/config/etc/shadow
rename to tests/convtools/16_pwconv_copy_passwd/config/etc/shadow
diff --git a/tests/tests/convtools/16_pwconv_copy_passwd/data/passwd b/tests/convtools/16_pwconv_copy_passwd/data/passwd
similarity index 100%
rename from tests/tests/convtools/16_pwconv_copy_passwd/data/passwd
rename to tests/convtools/16_pwconv_copy_passwd/data/passwd
diff --git a/tests/tests/convtools/16_pwconv_copy_passwd/data/shadow b/tests/convtools/16_pwconv_copy_passwd/data/shadow
similarity index 100%
rename from tests/tests/convtools/16_pwconv_copy_passwd/data/shadow
rename to tests/convtools/16_pwconv_copy_passwd/data/shadow
diff --git a/tests/tests/convtools/16_pwconv_copy_passwd/pwconv.test b/tests/convtools/16_pwconv_copy_passwd/pwconv.test
similarity index 100%
rename from tests/tests/convtools/16_pwconv_copy_passwd/pwconv.test
rename to tests/convtools/16_pwconv_copy_passwd/pwconv.test
diff --git a/tests/tests/convtools/17_pwunconv_no_shadow_file/config.txt b/tests/convtools/17_pwunconv_no_shadow_file/config.txt
similarity index 100%
rename from tests/tests/convtools/17_pwunconv_no_shadow_file/config.txt
rename to tests/convtools/17_pwunconv_no_shadow_file/config.txt
diff --git a/tests/tests/convtools/17_pwunconv_no_shadow_file/config/etc/group b/tests/convtools/17_pwunconv_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/convtools/17_pwunconv_no_shadow_file/config/etc/group
rename to tests/convtools/17_pwunconv_no_shadow_file/config/etc/group
diff --git a/tests/tests/convtools/17_pwunconv_no_shadow_file/config/etc/gshadow b/tests/convtools/17_pwunconv_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/17_pwunconv_no_shadow_file/config/etc/gshadow
rename to tests/convtools/17_pwunconv_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/convtools/17_pwunconv_no_shadow_file/config/etc/passwd b/tests/convtools/17_pwunconv_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/17_pwunconv_no_shadow_file/config/etc/passwd
rename to tests/convtools/17_pwunconv_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/convtools/17_pwunconv_no_shadow_file/config/etc/shadow b/tests/convtools/17_pwunconv_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/17_pwunconv_no_shadow_file/config/etc/shadow
rename to tests/convtools/17_pwunconv_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test b/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test
similarity index 100%
rename from tests/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test
rename to tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test
diff --git a/tests/tests/convtools/18_pwunconv_user_not_in_shadow/config.txt b/tests/convtools/18_pwunconv_user_not_in_shadow/config.txt
similarity index 100%
rename from tests/tests/convtools/18_pwunconv_user_not_in_shadow/config.txt
rename to tests/convtools/18_pwunconv_user_not_in_shadow/config.txt
diff --git a/tests/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/group b/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/group
similarity index 100%
rename from tests/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/group
rename to tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/group
diff --git a/tests/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/gshadow b/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/gshadow
rename to tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/gshadow
diff --git a/tests/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/passwd b/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/passwd
rename to tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/passwd
diff --git a/tests/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/shadow b/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/shadow
rename to tests/convtools/18_pwunconv_user_not_in_shadow/config/etc/shadow
diff --git a/tests/tests/convtools/18_pwunconv_user_not_in_shadow/data/passwd b/tests/convtools/18_pwunconv_user_not_in_shadow/data/passwd
similarity index 100%
rename from tests/tests/convtools/18_pwunconv_user_not_in_shadow/data/passwd
rename to tests/convtools/18_pwunconv_user_not_in_shadow/data/passwd
diff --git a/tests/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test b/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test
similarity index 100%
rename from tests/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test
rename to tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test
diff --git a/tests/tests/convtools/19_pwconv_NIS/config.txt b/tests/convtools/19_pwconv_NIS/config.txt
similarity index 100%
rename from tests/tests/convtools/19_pwconv_NIS/config.txt
rename to tests/convtools/19_pwconv_NIS/config.txt
diff --git a/tests/tests/convtools/19_pwconv_NIS/config/etc/group b/tests/convtools/19_pwconv_NIS/config/etc/group
similarity index 100%
rename from tests/tests/convtools/19_pwconv_NIS/config/etc/group
rename to tests/convtools/19_pwconv_NIS/config/etc/group
diff --git a/tests/tests/convtools/19_pwconv_NIS/config/etc/gshadow b/tests/convtools/19_pwconv_NIS/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/19_pwconv_NIS/config/etc/gshadow
rename to tests/convtools/19_pwconv_NIS/config/etc/gshadow
diff --git a/tests/tests/convtools/19_pwconv_NIS/config/etc/passwd b/tests/convtools/19_pwconv_NIS/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/19_pwconv_NIS/config/etc/passwd
rename to tests/convtools/19_pwconv_NIS/config/etc/passwd
diff --git a/tests/tests/convtools/19_pwconv_NIS/config/etc/shadow b/tests/convtools/19_pwconv_NIS/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/19_pwconv_NIS/config/etc/shadow
rename to tests/convtools/19_pwconv_NIS/config/etc/shadow
diff --git a/tests/tests/convtools/19_pwconv_NIS/data/passwd b/tests/convtools/19_pwconv_NIS/data/passwd
similarity index 100%
rename from tests/tests/convtools/19_pwconv_NIS/data/passwd
rename to tests/convtools/19_pwconv_NIS/data/passwd
diff --git a/tests/tests/convtools/19_pwconv_NIS/data/shadow b/tests/convtools/19_pwconv_NIS/data/shadow
similarity index 100%
rename from tests/tests/convtools/19_pwconv_NIS/data/shadow
rename to tests/convtools/19_pwconv_NIS/data/shadow
diff --git a/tests/tests/convtools/19_pwconv_NIS/pwconv.test b/tests/convtools/19_pwconv_NIS/pwconv.test
similarity index 100%
rename from tests/tests/convtools/19_pwconv_NIS/pwconv.test
rename to tests/convtools/19_pwconv_NIS/pwconv.test
diff --git a/tests/tests/convtools/20_pwunconv_usage_option/config.txt b/tests/convtools/20_pwunconv_usage_option/config.txt
similarity index 100%
rename from tests/tests/convtools/20_pwunconv_usage_option/config.txt
rename to tests/convtools/20_pwunconv_usage_option/config.txt
diff --git a/tests/tests/convtools/20_pwunconv_usage_option/config/etc/group b/tests/convtools/20_pwunconv_usage_option/config/etc/group
similarity index 100%
rename from tests/tests/convtools/20_pwunconv_usage_option/config/etc/group
rename to tests/convtools/20_pwunconv_usage_option/config/etc/group
diff --git a/tests/tests/convtools/20_pwunconv_usage_option/config/etc/gshadow b/tests/convtools/20_pwunconv_usage_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/20_pwunconv_usage_option/config/etc/gshadow
rename to tests/convtools/20_pwunconv_usage_option/config/etc/gshadow
diff --git a/tests/tests/convtools/20_pwunconv_usage_option/config/etc/passwd b/tests/convtools/20_pwunconv_usage_option/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/20_pwunconv_usage_option/config/etc/passwd
rename to tests/convtools/20_pwunconv_usage_option/config/etc/passwd
diff --git a/tests/tests/convtools/20_pwunconv_usage_option/config/etc/shadow b/tests/convtools/20_pwunconv_usage_option/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/20_pwunconv_usage_option/config/etc/shadow
rename to tests/convtools/20_pwunconv_usage_option/config/etc/shadow
diff --git a/tests/tests/convtools/20_pwunconv_usage_option/data/usage.out b/tests/convtools/20_pwunconv_usage_option/data/usage.out
similarity index 100%
rename from tests/tests/convtools/20_pwunconv_usage_option/data/usage.out
rename to tests/convtools/20_pwunconv_usage_option/data/usage.out
diff --git a/tests/tests/convtools/20_pwunconv_usage_option/pwunconv.test b/tests/convtools/20_pwunconv_usage_option/pwunconv.test
similarity index 100%
rename from tests/tests/convtools/20_pwunconv_usage_option/pwunconv.test
rename to tests/convtools/20_pwunconv_usage_option/pwunconv.test
diff --git a/tests/tests/convtools/21_pwunconv_keep_passwd_password/config.txt b/tests/convtools/21_pwunconv_keep_passwd_password/config.txt
similarity index 100%
rename from tests/tests/convtools/21_pwunconv_keep_passwd_password/config.txt
rename to tests/convtools/21_pwunconv_keep_passwd_password/config.txt
diff --git a/tests/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/group b/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/group
similarity index 100%
rename from tests/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/group
rename to tests/convtools/21_pwunconv_keep_passwd_password/config/etc/group
diff --git a/tests/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/gshadow b/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/gshadow
rename to tests/convtools/21_pwunconv_keep_passwd_password/config/etc/gshadow
diff --git a/tests/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/passwd b/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/passwd
rename to tests/convtools/21_pwunconv_keep_passwd_password/config/etc/passwd
diff --git a/tests/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/shadow b/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/21_pwunconv_keep_passwd_password/config/etc/shadow
rename to tests/convtools/21_pwunconv_keep_passwd_password/config/etc/shadow
diff --git a/tests/tests/convtools/21_pwunconv_keep_passwd_password/data/passwd b/tests/convtools/21_pwunconv_keep_passwd_password/data/passwd
similarity index 100%
rename from tests/tests/convtools/21_pwunconv_keep_passwd_password/data/passwd
rename to tests/convtools/21_pwunconv_keep_passwd_password/data/passwd
diff --git a/tests/tests/convtools/21_pwunconv_keep_passwd_password/pwunconv.test b/tests/convtools/21_pwunconv_keep_passwd_password/pwunconv.test
similarity index 100%
rename from tests/tests/convtools/21_pwunconv_keep_passwd_password/pwunconv.test
rename to tests/convtools/21_pwunconv_keep_passwd_password/pwunconv.test
diff --git a/tests/tests/convtools/22_grpunconv_usage_option/config.txt b/tests/convtools/22_grpunconv_usage_option/config.txt
similarity index 100%
rename from tests/tests/convtools/22_grpunconv_usage_option/config.txt
rename to tests/convtools/22_grpunconv_usage_option/config.txt
diff --git a/tests/tests/convtools/22_grpunconv_usage_option/config/etc/group b/tests/convtools/22_grpunconv_usage_option/config/etc/group
similarity index 100%
rename from tests/tests/convtools/22_grpunconv_usage_option/config/etc/group
rename to tests/convtools/22_grpunconv_usage_option/config/etc/group
diff --git a/tests/tests/convtools/22_grpunconv_usage_option/config/etc/gshadow b/tests/convtools/22_grpunconv_usage_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/22_grpunconv_usage_option/config/etc/gshadow
rename to tests/convtools/22_grpunconv_usage_option/config/etc/gshadow
diff --git a/tests/tests/convtools/22_grpunconv_usage_option/config/etc/passwd b/tests/convtools/22_grpunconv_usage_option/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/22_grpunconv_usage_option/config/etc/passwd
rename to tests/convtools/22_grpunconv_usage_option/config/etc/passwd
diff --git a/tests/tests/convtools/22_grpunconv_usage_option/config/etc/shadow b/tests/convtools/22_grpunconv_usage_option/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/22_grpunconv_usage_option/config/etc/shadow
rename to tests/convtools/22_grpunconv_usage_option/config/etc/shadow
diff --git a/tests/tests/convtools/22_grpunconv_usage_option/data/usage.out b/tests/convtools/22_grpunconv_usage_option/data/usage.out
similarity index 100%
rename from tests/tests/convtools/22_grpunconv_usage_option/data/usage.out
rename to tests/convtools/22_grpunconv_usage_option/data/usage.out
diff --git a/tests/tests/convtools/22_grpunconv_usage_option/grpunconv.test b/tests/convtools/22_grpunconv_usage_option/grpunconv.test
similarity index 100%
rename from tests/tests/convtools/22_grpunconv_usage_option/grpunconv.test
rename to tests/convtools/22_grpunconv_usage_option/grpunconv.test
diff --git a/tests/tests/convtools/23_grpunconv_keep_group_password/config.txt b/tests/convtools/23_grpunconv_keep_group_password/config.txt
similarity index 100%
rename from tests/tests/convtools/23_grpunconv_keep_group_password/config.txt
rename to tests/convtools/23_grpunconv_keep_group_password/config.txt
diff --git a/tests/tests/convtools/23_grpunconv_keep_group_password/config/etc/group b/tests/convtools/23_grpunconv_keep_group_password/config/etc/group
similarity index 100%
rename from tests/tests/convtools/23_grpunconv_keep_group_password/config/etc/group
rename to tests/convtools/23_grpunconv_keep_group_password/config/etc/group
diff --git a/tests/tests/convtools/23_grpunconv_keep_group_password/config/etc/gshadow b/tests/convtools/23_grpunconv_keep_group_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/23_grpunconv_keep_group_password/config/etc/gshadow
rename to tests/convtools/23_grpunconv_keep_group_password/config/etc/gshadow
diff --git a/tests/tests/convtools/23_grpunconv_keep_group_password/config/etc/passwd b/tests/convtools/23_grpunconv_keep_group_password/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/23_grpunconv_keep_group_password/config/etc/passwd
rename to tests/convtools/23_grpunconv_keep_group_password/config/etc/passwd
diff --git a/tests/tests/convtools/23_grpunconv_keep_group_password/config/etc/shadow b/tests/convtools/23_grpunconv_keep_group_password/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/23_grpunconv_keep_group_password/config/etc/shadow
rename to tests/convtools/23_grpunconv_keep_group_password/config/etc/shadow
diff --git a/tests/tests/convtools/23_grpunconv_keep_group_password/data/group b/tests/convtools/23_grpunconv_keep_group_password/data/group
similarity index 100%
rename from tests/tests/convtools/23_grpunconv_keep_group_password/data/group
rename to tests/convtools/23_grpunconv_keep_group_password/data/group
diff --git a/tests/tests/convtools/23_grpunconv_keep_group_password/grpunconv.test b/tests/convtools/23_grpunconv_keep_group_password/grpunconv.test
similarity index 100%
rename from tests/tests/convtools/23_grpunconv_keep_group_password/grpunconv.test
rename to tests/convtools/23_grpunconv_keep_group_password/grpunconv.test
diff --git a/tests/tests/convtools/24_grpunconv_no_gshadow_entry/config.txt b/tests/convtools/24_grpunconv_no_gshadow_entry/config.txt
similarity index 100%
rename from tests/tests/convtools/24_grpunconv_no_gshadow_entry/config.txt
rename to tests/convtools/24_grpunconv_no_gshadow_entry/config.txt
diff --git a/tests/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/group b/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/group
rename to tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/group
diff --git a/tests/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/gshadow b/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/gshadow
rename to tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/gshadow
diff --git a/tests/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/passwd b/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/passwd
rename to tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/passwd
diff --git a/tests/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/shadow b/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/shadow
rename to tests/convtools/24_grpunconv_no_gshadow_entry/config/etc/shadow
diff --git a/tests/tests/convtools/24_grpunconv_no_gshadow_entry/data/group b/tests/convtools/24_grpunconv_no_gshadow_entry/data/group
similarity index 100%
rename from tests/tests/convtools/24_grpunconv_no_gshadow_entry/data/group
rename to tests/convtools/24_grpunconv_no_gshadow_entry/data/group
diff --git a/tests/tests/convtools/24_grpunconv_no_gshadow_entry/grpunconv.test b/tests/convtools/24_grpunconv_no_gshadow_entry/grpunconv.test
similarity index 100%
rename from tests/tests/convtools/24_grpunconv_no_gshadow_entry/grpunconv.test
rename to tests/convtools/24_grpunconv_no_gshadow_entry/grpunconv.test
diff --git a/tests/tests/convtools/25_pwconv_usage_option/config.txt b/tests/convtools/25_pwconv_usage_option/config.txt
similarity index 100%
rename from tests/tests/convtools/25_pwconv_usage_option/config.txt
rename to tests/convtools/25_pwconv_usage_option/config.txt
diff --git a/tests/tests/convtools/25_pwconv_usage_option/config/etc/group b/tests/convtools/25_pwconv_usage_option/config/etc/group
similarity index 100%
rename from tests/tests/convtools/25_pwconv_usage_option/config/etc/group
rename to tests/convtools/25_pwconv_usage_option/config/etc/group
diff --git a/tests/tests/convtools/25_pwconv_usage_option/config/etc/gshadow b/tests/convtools/25_pwconv_usage_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/25_pwconv_usage_option/config/etc/gshadow
rename to tests/convtools/25_pwconv_usage_option/config/etc/gshadow
diff --git a/tests/tests/convtools/25_pwconv_usage_option/config/etc/passwd b/tests/convtools/25_pwconv_usage_option/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/25_pwconv_usage_option/config/etc/passwd
rename to tests/convtools/25_pwconv_usage_option/config/etc/passwd
diff --git a/tests/tests/convtools/25_pwconv_usage_option/config/etc/shadow b/tests/convtools/25_pwconv_usage_option/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/25_pwconv_usage_option/config/etc/shadow
rename to tests/convtools/25_pwconv_usage_option/config/etc/shadow
diff --git a/tests/tests/convtools/25_pwconv_usage_option/data/usage.out b/tests/convtools/25_pwconv_usage_option/data/usage.out
similarity index 100%
rename from tests/tests/convtools/25_pwconv_usage_option/data/usage.out
rename to tests/convtools/25_pwconv_usage_option/data/usage.out
diff --git a/tests/tests/convtools/25_pwconv_usage_option/pwconv.test b/tests/convtools/25_pwconv_usage_option/pwconv.test
similarity index 100%
rename from tests/tests/convtools/25_pwconv_usage_option/pwconv.test
rename to tests/convtools/25_pwconv_usage_option/pwconv.test
diff --git a/tests/tests/convtools/26_grpconv_usage_option/config.txt b/tests/convtools/26_grpconv_usage_option/config.txt
similarity index 100%
rename from tests/tests/convtools/26_grpconv_usage_option/config.txt
rename to tests/convtools/26_grpconv_usage_option/config.txt
diff --git a/tests/tests/convtools/26_grpconv_usage_option/config/etc/group b/tests/convtools/26_grpconv_usage_option/config/etc/group
similarity index 100%
rename from tests/tests/convtools/26_grpconv_usage_option/config/etc/group
rename to tests/convtools/26_grpconv_usage_option/config/etc/group
diff --git a/tests/tests/convtools/26_grpconv_usage_option/config/etc/gshadow b/tests/convtools/26_grpconv_usage_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/26_grpconv_usage_option/config/etc/gshadow
rename to tests/convtools/26_grpconv_usage_option/config/etc/gshadow
diff --git a/tests/tests/convtools/26_grpconv_usage_option/config/etc/passwd b/tests/convtools/26_grpconv_usage_option/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/26_grpconv_usage_option/config/etc/passwd
rename to tests/convtools/26_grpconv_usage_option/config/etc/passwd
diff --git a/tests/tests/convtools/26_grpconv_usage_option/config/etc/shadow b/tests/convtools/26_grpconv_usage_option/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/26_grpconv_usage_option/config/etc/shadow
rename to tests/convtools/26_grpconv_usage_option/config/etc/shadow
diff --git a/tests/tests/convtools/26_grpconv_usage_option/data/usage.out b/tests/convtools/26_grpconv_usage_option/data/usage.out
similarity index 100%
rename from tests/tests/convtools/26_grpconv_usage_option/data/usage.out
rename to tests/convtools/26_grpconv_usage_option/data/usage.out
diff --git a/tests/tests/convtools/26_grpconv_usage_option/grpconv.test b/tests/convtools/26_grpconv_usage_option/grpconv.test
similarity index 100%
rename from tests/tests/convtools/26_grpconv_usage_option/grpconv.test
rename to tests/convtools/26_grpconv_usage_option/grpconv.test
diff --git a/tests/tests/convtools/27_pwunconv_usage/config.txt b/tests/convtools/27_pwunconv_usage/config.txt
similarity index 100%
rename from tests/tests/convtools/27_pwunconv_usage/config.txt
rename to tests/convtools/27_pwunconv_usage/config.txt
diff --git a/tests/tests/convtools/27_pwunconv_usage/config/etc/group b/tests/convtools/27_pwunconv_usage/config/etc/group
similarity index 100%
rename from tests/tests/convtools/27_pwunconv_usage/config/etc/group
rename to tests/convtools/27_pwunconv_usage/config/etc/group
diff --git a/tests/tests/convtools/27_pwunconv_usage/config/etc/gshadow b/tests/convtools/27_pwunconv_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/27_pwunconv_usage/config/etc/gshadow
rename to tests/convtools/27_pwunconv_usage/config/etc/gshadow
diff --git a/tests/tests/convtools/27_pwunconv_usage/config/etc/passwd b/tests/convtools/27_pwunconv_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/27_pwunconv_usage/config/etc/passwd
rename to tests/convtools/27_pwunconv_usage/config/etc/passwd
diff --git a/tests/tests/convtools/27_pwunconv_usage/config/etc/shadow b/tests/convtools/27_pwunconv_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/27_pwunconv_usage/config/etc/shadow
rename to tests/convtools/27_pwunconv_usage/config/etc/shadow
diff --git a/tests/tests/convtools/27_pwunconv_usage/data/usage.out b/tests/convtools/27_pwunconv_usage/data/usage.out
similarity index 100%
rename from tests/tests/convtools/27_pwunconv_usage/data/usage.out
rename to tests/convtools/27_pwunconv_usage/data/usage.out
diff --git a/tests/tests/convtools/27_pwunconv_usage/pwunconv.test b/tests/convtools/27_pwunconv_usage/pwunconv.test
similarity index 100%
rename from tests/tests/convtools/27_pwunconv_usage/pwunconv.test
rename to tests/convtools/27_pwunconv_usage/pwunconv.test
diff --git a/tests/tests/convtools/28_pwunconv_usage_extra_arg/config.txt b/tests/convtools/28_pwunconv_usage_extra_arg/config.txt
similarity index 100%
rename from tests/tests/convtools/28_pwunconv_usage_extra_arg/config.txt
rename to tests/convtools/28_pwunconv_usage_extra_arg/config.txt
diff --git a/tests/tests/convtools/28_pwunconv_usage_extra_arg/config/etc/group b/tests/convtools/28_pwunconv_usage_extra_arg/config/etc/group
similarity index 100%
rename from tests/tests/convtools/28_pwunconv_usage_extra_arg/config/etc/group
rename to tests/convtools/28_pwunconv_usage_extra_arg/config/etc/group
diff --git a/tests/tests/convtools/28_pwunconv_usage_extra_arg/config/etc/gshadow b/tests/convtools/28_pwunconv_usage_extra_arg/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/28_pwunconv_usage_extra_arg/config/etc/gshadow
rename to tests/convtools/28_pwunconv_usage_extra_arg/config/etc/gshadow
diff --git a/tests/tests/convtools/28_pwunconv_usage_extra_arg/config/etc/passwd b/tests/convtools/28_pwunconv_usage_extra_arg/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/28_pwunconv_usage_extra_arg/config/etc/passwd
rename to tests/convtools/28_pwunconv_usage_extra_arg/config/etc/passwd
diff --git a/tests/tests/convtools/28_pwunconv_usage_extra_arg/config/etc/shadow b/tests/convtools/28_pwunconv_usage_extra_arg/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/28_pwunconv_usage_extra_arg/config/etc/shadow
rename to tests/convtools/28_pwunconv_usage_extra_arg/config/etc/shadow
diff --git a/tests/tests/convtools/28_pwunconv_usage_extra_arg/data/usage.out b/tests/convtools/28_pwunconv_usage_extra_arg/data/usage.out
similarity index 100%
rename from tests/tests/convtools/28_pwunconv_usage_extra_arg/data/usage.out
rename to tests/convtools/28_pwunconv_usage_extra_arg/data/usage.out
diff --git a/tests/tests/convtools/28_pwunconv_usage_extra_arg/pwunconv.test b/tests/convtools/28_pwunconv_usage_extra_arg/pwunconv.test
similarity index 100%
rename from tests/tests/convtools/28_pwunconv_usage_extra_arg/pwunconv.test
rename to tests/convtools/28_pwunconv_usage_extra_arg/pwunconv.test
diff --git a/tests/tests/convtools/29_grpconv_usage/config.txt b/tests/convtools/29_grpconv_usage/config.txt
similarity index 100%
rename from tests/tests/convtools/29_grpconv_usage/config.txt
rename to tests/convtools/29_grpconv_usage/config.txt
diff --git a/tests/tests/convtools/29_grpconv_usage/config/etc/group b/tests/convtools/29_grpconv_usage/config/etc/group
similarity index 100%
rename from tests/tests/convtools/29_grpconv_usage/config/etc/group
rename to tests/convtools/29_grpconv_usage/config/etc/group
diff --git a/tests/tests/convtools/29_grpconv_usage/config/etc/gshadow b/tests/convtools/29_grpconv_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/29_grpconv_usage/config/etc/gshadow
rename to tests/convtools/29_grpconv_usage/config/etc/gshadow
diff --git a/tests/tests/convtools/29_grpconv_usage/config/etc/passwd b/tests/convtools/29_grpconv_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/29_grpconv_usage/config/etc/passwd
rename to tests/convtools/29_grpconv_usage/config/etc/passwd
diff --git a/tests/tests/convtools/29_grpconv_usage/config/etc/shadow b/tests/convtools/29_grpconv_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/29_grpconv_usage/config/etc/shadow
rename to tests/convtools/29_grpconv_usage/config/etc/shadow
diff --git a/tests/tests/convtools/29_grpconv_usage/data/usage.out b/tests/convtools/29_grpconv_usage/data/usage.out
similarity index 100%
rename from tests/tests/convtools/29_grpconv_usage/data/usage.out
rename to tests/convtools/29_grpconv_usage/data/usage.out
diff --git a/tests/tests/convtools/29_grpconv_usage/grpconv.test b/tests/convtools/29_grpconv_usage/grpconv.test
similarity index 100%
rename from tests/tests/convtools/29_grpconv_usage/grpconv.test
rename to tests/convtools/29_grpconv_usage/grpconv.test
diff --git a/tests/tests/convtools/30_grpconv_usage_extra_arg/config.txt b/tests/convtools/30_grpconv_usage_extra_arg/config.txt
similarity index 100%
rename from tests/tests/convtools/30_grpconv_usage_extra_arg/config.txt
rename to tests/convtools/30_grpconv_usage_extra_arg/config.txt
diff --git a/tests/tests/convtools/30_grpconv_usage_extra_arg/config/etc/group b/tests/convtools/30_grpconv_usage_extra_arg/config/etc/group
similarity index 100%
rename from tests/tests/convtools/30_grpconv_usage_extra_arg/config/etc/group
rename to tests/convtools/30_grpconv_usage_extra_arg/config/etc/group
diff --git a/tests/tests/convtools/30_grpconv_usage_extra_arg/config/etc/gshadow b/tests/convtools/30_grpconv_usage_extra_arg/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/30_grpconv_usage_extra_arg/config/etc/gshadow
rename to tests/convtools/30_grpconv_usage_extra_arg/config/etc/gshadow
diff --git a/tests/tests/convtools/30_grpconv_usage_extra_arg/config/etc/passwd b/tests/convtools/30_grpconv_usage_extra_arg/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/30_grpconv_usage_extra_arg/config/etc/passwd
rename to tests/convtools/30_grpconv_usage_extra_arg/config/etc/passwd
diff --git a/tests/tests/convtools/30_grpconv_usage_extra_arg/config/etc/shadow b/tests/convtools/30_grpconv_usage_extra_arg/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/30_grpconv_usage_extra_arg/config/etc/shadow
rename to tests/convtools/30_grpconv_usage_extra_arg/config/etc/shadow
diff --git a/tests/tests/convtools/30_grpconv_usage_extra_arg/data/usage.out b/tests/convtools/30_grpconv_usage_extra_arg/data/usage.out
similarity index 100%
rename from tests/tests/convtools/30_grpconv_usage_extra_arg/data/usage.out
rename to tests/convtools/30_grpconv_usage_extra_arg/data/usage.out
diff --git a/tests/tests/convtools/30_grpconv_usage_extra_arg/grpconv.test b/tests/convtools/30_grpconv_usage_extra_arg/grpconv.test
similarity index 100%
rename from tests/tests/convtools/30_grpconv_usage_extra_arg/grpconv.test
rename to tests/convtools/30_grpconv_usage_extra_arg/grpconv.test
diff --git a/tests/tests/convtools/31_pwconv_usage/config.txt b/tests/convtools/31_pwconv_usage/config.txt
similarity index 100%
rename from tests/tests/convtools/31_pwconv_usage/config.txt
rename to tests/convtools/31_pwconv_usage/config.txt
diff --git a/tests/tests/convtools/31_pwconv_usage/config/etc/group b/tests/convtools/31_pwconv_usage/config/etc/group
similarity index 100%
rename from tests/tests/convtools/31_pwconv_usage/config/etc/group
rename to tests/convtools/31_pwconv_usage/config/etc/group
diff --git a/tests/tests/convtools/31_pwconv_usage/config/etc/gshadow b/tests/convtools/31_pwconv_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/31_pwconv_usage/config/etc/gshadow
rename to tests/convtools/31_pwconv_usage/config/etc/gshadow
diff --git a/tests/tests/convtools/31_pwconv_usage/config/etc/passwd b/tests/convtools/31_pwconv_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/31_pwconv_usage/config/etc/passwd
rename to tests/convtools/31_pwconv_usage/config/etc/passwd
diff --git a/tests/tests/convtools/31_pwconv_usage/config/etc/shadow b/tests/convtools/31_pwconv_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/31_pwconv_usage/config/etc/shadow
rename to tests/convtools/31_pwconv_usage/config/etc/shadow
diff --git a/tests/tests/convtools/31_pwconv_usage/data/usage.out b/tests/convtools/31_pwconv_usage/data/usage.out
similarity index 100%
rename from tests/tests/convtools/31_pwconv_usage/data/usage.out
rename to tests/convtools/31_pwconv_usage/data/usage.out
diff --git a/tests/tests/convtools/31_pwconv_usage/pwconv.test b/tests/convtools/31_pwconv_usage/pwconv.test
similarity index 100%
rename from tests/tests/convtools/31_pwconv_usage/pwconv.test
rename to tests/convtools/31_pwconv_usage/pwconv.test
diff --git a/tests/tests/convtools/32_pwconv_usage_extra_arg/config.txt b/tests/convtools/32_pwconv_usage_extra_arg/config.txt
similarity index 100%
rename from tests/tests/convtools/32_pwconv_usage_extra_arg/config.txt
rename to tests/convtools/32_pwconv_usage_extra_arg/config.txt
diff --git a/tests/tests/convtools/32_pwconv_usage_extra_arg/config/etc/group b/tests/convtools/32_pwconv_usage_extra_arg/config/etc/group
similarity index 100%
rename from tests/tests/convtools/32_pwconv_usage_extra_arg/config/etc/group
rename to tests/convtools/32_pwconv_usage_extra_arg/config/etc/group
diff --git a/tests/tests/convtools/32_pwconv_usage_extra_arg/config/etc/gshadow b/tests/convtools/32_pwconv_usage_extra_arg/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/32_pwconv_usage_extra_arg/config/etc/gshadow
rename to tests/convtools/32_pwconv_usage_extra_arg/config/etc/gshadow
diff --git a/tests/tests/convtools/32_pwconv_usage_extra_arg/config/etc/passwd b/tests/convtools/32_pwconv_usage_extra_arg/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/32_pwconv_usage_extra_arg/config/etc/passwd
rename to tests/convtools/32_pwconv_usage_extra_arg/config/etc/passwd
diff --git a/tests/tests/convtools/32_pwconv_usage_extra_arg/config/etc/shadow b/tests/convtools/32_pwconv_usage_extra_arg/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/32_pwconv_usage_extra_arg/config/etc/shadow
rename to tests/convtools/32_pwconv_usage_extra_arg/config/etc/shadow
diff --git a/tests/tests/convtools/32_pwconv_usage_extra_arg/data/usage.out b/tests/convtools/32_pwconv_usage_extra_arg/data/usage.out
similarity index 100%
rename from tests/tests/convtools/32_pwconv_usage_extra_arg/data/usage.out
rename to tests/convtools/32_pwconv_usage_extra_arg/data/usage.out
diff --git a/tests/tests/convtools/32_pwconv_usage_extra_arg/pwconv.test b/tests/convtools/32_pwconv_usage_extra_arg/pwconv.test
similarity index 100%
rename from tests/tests/convtools/32_pwconv_usage_extra_arg/pwconv.test
rename to tests/convtools/32_pwconv_usage_extra_arg/pwconv.test
diff --git a/tests/tests/convtools/33_grpunconv_usage/config.txt b/tests/convtools/33_grpunconv_usage/config.txt
similarity index 100%
rename from tests/tests/convtools/33_grpunconv_usage/config.txt
rename to tests/convtools/33_grpunconv_usage/config.txt
diff --git a/tests/tests/convtools/33_grpunconv_usage/config/etc/group b/tests/convtools/33_grpunconv_usage/config/etc/group
similarity index 100%
rename from tests/tests/convtools/33_grpunconv_usage/config/etc/group
rename to tests/convtools/33_grpunconv_usage/config/etc/group
diff --git a/tests/tests/convtools/33_grpunconv_usage/config/etc/gshadow b/tests/convtools/33_grpunconv_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/33_grpunconv_usage/config/etc/gshadow
rename to tests/convtools/33_grpunconv_usage/config/etc/gshadow
diff --git a/tests/tests/convtools/33_grpunconv_usage/config/etc/passwd b/tests/convtools/33_grpunconv_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/33_grpunconv_usage/config/etc/passwd
rename to tests/convtools/33_grpunconv_usage/config/etc/passwd
diff --git a/tests/tests/convtools/33_grpunconv_usage/config/etc/shadow b/tests/convtools/33_grpunconv_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/33_grpunconv_usage/config/etc/shadow
rename to tests/convtools/33_grpunconv_usage/config/etc/shadow
diff --git a/tests/tests/convtools/33_grpunconv_usage/data/usage.out b/tests/convtools/33_grpunconv_usage/data/usage.out
similarity index 100%
rename from tests/tests/convtools/33_grpunconv_usage/data/usage.out
rename to tests/convtools/33_grpunconv_usage/data/usage.out
diff --git a/tests/tests/convtools/33_grpunconv_usage/grpunconv.test b/tests/convtools/33_grpunconv_usage/grpunconv.test
similarity index 100%
rename from tests/tests/convtools/33_grpunconv_usage/grpunconv.test
rename to tests/convtools/33_grpunconv_usage/grpunconv.test
diff --git a/tests/tests/convtools/34_grpunconv_usage_extra_arg/config.txt b/tests/convtools/34_grpunconv_usage_extra_arg/config.txt
similarity index 100%
rename from tests/tests/convtools/34_grpunconv_usage_extra_arg/config.txt
rename to tests/convtools/34_grpunconv_usage_extra_arg/config.txt
diff --git a/tests/tests/convtools/34_grpunconv_usage_extra_arg/config/etc/group b/tests/convtools/34_grpunconv_usage_extra_arg/config/etc/group
similarity index 100%
rename from tests/tests/convtools/34_grpunconv_usage_extra_arg/config/etc/group
rename to tests/convtools/34_grpunconv_usage_extra_arg/config/etc/group
diff --git a/tests/tests/convtools/34_grpunconv_usage_extra_arg/config/etc/gshadow b/tests/convtools/34_grpunconv_usage_extra_arg/config/etc/gshadow
similarity index 100%
rename from tests/tests/convtools/34_grpunconv_usage_extra_arg/config/etc/gshadow
rename to tests/convtools/34_grpunconv_usage_extra_arg/config/etc/gshadow
diff --git a/tests/tests/convtools/34_grpunconv_usage_extra_arg/config/etc/passwd b/tests/convtools/34_grpunconv_usage_extra_arg/config/etc/passwd
similarity index 100%
rename from tests/tests/convtools/34_grpunconv_usage_extra_arg/config/etc/passwd
rename to tests/convtools/34_grpunconv_usage_extra_arg/config/etc/passwd
diff --git a/tests/tests/convtools/34_grpunconv_usage_extra_arg/config/etc/shadow b/tests/convtools/34_grpunconv_usage_extra_arg/config/etc/shadow
similarity index 100%
rename from tests/tests/convtools/34_grpunconv_usage_extra_arg/config/etc/shadow
rename to tests/convtools/34_grpunconv_usage_extra_arg/config/etc/shadow
diff --git a/tests/tests/convtools/34_grpunconv_usage_extra_arg/data/usage.out b/tests/convtools/34_grpunconv_usage_extra_arg/data/usage.out
similarity index 100%
rename from tests/tests/convtools/34_grpunconv_usage_extra_arg/data/usage.out
rename to tests/convtools/34_grpunconv_usage_extra_arg/data/usage.out
diff --git a/tests/tests/convtools/34_grpunconv_usage_extra_arg/grpunconv.test b/tests/convtools/34_grpunconv_usage_extra_arg/grpunconv.test
similarity index 100%
rename from tests/tests/convtools/34_grpunconv_usage_extra_arg/grpunconv.test
rename to tests/convtools/34_grpunconv_usage_extra_arg/grpunconv.test
diff --git a/tests/tests/coverage.sh b/tests/coverage.sh
similarity index 100%
rename from tests/tests/coverage.sh
rename to tests/coverage.sh
diff --git a/tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd.test b/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd.test
rename to tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd.test
diff --git a/tests/tests/cptools/01/data/group b/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/group
similarity index 100%
rename from tests/tests/cptools/01/data/group
rename to tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/group
diff --git a/tests/tests/cptools/01/data/gshadow b/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/gshadow
similarity index 100%
rename from tests/tests/cptools/01/data/gshadow
rename to tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/gshadow
diff --git a/tests/tests/cptools/01/data/passwd b/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/passwd
similarity index 100%
rename from tests/tests/cptools/01/data/passwd
rename to tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/passwd
diff --git a/tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/shadow b/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/shadow
rename to tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/shadow
diff --git a/tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/group b/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/group
rename to tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/group
diff --git a/tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/gshadow b/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/gshadow
rename to tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/gshadow
diff --git a/tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/login.defs b/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/login.defs
similarity index 100%
rename from tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/login.defs
rename to tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/login.defs
diff --git a/tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/passwd b/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/passwd
rename to tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/passwd
diff --git a/tests/tests/cptools/01/data/shadow b/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/shadow
similarity index 100%
rename from tests/tests/cptools/01/data/shadow
rename to tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/shadow
diff --git a/tests/tests/crypt/login.defs_DES/01_chpasswd.test b/tests/crypt/login.defs_DES/01_chpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/01_chpasswd.test
rename to tests/crypt/login.defs_DES/01_chpasswd.test
diff --git a/tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/group b/tests/crypt/login.defs_DES/01_chpasswd/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/group
rename to tests/crypt/login.defs_DES/01_chpasswd/group
diff --git a/tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/gshadow b/tests/crypt/login.defs_DES/01_chpasswd/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/gshadow
rename to tests/crypt/login.defs_DES/01_chpasswd/gshadow
diff --git a/tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/passwd b/tests/crypt/login.defs_DES/01_chpasswd/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/passwd
rename to tests/crypt/login.defs_DES/01_chpasswd/passwd
diff --git a/tests/tests/crypt/login.defs_DES/01_chpasswd/shadow b/tests/crypt/login.defs_DES/01_chpasswd/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/01_chpasswd/shadow
rename to tests/crypt/login.defs_DES/01_chpasswd/shadow
diff --git a/tests/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5.test b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5.test
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5.test
rename to tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5.test
diff --git a/tests/tests/crypt/login.defs_DES/01_chpasswd/group b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/01_chpasswd/group
rename to tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/group
diff --git a/tests/tests/crypt/login.defs_DES/01_chpasswd/gshadow b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/01_chpasswd/gshadow
rename to tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/gshadow
diff --git a/tests/tests/crypt/login.defs_DES/01_chpasswd/passwd b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/01_chpasswd/passwd
rename to tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd
diff --git a/tests/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd.new b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd.new
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd.new
rename to tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd.new
diff --git a/tests/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/shadow b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/shadow
rename to tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/shadow
diff --git a/tests/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES.test b/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES.test
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES.test
rename to tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES.test
diff --git a/tests/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/group b/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/group
rename to tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/group
diff --git a/tests/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/gshadow b/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/gshadow
rename to tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/gshadow
diff --git a/tests/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd b/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd
rename to tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/passwd
diff --git a/tests/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/shadow b/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/shadow
rename to tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/shadow
diff --git a/tests/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE.test b/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE.test
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE.test
rename to tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE.test
diff --git a/tests/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/group b/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/group
rename to tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/group
diff --git a/tests/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/gshadow b/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/gshadow
rename to tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/gshadow
diff --git a/tests/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/passwd b/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/passwd
rename to tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/passwd
diff --git a/tests/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/shadow b/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/shadow
rename to tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/shadow
diff --git a/tests/tests/crypt/login.defs_DES/05_chpasswd-e.test b/tests/crypt/login.defs_DES/05_chpasswd-e.test
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/05_chpasswd-e.test
rename to tests/crypt/login.defs_DES/05_chpasswd-e.test
diff --git a/tests/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/group b/tests/crypt/login.defs_DES/05_chpasswd-e/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/group
rename to tests/crypt/login.defs_DES/05_chpasswd-e/group
diff --git a/tests/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/gshadow b/tests/crypt/login.defs_DES/05_chpasswd-e/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/gshadow
rename to tests/crypt/login.defs_DES/05_chpasswd-e/gshadow
diff --git a/tests/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/passwd b/tests/crypt/login.defs_DES/05_chpasswd-e/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/passwd
rename to tests/crypt/login.defs_DES/05_chpasswd-e/passwd
diff --git a/tests/tests/crypt/login.defs_DES/05_chpasswd-e/shadow b/tests/crypt/login.defs_DES/05_chpasswd-e/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/05_chpasswd-e/shadow
rename to tests/crypt/login.defs_DES/05_chpasswd-e/shadow
diff --git a/tests/tests/crypt/login.defs_DES/06_chpasswd-m.test b/tests/crypt/login.defs_DES/06_chpasswd-m.test
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/06_chpasswd-m.test
rename to tests/crypt/login.defs_DES/06_chpasswd-m.test
diff --git a/tests/tests/crypt/login.defs_DES/05_chpasswd-e/group b/tests/crypt/login.defs_DES/06_chpasswd-m/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/05_chpasswd-e/group
rename to tests/crypt/login.defs_DES/06_chpasswd-m/group
diff --git a/tests/tests/crypt/login.defs_DES/05_chpasswd-e/gshadow b/tests/crypt/login.defs_DES/06_chpasswd-m/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/05_chpasswd-e/gshadow
rename to tests/crypt/login.defs_DES/06_chpasswd-m/gshadow
diff --git a/tests/tests/crypt/login.defs_DES/05_chpasswd-e/passwd b/tests/crypt/login.defs_DES/06_chpasswd-m/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/05_chpasswd-e/passwd
rename to tests/crypt/login.defs_DES/06_chpasswd-m/passwd
diff --git a/tests/tests/crypt/login.defs_DES/06_chpasswd-m/shadow b/tests/crypt/login.defs_DES/06_chpasswd-m/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/06_chpasswd-m/shadow
rename to tests/crypt/login.defs_DES/06_chpasswd-m/shadow
diff --git a/tests/tests/crypt/login.defs_DES/07_chgpasswd.test b/tests/crypt/login.defs_DES/07_chgpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/07_chgpasswd.test
rename to tests/crypt/login.defs_DES/07_chgpasswd.test
diff --git a/tests/tests/crypt/login.defs_DES/06_chpasswd-m/group b/tests/crypt/login.defs_DES/07_chgpasswd/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/06_chpasswd-m/group
rename to tests/crypt/login.defs_DES/07_chgpasswd/group
diff --git a/tests/tests/crypt/login.defs_DES/07_chgpasswd/gshadow b/tests/crypt/login.defs_DES/07_chgpasswd/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/07_chgpasswd/gshadow
rename to tests/crypt/login.defs_DES/07_chgpasswd/gshadow
diff --git a/tests/tests/crypt/login.defs_DES/06_chpasswd-m/passwd b/tests/crypt/login.defs_DES/07_chgpasswd/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/06_chpasswd-m/passwd
rename to tests/crypt/login.defs_DES/07_chgpasswd/passwd
diff --git a/tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/shadow b/tests/crypt/login.defs_DES/07_chgpasswd/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/shadow
rename to tests/crypt/login.defs_DES/07_chgpasswd/shadow
diff --git a/tests/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5.test b/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5.test
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5.test
rename to tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5.test
diff --git a/tests/tests/crypt/login.defs_DES/07_chgpasswd/group b/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/07_chgpasswd/group
rename to tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/group
diff --git a/tests/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/gshadow b/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/gshadow
rename to tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/gshadow
diff --git a/tests/tests/crypt/login.defs_DES/07_chgpasswd/passwd b/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/07_chgpasswd/passwd
rename to tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/passwd
diff --git a/tests/tests/crypt/login.defs_DES/07_chgpasswd/shadow b/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/07_chgpasswd/shadow
rename to tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/shadow
diff --git a/tests/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES.test b/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES.test
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES.test
rename to tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES.test
diff --git a/tests/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/group b/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/group
rename to tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/group
diff --git a/tests/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/gshadow b/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/gshadow
rename to tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/gshadow
diff --git a/tests/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/passwd b/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/passwd
rename to tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/passwd
diff --git a/tests/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/shadow b/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/shadow
rename to tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/shadow
diff --git a/tests/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE.test b/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE.test
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE.test
rename to tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE.test
diff --git a/tests/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/group b/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/group
rename to tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/group
diff --git a/tests/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/gshadow b/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/gshadow
rename to tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/gshadow
diff --git a/tests/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/passwd b/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/passwd
rename to tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/passwd
diff --git a/tests/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/shadow b/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/shadow
rename to tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/shadow
diff --git a/tests/tests/crypt/login.defs_DES/11_chgpasswd-e.test b/tests/crypt/login.defs_DES/11_chgpasswd-e.test
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/11_chgpasswd-e.test
rename to tests/crypt/login.defs_DES/11_chgpasswd-e.test
diff --git a/tests/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/group b/tests/crypt/login.defs_DES/11_chgpasswd-e/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/group
rename to tests/crypt/login.defs_DES/11_chgpasswd-e/group
diff --git a/tests/tests/crypt/login.defs_DES/11_chgpasswd-e/gshadow b/tests/crypt/login.defs_DES/11_chgpasswd-e/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/11_chgpasswd-e/gshadow
rename to tests/crypt/login.defs_DES/11_chgpasswd-e/gshadow
diff --git a/tests/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/passwd b/tests/crypt/login.defs_DES/11_chgpasswd-e/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/passwd
rename to tests/crypt/login.defs_DES/11_chgpasswd-e/passwd
diff --git a/tests/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/shadow b/tests/crypt/login.defs_DES/11_chgpasswd-e/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/shadow
rename to tests/crypt/login.defs_DES/11_chgpasswd-e/shadow
diff --git a/tests/tests/crypt/login.defs_DES/12_chgpasswd-m.test b/tests/crypt/login.defs_DES/12_chgpasswd-m.test
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/12_chgpasswd-m.test
rename to tests/crypt/login.defs_DES/12_chgpasswd-m.test
diff --git a/tests/tests/crypt/login.defs_DES/11_chgpasswd-e/group b/tests/crypt/login.defs_DES/12_chgpasswd-m/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/11_chgpasswd-e/group
rename to tests/crypt/login.defs_DES/12_chgpasswd-m/group
diff --git a/tests/tests/crypt/login.defs_DES/12_chgpasswd-m/gshadow b/tests/crypt/login.defs_DES/12_chgpasswd-m/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/12_chgpasswd-m/gshadow
rename to tests/crypt/login.defs_DES/12_chgpasswd-m/gshadow
diff --git a/tests/tests/crypt/login.defs_DES/11_chgpasswd-e/passwd b/tests/crypt/login.defs_DES/12_chgpasswd-m/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/11_chgpasswd-e/passwd
rename to tests/crypt/login.defs_DES/12_chgpasswd-m/passwd
diff --git a/tests/tests/crypt/login.defs_DES/11_chgpasswd-e/shadow b/tests/crypt/login.defs_DES/12_chgpasswd-m/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/11_chgpasswd-e/shadow
rename to tests/crypt/login.defs_DES/12_chgpasswd-m/shadow
diff --git a/tests/tests/crypt/login.defs_DES/12_chgpasswd-m/group b/tests/crypt/login.defs_DES/config/etc/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/12_chgpasswd-m/group
rename to tests/crypt/login.defs_DES/config/etc/group
diff --git a/tests/tests/crypt/login.defs_DES/06_chpasswd-m/gshadow b/tests/crypt/login.defs_DES/config/etc/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/06_chpasswd-m/gshadow
rename to tests/crypt/login.defs_DES/config/etc/gshadow
diff --git a/tests/tests/crypt/login.defs_DES/config/etc/login.defs b/tests/crypt/login.defs_DES/config/etc/login.defs
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/config/etc/login.defs
rename to tests/crypt/login.defs_DES/config/etc/login.defs
diff --git a/tests/tests/crypt/login.defs_DES/12_chgpasswd-m/passwd b/tests/crypt/login.defs_DES/config/etc/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/12_chgpasswd-m/passwd
rename to tests/crypt/login.defs_DES/config/etc/passwd
diff --git a/tests/tests/crypt/login.defs_DES/12_chgpasswd-m/shadow b/tests/crypt/login.defs_DES/config/etc/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/12_chgpasswd-m/shadow
rename to tests/crypt/login.defs_DES/config/etc/shadow
diff --git a/tests/tests/crypt/login.defs_MD5/01_chpasswd.test b/tests/crypt/login.defs_MD5/01_chpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/01_chpasswd.test
rename to tests/crypt/login.defs_MD5/01_chpasswd.test
diff --git a/tests/tests/crypt/login.defs_DES/config/etc/group b/tests/crypt/login.defs_MD5/01_chpasswd/group
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/config/etc/group
rename to tests/crypt/login.defs_MD5/01_chpasswd/group
diff --git a/tests/tests/crypt/login.defs_DES/config/etc/gshadow b/tests/crypt/login.defs_MD5/01_chpasswd/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/config/etc/gshadow
rename to tests/crypt/login.defs_MD5/01_chpasswd/gshadow
diff --git a/tests/tests/crypt/login.defs_DES/config/etc/passwd b/tests/crypt/login.defs_MD5/01_chpasswd/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/config/etc/passwd
rename to tests/crypt/login.defs_MD5/01_chpasswd/passwd
diff --git a/tests/tests/crypt/login.defs_MD5/01_chpasswd/shadow b/tests/crypt/login.defs_MD5/01_chpasswd/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/01_chpasswd/shadow
rename to tests/crypt/login.defs_MD5/01_chpasswd/shadow
diff --git a/tests/tests/crypt/login.defs_MD5/02_chgpasswd.test b/tests/crypt/login.defs_MD5/02_chgpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/02_chgpasswd.test
rename to tests/crypt/login.defs_MD5/02_chgpasswd.test
diff --git a/tests/tests/crypt/login.defs_MD5/01_chpasswd/group b/tests/crypt/login.defs_MD5/02_chgpasswd/group
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/01_chpasswd/group
rename to tests/crypt/login.defs_MD5/02_chgpasswd/group
diff --git a/tests/tests/crypt/login.defs_MD5/02_chgpasswd/gshadow b/tests/crypt/login.defs_MD5/02_chgpasswd/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/02_chgpasswd/gshadow
rename to tests/crypt/login.defs_MD5/02_chgpasswd/gshadow
diff --git a/tests/tests/crypt/login.defs_MD5/01_chpasswd/passwd b/tests/crypt/login.defs_MD5/02_chgpasswd/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/01_chpasswd/passwd
rename to tests/crypt/login.defs_MD5/02_chgpasswd/passwd
diff --git a/tests/tests/crypt/login.defs_DES/config/etc/shadow b/tests/crypt/login.defs_MD5/02_chgpasswd/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_DES/config/etc/shadow
rename to tests/crypt/login.defs_MD5/02_chgpasswd/shadow
diff --git a/tests/tests/crypt/login.defs_MD5/02_chgpasswd/group b/tests/crypt/login.defs_MD5/config/etc/group
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/02_chgpasswd/group
rename to tests/crypt/login.defs_MD5/config/etc/group
diff --git a/tests/tests/crypt/login.defs_MD5/01_chpasswd/gshadow b/tests/crypt/login.defs_MD5/config/etc/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/01_chpasswd/gshadow
rename to tests/crypt/login.defs_MD5/config/etc/gshadow
diff --git a/tests/tests/crypt/login.defs_MD5/config/etc/login.defs b/tests/crypt/login.defs_MD5/config/etc/login.defs
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/config/etc/login.defs
rename to tests/crypt/login.defs_MD5/config/etc/login.defs
diff --git a/tests/tests/crypt/login.defs_MD5/02_chgpasswd/passwd b/tests/crypt/login.defs_MD5/config/etc/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/02_chgpasswd/passwd
rename to tests/crypt/login.defs_MD5/config/etc/passwd
diff --git a/tests/tests/crypt/login.defs_MD5/02_chgpasswd/shadow b/tests/crypt/login.defs_MD5/config/etc/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/02_chgpasswd/shadow
rename to tests/crypt/login.defs_MD5/config/etc/shadow
diff --git a/tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd.test b/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd.test
rename to tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd.test
diff --git a/tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/shadow b/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/shadow
rename to tests/crypt/login.defs_MD5_CRYPT_ENAB/01_chpasswd/shadow
diff --git a/tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd.test b/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd.test
rename to tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd.test
diff --git a/tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/gshadow b/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/gshadow
rename to tests/crypt/login.defs_MD5_CRYPT_ENAB/02_chgpasswd/gshadow
diff --git a/tests/tests/crypt/login.defs_MD5/config/etc/group b/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/group
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/config/etc/group
rename to tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/group
diff --git a/tests/tests/crypt/login.defs_MD5/config/etc/gshadow b/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/config/etc/gshadow
rename to tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/gshadow
diff --git a/tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/login.defs b/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/login.defs
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/login.defs
rename to tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/login.defs
diff --git a/tests/tests/crypt/login.defs_MD5/config/etc/passwd b/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/config/etc/passwd
rename to tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/passwd
diff --git a/tests/tests/crypt/login.defs_MD5/config/etc/shadow b/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5/config/etc/shadow
rename to tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/shadow
diff --git a/tests/tests/crypt/login.defs_SHA256-round-max/01_chpasswd.test b/tests/crypt/login.defs_SHA256-round-max/01_chpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-max/01_chpasswd.test
rename to tests/crypt/login.defs_SHA256-round-max/01_chpasswd.test
diff --git a/tests/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/shadow b/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-max/01_chpasswd/shadow
rename to tests/crypt/login.defs_SHA256-round-max/01_chpasswd/shadow
diff --git a/tests/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd.test b/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd.test
rename to tests/crypt/login.defs_SHA256-round-max/02_chgpasswd.test
diff --git a/tests/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/gshadow b/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/gshadow
rename to tests/crypt/login.defs_SHA256-round-max/02_chgpasswd/gshadow
diff --git a/tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/group b/tests/crypt/login.defs_SHA256-round-max/config/etc/group
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/group
rename to tests/crypt/login.defs_SHA256-round-max/config/etc/group
diff --git a/tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/gshadow b/tests/crypt/login.defs_SHA256-round-max/config/etc/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/gshadow
rename to tests/crypt/login.defs_SHA256-round-max/config/etc/gshadow
diff --git a/tests/tests/crypt/login.defs_SHA256-round-max/config/etc/login.defs b/tests/crypt/login.defs_SHA256-round-max/config/etc/login.defs
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-max/config/etc/login.defs
rename to tests/crypt/login.defs_SHA256-round-max/config/etc/login.defs
diff --git a/tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/passwd b/tests/crypt/login.defs_SHA256-round-max/config/etc/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/passwd
rename to tests/crypt/login.defs_SHA256-round-max/config/etc/passwd
diff --git a/tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/shadow b/tests/crypt/login.defs_SHA256-round-max/config/etc/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/shadow
rename to tests/crypt/login.defs_SHA256-round-max/config/etc/shadow
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd.test b/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd.test
rename to tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd.test
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/shadow b/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/shadow
rename to tests/crypt/login.defs_SHA256-round-min-max/01_chpasswd/shadow
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd.test b/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd.test
rename to tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd.test
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/gshadow b/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/gshadow
rename to tests/crypt/login.defs_SHA256-round-min-max/02_chgpasswd/gshadow
diff --git a/tests/tests/crypt/login.defs_SHA256-round-max/config/etc/group b/tests/crypt/login.defs_SHA256-round-min-max/config/etc/group
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-max/config/etc/group
rename to tests/crypt/login.defs_SHA256-round-min-max/config/etc/group
diff --git a/tests/tests/crypt/login.defs_SHA256-round-max/config/etc/gshadow b/tests/crypt/login.defs_SHA256-round-min-max/config/etc/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-max/config/etc/gshadow
rename to tests/crypt/login.defs_SHA256-round-min-max/config/etc/gshadow
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min-max/config/etc/login.defs b/tests/crypt/login.defs_SHA256-round-min-max/config/etc/login.defs
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min-max/config/etc/login.defs
rename to tests/crypt/login.defs_SHA256-round-min-max/config/etc/login.defs
diff --git a/tests/tests/crypt/login.defs_SHA256-round-max/config/etc/passwd b/tests/crypt/login.defs_SHA256-round-min-max/config/etc/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-max/config/etc/passwd
rename to tests/crypt/login.defs_SHA256-round-min-max/config/etc/passwd
diff --git a/tests/tests/crypt/login.defs_SHA256-round-max/config/etc/shadow b/tests/crypt/login.defs_SHA256-round-min-max/config/etc/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-max/config/etc/shadow
rename to tests/crypt/login.defs_SHA256-round-min-max/config/etc/shadow
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min/01_chpasswd.test b/tests/crypt/login.defs_SHA256-round-min/01_chpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min/01_chpasswd.test
rename to tests/crypt/login.defs_SHA256-round-min/01_chpasswd.test
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/shadow b/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min/01_chpasswd/shadow
rename to tests/crypt/login.defs_SHA256-round-min/01_chpasswd/shadow
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd.test b/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd.test
rename to tests/crypt/login.defs_SHA256-round-min/02_chgpasswd.test
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/gshadow b/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/gshadow
rename to tests/crypt/login.defs_SHA256-round-min/02_chgpasswd/gshadow
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min-max/config/etc/group b/tests/crypt/login.defs_SHA256-round-min/config/etc/group
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min-max/config/etc/group
rename to tests/crypt/login.defs_SHA256-round-min/config/etc/group
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min-max/config/etc/gshadow b/tests/crypt/login.defs_SHA256-round-min/config/etc/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min-max/config/etc/gshadow
rename to tests/crypt/login.defs_SHA256-round-min/config/etc/gshadow
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min/config/etc/login.defs b/tests/crypt/login.defs_SHA256-round-min/config/etc/login.defs
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min/config/etc/login.defs
rename to tests/crypt/login.defs_SHA256-round-min/config/etc/login.defs
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min-max/config/etc/passwd b/tests/crypt/login.defs_SHA256-round-min/config/etc/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min-max/config/etc/passwd
rename to tests/crypt/login.defs_SHA256-round-min/config/etc/passwd
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min-max/config/etc/shadow b/tests/crypt/login.defs_SHA256-round-min/config/etc/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min-max/config/etc/shadow
rename to tests/crypt/login.defs_SHA256-round-min/config/etc/shadow
diff --git a/tests/tests/crypt/login.defs_SHA256/01_chpasswd.test b/tests/crypt/login.defs_SHA256/01_chpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256/01_chpasswd.test
rename to tests/crypt/login.defs_SHA256/01_chpasswd.test
diff --git a/tests/tests/crypt/login.defs_SHA256/01_chpasswd/shadow b/tests/crypt/login.defs_SHA256/01_chpasswd/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256/01_chpasswd/shadow
rename to tests/crypt/login.defs_SHA256/01_chpasswd/shadow
diff --git a/tests/tests/crypt/login.defs_SHA256/02_chgpasswd.test b/tests/crypt/login.defs_SHA256/02_chgpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256/02_chgpasswd.test
rename to tests/crypt/login.defs_SHA256/02_chgpasswd.test
diff --git a/tests/tests/crypt/login.defs_SHA256/02_chgpasswd/gshadow b/tests/crypt/login.defs_SHA256/02_chgpasswd/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256/02_chgpasswd/gshadow
rename to tests/crypt/login.defs_SHA256/02_chgpasswd/gshadow
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min/config/etc/group b/tests/crypt/login.defs_SHA256/config/etc/group
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min/config/etc/group
rename to tests/crypt/login.defs_SHA256/config/etc/group
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min/config/etc/gshadow b/tests/crypt/login.defs_SHA256/config/etc/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min/config/etc/gshadow
rename to tests/crypt/login.defs_SHA256/config/etc/gshadow
diff --git a/tests/tests/crypt/login.defs_SHA256/config/etc/login.defs b/tests/crypt/login.defs_SHA256/config/etc/login.defs
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256/config/etc/login.defs
rename to tests/crypt/login.defs_SHA256/config/etc/login.defs
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min/config/etc/passwd b/tests/crypt/login.defs_SHA256/config/etc/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min/config/etc/passwd
rename to tests/crypt/login.defs_SHA256/config/etc/passwd
diff --git a/tests/tests/crypt/login.defs_SHA256-round-min/config/etc/shadow b/tests/crypt/login.defs_SHA256/config/etc/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256-round-min/config/etc/shadow
rename to tests/crypt/login.defs_SHA256/config/etc/shadow
diff --git a/tests/tests/crypt/login.defs_SHA512/01_chpasswd.test b/tests/crypt/login.defs_SHA512/01_chpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA512/01_chpasswd.test
rename to tests/crypt/login.defs_SHA512/01_chpasswd.test
diff --git a/tests/tests/crypt/login.defs_SHA512/01_chpasswd/shadow b/tests/crypt/login.defs_SHA512/01_chpasswd/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA512/01_chpasswd/shadow
rename to tests/crypt/login.defs_SHA512/01_chpasswd/shadow
diff --git a/tests/tests/crypt/login.defs_SHA512/02_chgpasswd.test b/tests/crypt/login.defs_SHA512/02_chgpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA512/02_chgpasswd.test
rename to tests/crypt/login.defs_SHA512/02_chgpasswd.test
diff --git a/tests/tests/crypt/login.defs_SHA512/02_chgpasswd/gshadow b/tests/crypt/login.defs_SHA512/02_chgpasswd/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA512/02_chgpasswd/gshadow
rename to tests/crypt/login.defs_SHA512/02_chgpasswd/gshadow
diff --git a/tests/tests/crypt/login.defs_SHA256/config/etc/group b/tests/crypt/login.defs_SHA512/config/etc/group
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256/config/etc/group
rename to tests/crypt/login.defs_SHA512/config/etc/group
diff --git a/tests/tests/crypt/login.defs_SHA256/config/etc/gshadow b/tests/crypt/login.defs_SHA512/config/etc/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256/config/etc/gshadow
rename to tests/crypt/login.defs_SHA512/config/etc/gshadow
diff --git a/tests/tests/crypt/login.defs_SHA512/config/etc/login.defs b/tests/crypt/login.defs_SHA512/config/etc/login.defs
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA512/config/etc/login.defs
rename to tests/crypt/login.defs_SHA512/config/etc/login.defs
diff --git a/tests/tests/crypt/login.defs_SHA256/config/etc/passwd b/tests/crypt/login.defs_SHA512/config/etc/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256/config/etc/passwd
rename to tests/crypt/login.defs_SHA512/config/etc/passwd
diff --git a/tests/tests/crypt/login.defs_SHA256/config/etc/shadow b/tests/crypt/login.defs_SHA512/config/etc/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA256/config/etc/shadow
rename to tests/crypt/login.defs_SHA512/config/etc/shadow
diff --git a/tests/tests/crypt/login.defs_none/01_chpasswd.test b/tests/crypt/login.defs_none/01_chpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_none/01_chpasswd.test
rename to tests/crypt/login.defs_none/01_chpasswd.test
diff --git a/tests/tests/crypt/login.defs_none/01_chpasswd/shadow b/tests/crypt/login.defs_none/01_chpasswd/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_none/01_chpasswd/shadow
rename to tests/crypt/login.defs_none/01_chpasswd/shadow
diff --git a/tests/tests/crypt/login.defs_none/02_chgpasswd.test b/tests/crypt/login.defs_none/02_chgpasswd.test
similarity index 100%
rename from tests/tests/crypt/login.defs_none/02_chgpasswd.test
rename to tests/crypt/login.defs_none/02_chgpasswd.test
diff --git a/tests/tests/crypt/login.defs_none/02_chgpasswd/gshadow b/tests/crypt/login.defs_none/02_chgpasswd/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_none/02_chgpasswd/gshadow
rename to tests/crypt/login.defs_none/02_chgpasswd/gshadow
diff --git a/tests/tests/crypt/login.defs_SHA512/config/etc/group b/tests/crypt/login.defs_none/config/etc/group
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA512/config/etc/group
rename to tests/crypt/login.defs_none/config/etc/group
diff --git a/tests/tests/crypt/login.defs_SHA512/config/etc/gshadow b/tests/crypt/login.defs_none/config/etc/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA512/config/etc/gshadow
rename to tests/crypt/login.defs_none/config/etc/gshadow
diff --git a/tests/tests/crypt/login.defs_none/config/etc/login.defs b/tests/crypt/login.defs_none/config/etc/login.defs
similarity index 100%
rename from tests/tests/crypt/login.defs_none/config/etc/login.defs
rename to tests/crypt/login.defs_none/config/etc/login.defs
diff --git a/tests/tests/crypt/login.defs_SHA512/config/etc/passwd b/tests/crypt/login.defs_none/config/etc/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA512/config/etc/passwd
rename to tests/crypt/login.defs_none/config/etc/passwd
diff --git a/tests/tests/crypt/login.defs_SHA512/config/etc/shadow b/tests/crypt/login.defs_none/config/etc/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_SHA512/config/etc/shadow
rename to tests/crypt/login.defs_none/config/etc/shadow
diff --git a/tests/tests/debian/01/data/login_files b/tests/debian/01/data/login_files
similarity index 100%
rename from tests/tests/debian/01/data/login_files
rename to tests/debian/01/data/login_files
diff --git a/tests/tests/debian/01/data/passwd_files b/tests/debian/01/data/passwd_files
similarity index 99%
rename from tests/tests/debian/01/data/passwd_files
rename to tests/debian/01/data/passwd_files
index 78380f45..1afa1ca0 100644
--- a/tests/tests/debian/01/data/passwd_files
+++ b/tests/debian/01/data/passwd_files
@@ -24,8 +24,6 @@
 /usr/sbin
 /usr/sbin/chgpasswd
 /usr/sbin/chpasswd
-/usr/sbin/cpgr
-/usr/sbin/cppw
 /usr/sbin/groupadd
 /usr/sbin/groupdel
 /usr/sbin/groupmems
@@ -245,8 +243,6 @@
 /usr/share/man/man8
 /usr/share/man/man8/chgpasswd.8.gz
 /usr/share/man/man8/chpasswd.8.gz
-/usr/share/man/man8/cpgr.8.gz
-/usr/share/man/man8/cppw.8.gz
 /usr/share/man/man8/groupadd.8.gz
 /usr/share/man/man8/groupdel.8.gz
 /usr/share/man/man8/groupmems.8.gz
diff --git a/tests/tests/debian/01/run b/tests/debian/01/run
similarity index 100%
rename from tests/tests/debian/01/run
rename to tests/debian/01/run
diff --git a/tests/tests/debian/02/run b/tests/debian/02/run
similarity index 100%
rename from tests/tests/debian/02/run
rename to tests/debian/02/run
diff --git a/tests/tests/expiry/01_expiry_-c_no_expiry/config/etc/group b/tests/expiry/01_expiry_-c_no_expiry/config/etc/group
similarity index 100%
rename from tests/tests/expiry/01_expiry_-c_no_expiry/config/etc/group
rename to tests/expiry/01_expiry_-c_no_expiry/config/etc/group
diff --git a/tests/tests/expiry/01_expiry_-c_no_expiry/config/etc/gshadow b/tests/expiry/01_expiry_-c_no_expiry/config/etc/gshadow
similarity index 100%
rename from tests/tests/expiry/01_expiry_-c_no_expiry/config/etc/gshadow
rename to tests/expiry/01_expiry_-c_no_expiry/config/etc/gshadow
diff --git a/tests/tests/expiry/01_expiry_-c_no_expiry/config/etc/passwd b/tests/expiry/01_expiry_-c_no_expiry/config/etc/passwd
similarity index 100%
rename from tests/tests/expiry/01_expiry_-c_no_expiry/config/etc/passwd
rename to tests/expiry/01_expiry_-c_no_expiry/config/etc/passwd
diff --git a/tests/tests/cptools/09_cppw-g/config/etc/shadow b/tests/expiry/01_expiry_-c_no_expiry/config/etc/shadow
similarity index 100%
rename from tests/tests/cptools/09_cppw-g/config/etc/shadow
rename to tests/expiry/01_expiry_-c_no_expiry/config/etc/shadow
diff --git a/tests/tests/expiry/01_expiry_-c_no_expiry/expiry.exp b/tests/expiry/01_expiry_-c_no_expiry/expiry.exp
similarity index 100%
rename from tests/tests/expiry/01_expiry_-c_no_expiry/expiry.exp
rename to tests/expiry/01_expiry_-c_no_expiry/expiry.exp
diff --git a/tests/tests/expiry/01_expiry_-c_no_expiry/expiry.test b/tests/expiry/01_expiry_-c_no_expiry/expiry.test
similarity index 100%
rename from tests/tests/expiry/01_expiry_-c_no_expiry/expiry.test
rename to tests/expiry/01_expiry_-c_no_expiry/expiry.test
diff --git a/tests/tests/expiry/02_expiry_-c_expired/config/etc/group b/tests/expiry/02_expiry_-c_expired/config/etc/group
similarity index 100%
rename from tests/tests/expiry/02_expiry_-c_expired/config/etc/group
rename to tests/expiry/02_expiry_-c_expired/config/etc/group
diff --git a/tests/tests/expiry/02_expiry_-c_expired/config/etc/gshadow b/tests/expiry/02_expiry_-c_expired/config/etc/gshadow
similarity index 100%
rename from tests/tests/expiry/02_expiry_-c_expired/config/etc/gshadow
rename to tests/expiry/02_expiry_-c_expired/config/etc/gshadow
diff --git a/tests/tests/expiry/02_expiry_-c_expired/config/etc/passwd b/tests/expiry/02_expiry_-c_expired/config/etc/passwd
similarity index 100%
rename from tests/tests/expiry/02_expiry_-c_expired/config/etc/passwd
rename to tests/expiry/02_expiry_-c_expired/config/etc/passwd
diff --git a/tests/tests/expiry/02_expiry_-c_expired/config/etc/shadow b/tests/expiry/02_expiry_-c_expired/config/etc/shadow
similarity index 100%
rename from tests/tests/expiry/02_expiry_-c_expired/config/etc/shadow
rename to tests/expiry/02_expiry_-c_expired/config/etc/shadow
diff --git a/tests/tests/expiry/02_expiry_-c_expired/expiry.exp b/tests/expiry/02_expiry_-c_expired/expiry.exp
similarity index 100%
rename from tests/tests/expiry/02_expiry_-c_expired/expiry.exp
rename to tests/expiry/02_expiry_-c_expired/expiry.exp
diff --git a/tests/tests/expiry/02_expiry_-c_expired/expiry.test b/tests/expiry/02_expiry_-c_expired/expiry.test
similarity index 100%
rename from tests/tests/expiry/02_expiry_-c_expired/expiry.test
rename to tests/expiry/02_expiry_-c_expired/expiry.test
diff --git a/tests/tests/expiry/03_expiry_-f_expired/config/etc/group b/tests/expiry/03_expiry_-f_expired/config/etc/group
similarity index 100%
rename from tests/tests/expiry/03_expiry_-f_expired/config/etc/group
rename to tests/expiry/03_expiry_-f_expired/config/etc/group
diff --git a/tests/tests/expiry/03_expiry_-f_expired/config/etc/gshadow b/tests/expiry/03_expiry_-f_expired/config/etc/gshadow
similarity index 100%
rename from tests/tests/expiry/03_expiry_-f_expired/config/etc/gshadow
rename to tests/expiry/03_expiry_-f_expired/config/etc/gshadow
diff --git a/tests/tests/expiry/03_expiry_-f_expired/config/etc/pam.d/common-password b/tests/expiry/03_expiry_-f_expired/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/expiry/03_expiry_-f_expired/config/etc/pam.d/common-password
rename to tests/expiry/03_expiry_-f_expired/config/etc/pam.d/common-password
diff --git a/tests/tests/expiry/03_expiry_-f_expired/config/etc/passwd b/tests/expiry/03_expiry_-f_expired/config/etc/passwd
similarity index 100%
rename from tests/tests/expiry/03_expiry_-f_expired/config/etc/passwd
rename to tests/expiry/03_expiry_-f_expired/config/etc/passwd
diff --git a/tests/tests/expiry/03_expiry_-f_expired/config/etc/shadow b/tests/expiry/03_expiry_-f_expired/config/etc/shadow
similarity index 100%
rename from tests/tests/expiry/03_expiry_-f_expired/config/etc/shadow
rename to tests/expiry/03_expiry_-f_expired/config/etc/shadow
diff --git a/tests/tests/expiry/03_expiry_-f_expired/data/shadow b/tests/expiry/03_expiry_-f_expired/data/shadow
similarity index 100%
rename from tests/tests/expiry/03_expiry_-f_expired/data/shadow
rename to tests/expiry/03_expiry_-f_expired/data/shadow
diff --git a/tests/tests/expiry/03_expiry_-f_expired/expiry.exp b/tests/expiry/03_expiry_-f_expired/expiry.exp
similarity index 100%
rename from tests/tests/expiry/03_expiry_-f_expired/expiry.exp
rename to tests/expiry/03_expiry_-f_expired/expiry.exp
diff --git a/tests/tests/expiry/03_expiry_-f_expired/expiry.test b/tests/expiry/03_expiry_-f_expired/expiry.test
similarity index 100%
rename from tests/tests/expiry/03_expiry_-f_expired/expiry.test
rename to tests/expiry/03_expiry_-f_expired/expiry.test
diff --git a/tests/tests/expiry/04_expiry_no_options/config/etc/group b/tests/expiry/04_expiry_no_options/config/etc/group
similarity index 100%
rename from tests/tests/expiry/04_expiry_no_options/config/etc/group
rename to tests/expiry/04_expiry_no_options/config/etc/group
diff --git a/tests/tests/expiry/04_expiry_no_options/config/etc/gshadow b/tests/expiry/04_expiry_no_options/config/etc/gshadow
similarity index 100%
rename from tests/tests/expiry/04_expiry_no_options/config/etc/gshadow
rename to tests/expiry/04_expiry_no_options/config/etc/gshadow
diff --git a/tests/tests/expiry/04_expiry_no_options/config/etc/passwd b/tests/expiry/04_expiry_no_options/config/etc/passwd
similarity index 100%
rename from tests/tests/expiry/04_expiry_no_options/config/etc/passwd
rename to tests/expiry/04_expiry_no_options/config/etc/passwd
diff --git a/tests/tests/expiry/04_expiry_no_options/config/etc/shadow b/tests/expiry/04_expiry_no_options/config/etc/shadow
similarity index 100%
rename from tests/tests/expiry/04_expiry_no_options/config/etc/shadow
rename to tests/expiry/04_expiry_no_options/config/etc/shadow
diff --git a/tests/tests/expiry/04_expiry_no_options/data/usage.out b/tests/expiry/04_expiry_no_options/data/usage.out
similarity index 100%
rename from tests/tests/expiry/04_expiry_no_options/data/usage.out
rename to tests/expiry/04_expiry_no_options/data/usage.out
diff --git a/tests/tests/expiry/04_expiry_no_options/expiry.test b/tests/expiry/04_expiry_no_options/expiry.test
similarity index 100%
rename from tests/tests/expiry/04_expiry_no_options/expiry.test
rename to tests/expiry/04_expiry_no_options/expiry.test
diff --git a/tests/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/group b/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/group
rename to tests/expiry/05_expiry_-c_no_shadow_file/config/etc/group
diff --git a/tests/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/gshadow b/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/gshadow
rename to tests/expiry/05_expiry_-c_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/passwd b/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/passwd
rename to tests/expiry/05_expiry_-c_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/cptools/10_cppw-g-s/config/etc/shadow b/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/cptools/10_cppw-g-s/config/etc/shadow
rename to tests/expiry/05_expiry_-c_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/expiry/05_expiry_-c_no_shadow_file/expiry.exp b/tests/expiry/05_expiry_-c_no_shadow_file/expiry.exp
similarity index 100%
rename from tests/tests/expiry/05_expiry_-c_no_shadow_file/expiry.exp
rename to tests/expiry/05_expiry_-c_no_shadow_file/expiry.exp
diff --git a/tests/tests/expiry/05_expiry_-c_no_shadow_file/expiry.test b/tests/expiry/05_expiry_-c_no_shadow_file/expiry.test
similarity index 100%
rename from tests/tests/expiry/05_expiry_-c_no_shadow_file/expiry.test
rename to tests/expiry/05_expiry_-c_no_shadow_file/expiry.test
diff --git a/tests/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/group b/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/group
rename to tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/group
diff --git a/tests/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/gshadow b/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/gshadow
rename to tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/passwd b/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/passwd
rename to tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/shadow b/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/shadow
rename to tests/expiry/06_expiry_-c_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.exp b/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.exp
similarity index 100%
rename from tests/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.exp
rename to tests/expiry/06_expiry_-c_no_shadow_entry/expiry.exp
diff --git a/tests/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.test b/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.test
similarity index 100%
rename from tests/tests/expiry/06_expiry_-c_no_shadow_entry/expiry.test
rename to tests/expiry/06_expiry_-c_no_shadow_entry/expiry.test
diff --git a/tests/tests/expiry/07_expiry_-c_expired_account/config/etc/group b/tests/expiry/07_expiry_-c_expired_account/config/etc/group
similarity index 100%
rename from tests/tests/expiry/07_expiry_-c_expired_account/config/etc/group
rename to tests/expiry/07_expiry_-c_expired_account/config/etc/group
diff --git a/tests/tests/expiry/07_expiry_-c_expired_account/config/etc/gshadow b/tests/expiry/07_expiry_-c_expired_account/config/etc/gshadow
similarity index 100%
rename from tests/tests/expiry/07_expiry_-c_expired_account/config/etc/gshadow
rename to tests/expiry/07_expiry_-c_expired_account/config/etc/gshadow
diff --git a/tests/tests/expiry/07_expiry_-c_expired_account/config/etc/passwd b/tests/expiry/07_expiry_-c_expired_account/config/etc/passwd
similarity index 100%
rename from tests/tests/expiry/07_expiry_-c_expired_account/config/etc/passwd
rename to tests/expiry/07_expiry_-c_expired_account/config/etc/passwd
diff --git a/tests/tests/expiry/07_expiry_-c_expired_account/config/etc/shadow b/tests/expiry/07_expiry_-c_expired_account/config/etc/shadow
similarity index 100%
rename from tests/tests/expiry/07_expiry_-c_expired_account/config/etc/shadow
rename to tests/expiry/07_expiry_-c_expired_account/config/etc/shadow
diff --git a/tests/tests/expiry/07_expiry_-c_expired_account/expiry.exp b/tests/expiry/07_expiry_-c_expired_account/expiry.exp
similarity index 100%
rename from tests/tests/expiry/07_expiry_-c_expired_account/expiry.exp
rename to tests/expiry/07_expiry_-c_expired_account/expiry.exp
diff --git a/tests/tests/expiry/07_expiry_-c_expired_account/expiry.test b/tests/expiry/07_expiry_-c_expired_account/expiry.test
similarity index 100%
rename from tests/tests/expiry/07_expiry_-c_expired_account/expiry.test
rename to tests/expiry/07_expiry_-c_expired_account/expiry.test
diff --git a/tests/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/group b/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/group
similarity index 100%
rename from tests/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/group
rename to tests/expiry/08_expiry_-c_expired_max+inact/config/etc/group
diff --git a/tests/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/gshadow b/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/gshadow
similarity index 100%
rename from tests/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/gshadow
rename to tests/expiry/08_expiry_-c_expired_max+inact/config/etc/gshadow
diff --git a/tests/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/passwd b/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/passwd
similarity index 100%
rename from tests/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/passwd
rename to tests/expiry/08_expiry_-c_expired_max+inact/config/etc/passwd
diff --git a/tests/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/shadow b/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/shadow
similarity index 100%
rename from tests/tests/expiry/08_expiry_-c_expired_max+inact/config/etc/shadow
rename to tests/expiry/08_expiry_-c_expired_max+inact/config/etc/shadow
diff --git a/tests/tests/expiry/08_expiry_-c_expired_max+inact/expiry.exp b/tests/expiry/08_expiry_-c_expired_max+inact/expiry.exp
similarity index 100%
rename from tests/tests/expiry/08_expiry_-c_expired_max+inact/expiry.exp
rename to tests/expiry/08_expiry_-c_expired_max+inact/expiry.exp
diff --git a/tests/tests/expiry/08_expiry_-c_expired_max+inact/expiry.test b/tests/expiry/08_expiry_-c_expired_max+inact/expiry.test
similarity index 100%
rename from tests/tests/expiry/08_expiry_-c_expired_max+inact/expiry.test
rename to tests/expiry/08_expiry_-c_expired_max+inact/expiry.test
diff --git a/tests/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/group b/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/group
similarity index 100%
rename from tests/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/group
rename to tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/group
diff --git a/tests/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/gshadow b/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/gshadow
similarity index 100%
rename from tests/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/gshadow
rename to tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/gshadow
diff --git a/tests/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/passwd b/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/passwd
similarity index 100%
rename from tests/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/passwd
rename to tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/passwd
diff --git a/tests/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/shadow b/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/shadow
similarity index 100%
rename from tests/tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/shadow
rename to tests/expiry/09_expiry_-c_expired_not_inactive/config/etc/shadow
diff --git a/tests/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.exp b/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.exp
similarity index 100%
rename from tests/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.exp
rename to tests/expiry/09_expiry_-c_expired_not_inactive/expiry.exp
diff --git a/tests/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.test b/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.test
similarity index 100%
rename from tests/tests/expiry/09_expiry_-c_expired_not_inactive/expiry.test
rename to tests/expiry/09_expiry_-c_expired_not_inactive/expiry.test
diff --git a/tests/tests/expiry/10_expiry_bad_option/config/etc/group b/tests/expiry/10_expiry_bad_option/config/etc/group
similarity index 100%
rename from tests/tests/expiry/10_expiry_bad_option/config/etc/group
rename to tests/expiry/10_expiry_bad_option/config/etc/group
diff --git a/tests/tests/expiry/10_expiry_bad_option/config/etc/gshadow b/tests/expiry/10_expiry_bad_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/expiry/10_expiry_bad_option/config/etc/gshadow
rename to tests/expiry/10_expiry_bad_option/config/etc/gshadow
diff --git a/tests/tests/expiry/10_expiry_bad_option/config/etc/passwd b/tests/expiry/10_expiry_bad_option/config/etc/passwd
similarity index 100%
rename from tests/tests/expiry/10_expiry_bad_option/config/etc/passwd
rename to tests/expiry/10_expiry_bad_option/config/etc/passwd
diff --git a/tests/tests/expiry/10_expiry_bad_option/config/etc/shadow b/tests/expiry/10_expiry_bad_option/config/etc/shadow
similarity index 100%
rename from tests/tests/expiry/10_expiry_bad_option/config/etc/shadow
rename to tests/expiry/10_expiry_bad_option/config/etc/shadow
diff --git a/tests/tests/expiry/10_expiry_bad_option/data/usage.out b/tests/expiry/10_expiry_bad_option/data/usage.out
similarity index 100%
rename from tests/tests/expiry/10_expiry_bad_option/data/usage.out
rename to tests/expiry/10_expiry_bad_option/data/usage.out
diff --git a/tests/tests/expiry/10_expiry_bad_option/expiry.test b/tests/expiry/10_expiry_bad_option/expiry.test
similarity index 100%
rename from tests/tests/expiry/10_expiry_bad_option/expiry.test
rename to tests/expiry/10_expiry_bad_option/expiry.test
diff --git a/tests/tests/expiry/11_expiry_usage/config/etc/group b/tests/expiry/11_expiry_usage/config/etc/group
similarity index 100%
rename from tests/tests/expiry/11_expiry_usage/config/etc/group
rename to tests/expiry/11_expiry_usage/config/etc/group
diff --git a/tests/tests/expiry/11_expiry_usage/config/etc/gshadow b/tests/expiry/11_expiry_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/expiry/11_expiry_usage/config/etc/gshadow
rename to tests/expiry/11_expiry_usage/config/etc/gshadow
diff --git a/tests/tests/expiry/11_expiry_usage/config/etc/passwd b/tests/expiry/11_expiry_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/expiry/11_expiry_usage/config/etc/passwd
rename to tests/expiry/11_expiry_usage/config/etc/passwd
diff --git a/tests/tests/expiry/11_expiry_usage/config/etc/shadow b/tests/expiry/11_expiry_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/expiry/11_expiry_usage/config/etc/shadow
rename to tests/expiry/11_expiry_usage/config/etc/shadow
diff --git a/tests/tests/expiry/11_expiry_usage/data/usage.out b/tests/expiry/11_expiry_usage/data/usage.out
similarity index 100%
rename from tests/tests/expiry/11_expiry_usage/data/usage.out
rename to tests/expiry/11_expiry_usage/data/usage.out
diff --git a/tests/tests/expiry/11_expiry_usage/expiry.test b/tests/expiry/11_expiry_usage/expiry.test
similarity index 100%
rename from tests/tests/expiry/11_expiry_usage/expiry.test
rename to tests/expiry/11_expiry_usage/expiry.test
diff --git a/tests/tests/expiry/12_expiry_extra_arg/config/etc/group b/tests/expiry/12_expiry_extra_arg/config/etc/group
similarity index 100%
rename from tests/tests/expiry/12_expiry_extra_arg/config/etc/group
rename to tests/expiry/12_expiry_extra_arg/config/etc/group
diff --git a/tests/tests/expiry/12_expiry_extra_arg/config/etc/gshadow b/tests/expiry/12_expiry_extra_arg/config/etc/gshadow
similarity index 100%
rename from tests/tests/expiry/12_expiry_extra_arg/config/etc/gshadow
rename to tests/expiry/12_expiry_extra_arg/config/etc/gshadow
diff --git a/tests/tests/expiry/12_expiry_extra_arg/config/etc/passwd b/tests/expiry/12_expiry_extra_arg/config/etc/passwd
similarity index 100%
rename from tests/tests/expiry/12_expiry_extra_arg/config/etc/passwd
rename to tests/expiry/12_expiry_extra_arg/config/etc/passwd
diff --git a/tests/tests/expiry/12_expiry_extra_arg/config/etc/shadow b/tests/expiry/12_expiry_extra_arg/config/etc/shadow
similarity index 100%
rename from tests/tests/expiry/12_expiry_extra_arg/config/etc/shadow
rename to tests/expiry/12_expiry_extra_arg/config/etc/shadow
diff --git a/tests/tests/expiry/12_expiry_extra_arg/data/usage.out b/tests/expiry/12_expiry_extra_arg/data/usage.out
similarity index 100%
rename from tests/tests/expiry/12_expiry_extra_arg/data/usage.out
rename to tests/expiry/12_expiry_extra_arg/data/usage.out
diff --git a/tests/tests/expiry/12_expiry_extra_arg/expiry.test b/tests/expiry/12_expiry_extra_arg/expiry.test
similarity index 100%
rename from tests/tests/expiry/12_expiry_extra_arg/expiry.test
rename to tests/expiry/12_expiry_extra_arg/expiry.test
diff --git a/tests/tests/expiry/13_expiry_usage-c-f/config/etc/group b/tests/expiry/13_expiry_usage-c-f/config/etc/group
similarity index 100%
rename from tests/tests/expiry/13_expiry_usage-c-f/config/etc/group
rename to tests/expiry/13_expiry_usage-c-f/config/etc/group
diff --git a/tests/tests/expiry/13_expiry_usage-c-f/config/etc/gshadow b/tests/expiry/13_expiry_usage-c-f/config/etc/gshadow
similarity index 100%
rename from tests/tests/expiry/13_expiry_usage-c-f/config/etc/gshadow
rename to tests/expiry/13_expiry_usage-c-f/config/etc/gshadow
diff --git a/tests/tests/expiry/13_expiry_usage-c-f/config/etc/passwd b/tests/expiry/13_expiry_usage-c-f/config/etc/passwd
similarity index 100%
rename from tests/tests/expiry/13_expiry_usage-c-f/config/etc/passwd
rename to tests/expiry/13_expiry_usage-c-f/config/etc/passwd
diff --git a/tests/tests/expiry/13_expiry_usage-c-f/config/etc/shadow b/tests/expiry/13_expiry_usage-c-f/config/etc/shadow
similarity index 100%
rename from tests/tests/expiry/13_expiry_usage-c-f/config/etc/shadow
rename to tests/expiry/13_expiry_usage-c-f/config/etc/shadow
diff --git a/tests/tests/expiry/13_expiry_usage-c-f/data/usage.out b/tests/expiry/13_expiry_usage-c-f/data/usage.out
similarity index 100%
rename from tests/tests/expiry/13_expiry_usage-c-f/data/usage.out
rename to tests/expiry/13_expiry_usage-c-f/data/usage.out
diff --git a/tests/tests/expiry/13_expiry_usage-c-f/expiry.test b/tests/expiry/13_expiry_usage-c-f/expiry.test
similarity index 100%
rename from tests/tests/expiry/13_expiry_usage-c-f/expiry.test
rename to tests/expiry/13_expiry_usage-c-f/expiry.test
diff --git a/tests/tests/failures/chage/01_chage_openRW_passwd_failure/chage.test b/tests/failures/chage/01_chage_openRW_passwd_failure/chage.test
similarity index 100%
rename from tests/tests/failures/chage/01_chage_openRW_passwd_failure/chage.test
rename to tests/failures/chage/01_chage_openRW_passwd_failure/chage.test
diff --git a/tests/tests/failures/chage/01_chage_openRW_passwd_failure/config.txt b/tests/failures/chage/01_chage_openRW_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chage/01_chage_openRW_passwd_failure/config.txt
rename to tests/failures/chage/01_chage_openRW_passwd_failure/config.txt
diff --git a/tests/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/group b/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/group
rename to tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/gshadow b/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/gshadow
rename to tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/login.defs b/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/login.defs
rename to tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/passwd b/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/passwd
rename to tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/passwd
diff --git a/tests/tests/cptools/11_cppw-p-s/config/etc/shadow b/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/cptools/11_cppw-p-s/config/etc/shadow
rename to tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/chage/01_chage_openRW_passwd_failure/data/chage.err b/tests/failures/chage/01_chage_openRW_passwd_failure/data/chage.err
similarity index 100%
rename from tests/tests/failures/chage/01_chage_openRW_passwd_failure/data/chage.err
rename to tests/failures/chage/01_chage_openRW_passwd_failure/data/chage.err
diff --git a/tests/tests/failures/chage/02_chage_openRO_passwd_failure/chage.test b/tests/failures/chage/02_chage_openRO_passwd_failure/chage.test
similarity index 100%
rename from tests/tests/failures/chage/02_chage_openRO_passwd_failure/chage.test
rename to tests/failures/chage/02_chage_openRO_passwd_failure/chage.test
diff --git a/tests/tests/failures/chage/02_chage_openRO_passwd_failure/config.txt b/tests/failures/chage/02_chage_openRO_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chage/02_chage_openRO_passwd_failure/config.txt
rename to tests/failures/chage/02_chage_openRO_passwd_failure/config.txt
diff --git a/tests/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/group b/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/group
rename to tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/gshadow b/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/gshadow
rename to tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/login.defs b/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/login.defs
rename to tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/passwd b/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/passwd
rename to tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/passwd
diff --git a/tests/tests/expiry/01_expiry_-c_no_expiry/config/etc/shadow b/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/expiry/01_expiry_-c_no_expiry/config/etc/shadow
rename to tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/chage/02_chage_openRO_passwd_failure/data/chage.err b/tests/failures/chage/02_chage_openRO_passwd_failure/data/chage.err
similarity index 100%
rename from tests/tests/failures/chage/02_chage_openRO_passwd_failure/data/chage.err
rename to tests/failures/chage/02_chage_openRO_passwd_failure/data/chage.err
diff --git a/tests/tests/failures/chage/03_chage_openRW_shadow_failure/chage.test b/tests/failures/chage/03_chage_openRW_shadow_failure/chage.test
similarity index 100%
rename from tests/tests/failures/chage/03_chage_openRW_shadow_failure/chage.test
rename to tests/failures/chage/03_chage_openRW_shadow_failure/chage.test
diff --git a/tests/tests/failures/chage/03_chage_openRW_shadow_failure/config.txt b/tests/failures/chage/03_chage_openRW_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chage/03_chage_openRW_shadow_failure/config.txt
rename to tests/failures/chage/03_chage_openRW_shadow_failure/config.txt
diff --git a/tests/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/group b/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/group
rename to tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/gshadow b/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/gshadow
rename to tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/login.defs b/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/login.defs
rename to tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/passwd b/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/passwd
rename to tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/passwd
diff --git a/tests/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/shadow b/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/shadow
rename to tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/chage/03_chage_openRW_shadow_failure/data/chage.err b/tests/failures/chage/03_chage_openRW_shadow_failure/data/chage.err
similarity index 100%
rename from tests/tests/failures/chage/03_chage_openRW_shadow_failure/data/chage.err
rename to tests/failures/chage/03_chage_openRW_shadow_failure/data/chage.err
diff --git a/tests/tests/failures/chage/04_chage_openRO_shadow_failure/chage.test b/tests/failures/chage/04_chage_openRO_shadow_failure/chage.test
similarity index 100%
rename from tests/tests/failures/chage/04_chage_openRO_shadow_failure/chage.test
rename to tests/failures/chage/04_chage_openRO_shadow_failure/chage.test
diff --git a/tests/tests/failures/chage/04_chage_openRO_shadow_failure/config.txt b/tests/failures/chage/04_chage_openRO_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chage/04_chage_openRO_shadow_failure/config.txt
rename to tests/failures/chage/04_chage_openRO_shadow_failure/config.txt
diff --git a/tests/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/group b/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/group
rename to tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/gshadow b/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/gshadow
rename to tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/login.defs b/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/login.defs
rename to tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/passwd b/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/passwd
rename to tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/shadow b/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chage/01_chage_openRW_passwd_failure/config/etc/shadow
rename to tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/chage/04_chage_openRO_shadow_failure/data/chage.err b/tests/failures/chage/04_chage_openRO_shadow_failure/data/chage.err
similarity index 100%
rename from tests/tests/failures/chage/04_chage_openRO_shadow_failure/data/chage.err
rename to tests/failures/chage/04_chage_openRO_shadow_failure/data/chage.err
diff --git a/tests/tests/failures/chage/05_chage_rename_shadow_failure/chage.test b/tests/failures/chage/05_chage_rename_shadow_failure/chage.test
similarity index 100%
rename from tests/tests/failures/chage/05_chage_rename_shadow_failure/chage.test
rename to tests/failures/chage/05_chage_rename_shadow_failure/chage.test
diff --git a/tests/tests/failures/chage/05_chage_rename_shadow_failure/config.txt b/tests/failures/chage/05_chage_rename_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chage/05_chage_rename_shadow_failure/config.txt
rename to tests/failures/chage/05_chage_rename_shadow_failure/config.txt
diff --git a/tests/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/group b/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/group
rename to tests/failures/chage/05_chage_rename_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/gshadow b/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/gshadow
rename to tests/failures/chage/05_chage_rename_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/login.defs b/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/login.defs
rename to tests/failures/chage/05_chage_rename_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/passwd b/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/passwd
rename to tests/failures/chage/05_chage_rename_shadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/shadow b/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chage/02_chage_openRO_passwd_failure/config/etc/shadow
rename to tests/failures/chage/05_chage_rename_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/chage/05_chage_rename_shadow_failure/data/chage.err b/tests/failures/chage/05_chage_rename_shadow_failure/data/chage.err
similarity index 100%
rename from tests/tests/failures/chage/05_chage_rename_shadow_failure/data/chage.err
rename to tests/failures/chage/05_chage_rename_shadow_failure/data/chage.err
diff --git a/tests/tests/failures/chage/06_chage_rename_passwd_failure/chage.test b/tests/failures/chage/06_chage_rename_passwd_failure/chage.test
similarity index 100%
rename from tests/tests/failures/chage/06_chage_rename_passwd_failure/chage.test
rename to tests/failures/chage/06_chage_rename_passwd_failure/chage.test
diff --git a/tests/tests/failures/chage/06_chage_rename_passwd_failure/config.txt b/tests/failures/chage/06_chage_rename_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chage/06_chage_rename_passwd_failure/config.txt
rename to tests/failures/chage/06_chage_rename_passwd_failure/config.txt
diff --git a/tests/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/group b/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/group
rename to tests/failures/chage/06_chage_rename_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/gshadow b/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/gshadow
rename to tests/failures/chage/06_chage_rename_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/login.defs b/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/login.defs
rename to tests/failures/chage/06_chage_rename_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/passwd b/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/passwd
rename to tests/failures/chage/06_chage_rename_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/shadow b/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chage/06_chage_rename_passwd_failure/config/etc/shadow
rename to tests/failures/chage/06_chage_rename_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/chage/06_chage_rename_passwd_failure/data/chage.err b/tests/failures/chage/06_chage_rename_passwd_failure/data/chage.err
similarity index 100%
rename from tests/tests/failures/chage/06_chage_rename_passwd_failure/data/chage.err
rename to tests/failures/chage/06_chage_rename_passwd_failure/data/chage.err
diff --git a/tests/tests/failures/chage/06_chage_rename_passwd_failure/data/shadow b/tests/failures/chage/06_chage_rename_passwd_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/chage/06_chage_rename_passwd_failure/data/shadow
rename to tests/failures/chage/06_chage_rename_passwd_failure/data/shadow
diff --git a/tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/chgpasswd.test b/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/chgpasswd.test
similarity index 100%
rename from tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/chgpasswd.test
rename to tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/chgpasswd.test
diff --git a/tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config.txt b/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config.txt
rename to tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config.txt
diff --git a/tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/group b/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/group
rename to tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/group
diff --git a/tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/gshadow b/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/gshadow
rename to tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/login.defs b/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/login.defs
rename to tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/passwd b/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/passwd
rename to tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/passwd
diff --git a/tests/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/shadow b/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chage/03_chage_openRW_shadow_failure/config/etc/shadow
rename to tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/shadow
diff --git a/tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/data/chgpasswd.err b/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/data/chgpasswd.err
similarity index 100%
rename from tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/data/chgpasswd.err
rename to tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/data/chgpasswd.err
diff --git a/tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/chgpasswd.test b/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/chgpasswd.test
similarity index 100%
rename from tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/chgpasswd.test
rename to tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/chgpasswd.test
diff --git a/tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config.txt b/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config.txt
rename to tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config.txt
diff --git a/tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/group b/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/group
rename to tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/group
diff --git a/tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/gshadow b/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/gshadow
rename to tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/login.defs b/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/login.defs
rename to tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/passwd b/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/passwd
rename to tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/shadow b/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chage/04_chage_openRO_shadow_failure/config/etc/shadow
rename to tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/data/chgpasswd.err b/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/data/chgpasswd.err
similarity index 100%
rename from tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/data/chgpasswd.err
rename to tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/data/chgpasswd.err
diff --git a/tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/chgpasswd.test b/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/chgpasswd.test
similarity index 100%
rename from tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/chgpasswd.test
rename to tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/chgpasswd.test
diff --git a/tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config.txt b/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config.txt
rename to tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config.txt
diff --git a/tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/group b/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/group
rename to tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/group
diff --git a/tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/gshadow b/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/gshadow
rename to tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/login.defs b/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/login.defs
rename to tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/passwd b/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/passwd
rename to tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/passwd
diff --git a/tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/shadow b/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/shadow
rename to tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/config/etc/shadow
diff --git a/tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/data/chgpasswd.err b/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/data/chgpasswd.err
similarity index 100%
rename from tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/data/chgpasswd.err
rename to tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/data/chgpasswd.err
diff --git a/tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/data/gshadow b/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/data/gshadow
similarity index 100%
rename from tests/tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/data/gshadow
rename to tests/failures/chgpasswd/03_chgpasswd-e_rename_group_failure/data/gshadow
diff --git a/tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/chgpasswd.test b/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/chgpasswd.test
similarity index 100%
rename from tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/chgpasswd.test
rename to tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/chgpasswd.test
diff --git a/tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config.txt b/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config.txt
rename to tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config.txt
diff --git a/tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/group b/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/group
rename to tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/group
diff --git a/tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/gshadow b/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/gshadow
rename to tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/login.defs b/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/login.defs
rename to tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/passwd b/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/passwd
rename to tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/shadow b/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/shadow
rename to tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/data/chgpasswd.err b/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/data/chgpasswd.err
similarity index 100%
rename from tests/tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/data/chgpasswd.err
rename to tests/failures/chgpasswd/04_chgpasswd-e_rename_gshadow_failure/data/chgpasswd.err
diff --git a/tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/chpasswd.test b/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/chpasswd.test
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/chpasswd.test
rename to tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/chpasswd.test
diff --git a/tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config.txt b/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config.txt
rename to tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config.txt
diff --git a/tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/group b/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/group
rename to tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/gshadow b/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/gshadow
rename to tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/login.defs b/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/login.defs
rename to tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/passwd b/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/passwd
rename to tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/shadow b/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chage/05_chage_rename_shadow_failure/config/etc/shadow
rename to tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/data/chpasswd.err b/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/data/chpasswd.err
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/data/chpasswd.err
rename to tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/data/chpasswd.err
diff --git a/tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/chpasswd.test b/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/chpasswd.test
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/chpasswd.test
rename to tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/chpasswd.test
diff --git a/tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config.txt b/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config.txt
rename to tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config.txt
diff --git a/tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/group b/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/group
rename to tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/gshadow b/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/gshadow
rename to tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/login.defs b/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/login.defs
rename to tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/passwd b/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/passwd
rename to tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/shadow b/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chgpasswd/01_chgpasswd-e_open_group_failure/config/etc/shadow
rename to tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/data/chpasswd.err b/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/data/chpasswd.err
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/data/chpasswd.err
rename to tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/data/chpasswd.err
diff --git a/tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/chpasswd.test b/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/chpasswd.test
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/chpasswd.test
rename to tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/chpasswd.test
diff --git a/tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config.txt b/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config.txt
rename to tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config.txt
diff --git a/tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/group b/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/group
rename to tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/gshadow b/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/gshadow
rename to tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/login.defs b/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/login.defs
rename to tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/passwd b/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/passwd
rename to tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/shadow b/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/shadow
rename to tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/data/chpasswd.err b/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/data/chpasswd.err
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/data/chpasswd.err
rename to tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/data/chpasswd.err
diff --git a/tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/data/shadow b/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/data/shadow
rename to tests/failures/chpasswd-PAM/03_chpasswd-e_rename_passwd_failure/data/shadow
diff --git a/tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/chpasswd.test b/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/chpasswd.test
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/chpasswd.test
rename to tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/chpasswd.test
diff --git a/tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config.txt b/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config.txt
rename to tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config.txt
diff --git a/tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/group b/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/group
rename to tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/gshadow b/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/gshadow
rename to tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/login.defs b/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/login.defs
rename to tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/passwd b/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/passwd
rename to tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/shadow b/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/shadow
rename to tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/data/chpasswd.err b/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/data/chpasswd.err
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/data/chpasswd.err
rename to tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/data/chpasswd.err
diff --git a/tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/chpasswd.test b/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/chpasswd.test
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/chpasswd.test
rename to tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/chpasswd.test
diff --git a/tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config.txt b/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config.txt
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config.txt
rename to tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config.txt
diff --git a/tests/tests/cptools/09_cppw-g/config/etc/group b/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/group
similarity index 100%
rename from tests/tests/cptools/09_cppw-g/config/etc/group
rename to tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/group
diff --git a/tests/tests/cptools/09_cppw-g/config/etc/gshadow b/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/gshadow
similarity index 100%
rename from tests/tests/cptools/09_cppw-g/config/etc/gshadow
rename to tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/gshadow
diff --git a/tests/tests/cptools/09_cppw-g/config/etc/passwd b/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/passwd
similarity index 100%
rename from tests/tests/cptools/09_cppw-g/config/etc/passwd
rename to tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/passwd
diff --git a/tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/shadow b/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chgpasswd/02_chgpasswd-e_open_gshadow_failure/config/etc/shadow
rename to tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/shadow
diff --git a/tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/data/shadow b/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/data/shadow
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/data/shadow
rename to tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/data/shadow
diff --git a/tests/tests/failures/chsh/01_chsh_open_passwd_failure/chsh.test b/tests/failures/chsh/01_chsh_open_passwd_failure/chsh.test
similarity index 100%
rename from tests/tests/failures/chsh/01_chsh_open_passwd_failure/chsh.test
rename to tests/failures/chsh/01_chsh_open_passwd_failure/chsh.test
diff --git a/tests/tests/failures/chsh/01_chsh_open_passwd_failure/config.txt b/tests/failures/chsh/01_chsh_open_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chsh/01_chsh_open_passwd_failure/config.txt
rename to tests/failures/chsh/01_chsh_open_passwd_failure/config.txt
diff --git a/tests/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/group b/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/group
rename to tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/gshadow b/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/gshadow
rename to tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/login.defs b/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/login.defs
rename to tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/passwd b/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/passwd
rename to tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/shadow b/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/01_chpasswd-e_open_passwd_failure/config/etc/shadow
rename to tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/chsh/01_chsh_open_passwd_failure/data/chsh.err b/tests/failures/chsh/01_chsh_open_passwd_failure/data/chsh.err
similarity index 100%
rename from tests/tests/failures/chsh/01_chsh_open_passwd_failure/data/chsh.err
rename to tests/failures/chsh/01_chsh_open_passwd_failure/data/chsh.err
diff --git a/tests/tests/failures/chsh/02_chsh_rename_passwd_failure/chsh.test b/tests/failures/chsh/02_chsh_rename_passwd_failure/chsh.test
similarity index 100%
rename from tests/tests/failures/chsh/02_chsh_rename_passwd_failure/chsh.test
rename to tests/failures/chsh/02_chsh_rename_passwd_failure/chsh.test
diff --git a/tests/tests/failures/chsh/02_chsh_rename_passwd_failure/config.txt b/tests/failures/chsh/02_chsh_rename_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/chsh/02_chsh_rename_passwd_failure/config.txt
rename to tests/failures/chsh/02_chsh_rename_passwd_failure/config.txt
diff --git a/tests/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/group b/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/group
rename to tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/gshadow b/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/gshadow
rename to tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/login.defs b/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/login.defs
rename to tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/passwd b/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/passwd
rename to tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/shadow b/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/02_chpasswd-e_open_shadow_failure/config/etc/shadow
rename to tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/chsh/02_chsh_rename_passwd_failure/data/chsh.err b/tests/failures/chsh/02_chsh_rename_passwd_failure/data/chsh.err
similarity index 100%
rename from tests/tests/failures/chsh/02_chsh_rename_passwd_failure/data/chsh.err
rename to tests/failures/chsh/02_chsh_rename_passwd_failure/data/chsh.err
diff --git a/tests/tests/failures/chsh/02_chsh_rename_passwd_failure/data/shadow b/tests/failures/chsh/02_chsh_rename_passwd_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/chsh/02_chsh_rename_passwd_failure/data/shadow
rename to tests/failures/chsh/02_chsh_rename_passwd_failure/data/shadow
diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config.txt b/tests/failures/gpasswd/01_gpasswd_group_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config.txt
rename to tests/failures/gpasswd/01_gpasswd_group_open_failure/config.txt
diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/group b/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/group
rename to tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/group
diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/gshadow b/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/gshadow
rename to tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/login.defs b/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/login.defs
rename to tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/login.defs
diff --git a/tests/tests/crypt/login.defs_none/config/etc/passwd b/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/crypt/login.defs_none/config/etc/passwd
rename to tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/passwd
diff --git a/tests/tests/crypt/login.defs_none/config/etc/shadow b/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/crypt/login.defs_none/config/etc/shadow
rename to tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/data/gpasswd.err b/tests/failures/gpasswd/01_gpasswd_group_open_failure/data/gpasswd.err
similarity index 100%
rename from tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/data/gpasswd.err
rename to tests/failures/gpasswd/01_gpasswd_group_open_failure/data/gpasswd.err
diff --git a/tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/gpasswd.test b/tests/failures/gpasswd/01_gpasswd_group_open_failure/gpasswd.test
similarity index 100%
rename from tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/gpasswd.test
rename to tests/failures/gpasswd/01_gpasswd_group_open_failure/gpasswd.test
diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config.txt b/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config.txt
rename to tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config.txt
diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/group b/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/group
rename to tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/group
diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/gshadow b/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/gshadow
rename to tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/login.defs b/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/login.defs
rename to tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/passwd b/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/passwd
rename to tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/shadow b/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/shadow
rename to tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/data/gpasswd.err b/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/data/gpasswd.err
similarity index 100%
rename from tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/data/gpasswd.err
rename to tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/data/gpasswd.err
diff --git a/tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/gpasswd.test b/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/gpasswd.test
similarity index 100%
rename from tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/gpasswd.test
rename to tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/gpasswd.test
diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config.txt b/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config.txt
rename to tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config.txt
diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/group b/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/group
rename to tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/group
diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/gshadow b/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/gshadow
rename to tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/login.defs b/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/login.defs
rename to tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/passwd b/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/passwd
rename to tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/shadow b/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/shadow
rename to tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/data/gpasswd.err b/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/data/gpasswd.err
similarity index 100%
rename from tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/data/gpasswd.err
rename to tests/failures/gpasswd/03_gpasswd-a_group_open_failure/data/gpasswd.err
diff --git a/tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/gpasswd.test b/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/gpasswd.test
similarity index 100%
rename from tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/gpasswd.test
rename to tests/failures/gpasswd/03_gpasswd-a_group_open_failure/gpasswd.test
diff --git a/tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config.txt b/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config.txt
rename to tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config.txt
diff --git a/tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/group b/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/group
rename to tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/group
diff --git a/tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/gshadow b/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/gshadow
rename to tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/login.defs b/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/login.defs
rename to tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/passwd b/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/passwd
rename to tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/shadow b/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/shadow
rename to tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/data/gpasswd.err b/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/data/gpasswd.err
similarity index 100%
rename from tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/data/gpasswd.err
rename to tests/failures/gpasswd/04_gpasswd-d_group_open_failure/data/gpasswd.err
diff --git a/tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/gpasswd.test b/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/gpasswd.test
similarity index 100%
rename from tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/gpasswd.test
rename to tests/failures/gpasswd/04_gpasswd-d_group_open_failure/gpasswd.test
diff --git a/tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config.txt b/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config.txt
rename to tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config.txt
diff --git a/tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/group b/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/group
rename to tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/group
diff --git a/tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/gshadow b/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/gshadow
rename to tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/login.defs b/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/login.defs
rename to tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/passwd b/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/passwd
rename to tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/shadow b/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/shadow
rename to tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/data/gpasswd.err b/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/data/gpasswd.err
similarity index 100%
rename from tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/data/gpasswd.err
rename to tests/failures/gpasswd/05_gpasswd-r_group_open_failure/data/gpasswd.err
diff --git a/tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/gpasswd.test b/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/gpasswd.test
similarity index 100%
rename from tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/gpasswd.test
rename to tests/failures/gpasswd/05_gpasswd-r_group_open_failure/gpasswd.test
diff --git a/tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config.txt b/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config.txt
rename to tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config.txt
diff --git a/tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/group b/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/group
rename to tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/group
diff --git a/tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/gshadow b/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/gshadow
rename to tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/login.defs b/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/login.defs
rename to tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/passwd b/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/passwd
rename to tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/shadow b/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/shadow
rename to tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/data/gpasswd.err b/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/data/gpasswd.err
similarity index 100%
rename from tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/data/gpasswd.err
rename to tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/data/gpasswd.err
diff --git a/tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/gpasswd.test b/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/gpasswd.test
similarity index 100%
rename from tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/gpasswd.test
rename to tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/gpasswd.test
diff --git a/tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config.txt b/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config.txt
rename to tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config.txt
diff --git a/tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/group b/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/group
rename to tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/group
diff --git a/tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/gshadow b/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/gshadow
rename to tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/login.defs b/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/gpasswd/04_gpasswd-d_group_open_failure/config/etc/login.defs
rename to tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/passwd b/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/passwd
rename to tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/shadow b/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/shadow
rename to tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/data/gpasswd.err b/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/data/gpasswd.err
similarity index 100%
rename from tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/data/gpasswd.err
rename to tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/data/gpasswd.err
diff --git a/tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/gpasswd.test b/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/gpasswd.test
similarity index 100%
rename from tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/gpasswd.test
rename to tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/gpasswd.test
diff --git a/tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config.txt b/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config.txt
similarity index 100%
rename from tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config.txt
rename to tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config.txt
diff --git a/tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/group b/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/group
rename to tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/group
diff --git a/tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/gshadow b/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/gshadow
rename to tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/gshadow
diff --git a/tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/login.defs b/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/gpasswd/05_gpasswd-r_group_open_failure/config/etc/login.defs
rename to tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/login.defs
diff --git a/tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/passwd b/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/passwd
rename to tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/passwd
diff --git a/tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/shadow b/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/shadow
rename to tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/shadow
diff --git a/tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/data/gpasswd.err b/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/data/gpasswd.err
similarity index 100%
rename from tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/data/gpasswd.err
rename to tests/failures/gpasswd/08_gpasswd_group_openRO_failure/data/gpasswd.err
diff --git a/tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/gpasswd.test b/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/gpasswd.test
similarity index 100%
rename from tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/gpasswd.test
rename to tests/failures/gpasswd/08_gpasswd_group_openRO_failure/gpasswd.test
diff --git a/tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config.txt b/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config.txt
similarity index 100%
rename from tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config.txt
rename to tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config.txt
diff --git a/tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/group b/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/group
rename to tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/group
diff --git a/tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/gshadow b/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/gshadow
rename to tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/gshadow
diff --git a/tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/login.defs b/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config/etc/login.defs
rename to tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/login.defs
diff --git a/tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/passwd b/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/passwd
rename to tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/passwd
diff --git a/tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/shadow b/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/shadow
rename to tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/shadow
diff --git a/tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/data/gpasswd.err b/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/data/gpasswd.err
similarity index 100%
rename from tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/data/gpasswd.err
rename to tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/data/gpasswd.err
diff --git a/tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/gpasswd.test b/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/gpasswd.test
similarity index 100%
rename from tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/gpasswd.test
rename to tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/gpasswd.test
diff --git a/tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config.txt b/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config.txt
rename to tests/failures/gpasswd/10_gpasswd_group_rename_failure/config.txt
diff --git a/tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/group b/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/group
rename to tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/group
diff --git a/tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/gshadow b/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/gshadow
rename to tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/login.defs b/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config/etc/login.defs
rename to tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/passwd b/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/passwd
rename to tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/shadow b/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/shadow
rename to tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/data/gpasswd.err b/tests/failures/gpasswd/10_gpasswd_group_rename_failure/data/gpasswd.err
similarity index 100%
rename from tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/data/gpasswd.err
rename to tests/failures/gpasswd/10_gpasswd_group_rename_failure/data/gpasswd.err
diff --git a/tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/gpasswd.test b/tests/failures/gpasswd/10_gpasswd_group_rename_failure/gpasswd.test
similarity index 100%
rename from tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/gpasswd.test
rename to tests/failures/gpasswd/10_gpasswd_group_rename_failure/gpasswd.test
diff --git a/tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config.txt b/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config.txt
rename to tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config.txt
diff --git a/tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/group b/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/group
rename to tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/group
diff --git a/tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/gshadow b/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/gshadow
rename to tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/login.defs b/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/login.defs
rename to tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/passwd b/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/passwd
rename to tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/shadow b/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/shadow
rename to tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/data/gpasswd.err b/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/data/gpasswd.err
similarity index 100%
rename from tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/data/gpasswd.err
rename to tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/data/gpasswd.err
diff --git a/tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/data/group b/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/data/group
similarity index 100%
rename from tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/data/group
rename to tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/data/group
diff --git a/tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/gpasswd.test b/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/gpasswd.test
similarity index 100%
rename from tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/gpasswd.test
rename to tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/gpasswd.test
diff --git a/tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config.txt b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config.txt
rename to tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config.txt
diff --git a/tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/default/useradd b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/default/useradd
rename to tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/crypt/login.defs_none/config/etc/group b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/crypt/login.defs_none/config/etc/group
rename to tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/group
diff --git a/tests/tests/crypt/login.defs_none/config/etc/gshadow b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/crypt/login.defs_none/config/etc/gshadow
rename to tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/login.defs b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/login.defs
rename to tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/passwd b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/passwd
rename to tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/shadow b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/shadow
rename to tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/group b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/group
similarity index 100%
rename from tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/group
rename to tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/group
diff --git a/tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/groupadd.err b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/groupadd.err
similarity index 100%
rename from tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/groupadd.err
rename to tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/groupadd.err
diff --git a/tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/groupadd.test b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/groupadd.test
similarity index 100%
rename from tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/groupadd.test
rename to tests/failures/groupadd/01_groupadd_gshadow_rename_failure/groupadd.test
diff --git a/tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config.txt b/tests/failures/groupadd/02_groupadd_group_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config.txt
rename to tests/failures/groupadd/02_groupadd_group_rename_failure/config.txt
diff --git a/tests/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/default/useradd b/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/default/useradd
rename to tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/group b/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/group
rename to tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/group
diff --git a/tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/gshadow b/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/gshadow
rename to tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/login.defs b/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/login.defs
rename to tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/passwd b/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/passwd
rename to tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/shadow b/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/shadow
rename to tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupadd/02_groupadd_group_rename_failure/data/groupadd.err b/tests/failures/groupadd/02_groupadd_group_rename_failure/data/groupadd.err
similarity index 100%
rename from tests/tests/failures/groupadd/02_groupadd_group_rename_failure/data/groupadd.err
rename to tests/failures/groupadd/02_groupadd_group_rename_failure/data/groupadd.err
diff --git a/tests/tests/failures/groupadd/02_groupadd_group_rename_failure/groupadd.test b/tests/failures/groupadd/02_groupadd_group_rename_failure/groupadd.test
similarity index 100%
rename from tests/tests/failures/groupadd/02_groupadd_group_rename_failure/groupadd.test
rename to tests/failures/groupadd/02_groupadd_group_rename_failure/groupadd.test
diff --git a/tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config.txt b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config.txt
rename to tests/failures/groupadd/03_groupadd_gshadow_open_failure/config.txt
diff --git a/tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/default/useradd b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/default/useradd
rename to tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/group b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/group
rename to tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/group
diff --git a/tests/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/gshadow b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/gshadow
rename to tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/login.defs b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/login.defs
rename to tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/passwd b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/passwd
rename to tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/shadow b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/shadow
rename to tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/groupadd.err b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/groupadd.err
similarity index 100%
rename from tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/groupadd.err
rename to tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/groupadd.err
diff --git a/tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/groupadd.test b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/groupadd.test
similarity index 100%
rename from tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/groupadd.test
rename to tests/failures/groupadd/03_groupadd_gshadow_open_failure/groupadd.test
diff --git a/tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config.txt b/tests/failures/groupadd/04_groupadd_group_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config.txt
rename to tests/failures/groupadd/04_groupadd_group_open_failure/config.txt
diff --git a/tests/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/default/useradd b/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/default/useradd
rename to tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/group b/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/group
rename to tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/group
diff --git a/tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/gshadow b/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/gshadow
rename to tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/login.defs b/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/login.defs
rename to tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/passwd b/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/passwd
rename to tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/shadow b/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/shadow
rename to tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupadd/04_groupadd_group_open_failure/data/groupadd.err b/tests/failures/groupadd/04_groupadd_group_open_failure/data/groupadd.err
similarity index 100%
rename from tests/tests/failures/groupadd/04_groupadd_group_open_failure/data/groupadd.err
rename to tests/failures/groupadd/04_groupadd_group_open_failure/data/groupadd.err
diff --git a/tests/tests/failures/groupadd/04_groupadd_group_open_failure/groupadd.test b/tests/failures/groupadd/04_groupadd_group_open_failure/groupadd.test
similarity index 100%
rename from tests/tests/failures/groupadd/04_groupadd_group_open_failure/groupadd.test
rename to tests/failures/groupadd/04_groupadd_group_open_failure/groupadd.test
diff --git a/tests/tests/failures/groupadd/02_groupadd_group_rename_failure/config.txt b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupadd/02_groupadd_group_rename_failure/config.txt
rename to tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config.txt
diff --git a/tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/default/useradd b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/default/useradd
rename to tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/group b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/group
rename to tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/group
diff --git a/tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/gshadow b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/gshadow
rename to tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/login.defs b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/login.defs
rename to tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/passwd b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/passwd
rename to tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/shadow b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/shadow
rename to tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/group b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/group
similarity index 100%
rename from tests/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/group
rename to tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/group
diff --git a/tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/groupdel.err b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/groupdel.err
similarity index 100%
rename from tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/groupdel.err
rename to tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/groupdel.err
diff --git a/tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/groupdel.test b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/groupdel.test
similarity index 100%
rename from tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/groupdel.test
rename to tests/failures/groupdel/01_groupdel_gshadow_rename_failure/groupdel.test
diff --git a/tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config.txt b/tests/failures/groupdel/02_groupdel_group_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config.txt
rename to tests/failures/groupdel/02_groupdel_group_rename_failure/config.txt
diff --git a/tests/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/default/useradd b/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/default/useradd
rename to tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/group b/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/group
rename to tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/group
diff --git a/tests/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/gshadow b/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/gshadow
rename to tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/login.defs b/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/login.defs
rename to tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/passwd b/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/passwd
rename to tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/shadow b/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/shadow
rename to tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupdel/02_groupdel_group_rename_failure/data/groupdel.err b/tests/failures/groupdel/02_groupdel_group_rename_failure/data/groupdel.err
similarity index 100%
rename from tests/tests/failures/groupdel/02_groupdel_group_rename_failure/data/groupdel.err
rename to tests/failures/groupdel/02_groupdel_group_rename_failure/data/groupdel.err
diff --git a/tests/tests/failures/groupdel/02_groupdel_group_rename_failure/groupdel.test b/tests/failures/groupdel/02_groupdel_group_rename_failure/groupdel.test
similarity index 100%
rename from tests/tests/failures/groupdel/02_groupdel_group_rename_failure/groupdel.test
rename to tests/failures/groupdel/02_groupdel_group_rename_failure/groupdel.test
diff --git a/tests/tests/failures/groupadd/04_groupadd_group_open_failure/config.txt b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupadd/04_groupadd_group_open_failure/config.txt
rename to tests/failures/groupdel/03_groupdel_gshadow_open_failure/config.txt
diff --git a/tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/default/useradd b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/default/useradd
rename to tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/group b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/group
rename to tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/group
diff --git a/tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/gshadow b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/gshadow
rename to tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/login.defs b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/login.defs
rename to tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/passwd b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/passwd
rename to tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/shadow b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/shadow
rename to tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/groupdel.err b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/groupdel.err
similarity index 100%
rename from tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/groupdel.err
rename to tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/groupdel.err
diff --git a/tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/groupdel.test b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/groupdel.test
similarity index 100%
rename from tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/groupdel.test
rename to tests/failures/groupdel/03_groupdel_gshadow_open_failure/groupdel.test
diff --git a/tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config.txt b/tests/failures/groupdel/04_groupdel_group_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config.txt
rename to tests/failures/groupdel/04_groupdel_group_open_failure/config.txt
diff --git a/tests/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/default/useradd b/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/default/useradd
rename to tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/group b/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/group
rename to tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/group
diff --git a/tests/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/gshadow b/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/gshadow
rename to tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/login.defs b/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/login.defs
rename to tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/passwd b/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/passwd
rename to tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/shadow b/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/shadow
rename to tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupdel/04_groupdel_group_open_failure/data/groupdel.err b/tests/failures/groupdel/04_groupdel_group_open_failure/data/groupdel.err
similarity index 100%
rename from tests/tests/failures/groupdel/04_groupdel_group_open_failure/data/groupdel.err
rename to tests/failures/groupdel/04_groupdel_group_open_failure/data/groupdel.err
diff --git a/tests/tests/failures/groupdel/04_groupdel_group_open_failure/groupdel.test b/tests/failures/groupdel/04_groupdel_group_open_failure/groupdel.test
similarity index 100%
rename from tests/tests/failures/groupdel/04_groupdel_group_open_failure/groupdel.test
rename to tests/failures/groupdel/04_groupdel_group_open_failure/groupdel.test
diff --git a/tests/tests/failures/groupdel/02_groupdel_group_rename_failure/config.txt b/tests/failures/groupmems/01_groupmems_group_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupdel/02_groupdel_group_rename_failure/config.txt
rename to tests/failures/groupmems/01_groupmems_group_open_failure/config.txt
diff --git a/tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/group b/tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/group
rename to tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/group
diff --git a/tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/gshadow b/tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/gshadow
rename to tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/passwd b/tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/passwd
rename to tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/shadow b/tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/shadow
rename to tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupmems/01_groupmems_group_open_failure/data/groupmems.err b/tests/failures/groupmems/01_groupmems_group_open_failure/data/groupmems.err
similarity index 100%
rename from tests/tests/failures/groupmems/01_groupmems_group_open_failure/data/groupmems.err
rename to tests/failures/groupmems/01_groupmems_group_open_failure/data/groupmems.err
diff --git a/tests/tests/failures/groupmems/01_groupmems_group_open_failure/groupmems.test b/tests/failures/groupmems/01_groupmems_group_open_failure/groupmems.test
similarity index 100%
rename from tests/tests/failures/groupmems/01_groupmems_group_open_failure/groupmems.test
rename to tests/failures/groupmems/01_groupmems_group_open_failure/groupmems.test
diff --git a/tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config.txt b/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config.txt
rename to tests/failures/groupmems/02_groupmems_gshadow_open_failure/config.txt
diff --git a/tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/group b/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/group
rename to tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/group
diff --git a/tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/gshadow b/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/gshadow
rename to tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/passwd b/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/passwd
rename to tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/shadow b/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/shadow
rename to tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/data/groupmems.err b/tests/failures/groupmems/02_groupmems_gshadow_open_failure/data/groupmems.err
similarity index 100%
rename from tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/data/groupmems.err
rename to tests/failures/groupmems/02_groupmems_gshadow_open_failure/data/groupmems.err
diff --git a/tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/groupmems.test b/tests/failures/groupmems/02_groupmems_gshadow_open_failure/groupmems.test
similarity index 100%
rename from tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/groupmems.test
rename to tests/failures/groupmems/02_groupmems_gshadow_open_failure/groupmems.test
diff --git a/tests/tests/failures/groupdel/04_groupdel_group_open_failure/config.txt b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupdel/04_groupdel_group_open_failure/config.txt
rename to tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config.txt
diff --git a/tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/default/useradd b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/default/useradd
rename to tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/group b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/group
rename to tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/group
diff --git a/tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/gshadow b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/gshadow
rename to tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/login.defs b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupdel/02_groupdel_group_rename_failure/config/etc/login.defs
rename to tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/passwd b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/passwd
rename to tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/shadow b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/shadow
rename to tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/group b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/group
similarity index 100%
rename from tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/group
rename to tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/group
diff --git a/tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/groupmod.err b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/groupmod.err
similarity index 100%
rename from tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/groupmod.err
rename to tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/groupmod.err
diff --git a/tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/groupmod.test b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/groupmod.test
similarity index 100%
rename from tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/groupmod.test
rename to tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/groupmod.test
diff --git a/tests/tests/failures/groupmems/01_groupmems_group_open_failure/config.txt b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupmems/01_groupmems_group_open_failure/config.txt
rename to tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config.txt
diff --git a/tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/default/useradd b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/default/useradd
rename to tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/group b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/group
rename to tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/group
diff --git a/tests/tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/gshadow b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/gshadow
rename to tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/login.defs b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/login.defs
rename to tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/passwd b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/passwd
rename to tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/shadow b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/shadow
rename to tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/group b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/group
similarity index 100%
rename from tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/group
rename to tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/group
diff --git a/tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/groupmod.err b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/groupmod.err
similarity index 100%
rename from tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/groupmod.err
rename to tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/groupmod.err
diff --git a/tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/groupmod.test b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/groupmod.test
similarity index 100%
rename from tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/groupmod.test
rename to tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/groupmod.test
diff --git a/tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config.txt b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config.txt
rename to tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config.txt
diff --git a/tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/default/useradd b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/default/useradd
rename to tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/group b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/group
rename to tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/group
diff --git a/tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/gshadow b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/gshadow
rename to tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/login.defs b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupdel/04_groupdel_group_open_failure/config/etc/login.defs
rename to tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/passwd b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/passwd
rename to tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/shadow b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/shadow
rename to tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/groupmod.err b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/groupmod.err
similarity index 100%
rename from tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/groupmod.err
rename to tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/groupmod.err
diff --git a/tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/groupmod.test b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/groupmod.test
similarity index 100%
rename from tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/groupmod.test
rename to tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/groupmod.test
diff --git a/tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config.txt b/tests/failures/groupmod/04_groupmod_group_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config.txt
rename to tests/failures/groupmod/04_groupmod_group_open_failure/config.txt
diff --git a/tests/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/default/useradd b/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/default/useradd
rename to tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/group b/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/group
rename to tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/group
diff --git a/tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/gshadow b/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/gshadow
rename to tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/login.defs b/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/config/etc/login.defs
rename to tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/passwd b/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/passwd
rename to tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/shadow b/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/shadow
rename to tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupmod/04_groupmod_group_open_failure/data/groupmod.err b/tests/failures/groupmod/04_groupmod_group_open_failure/data/groupmod.err
similarity index 100%
rename from tests/tests/failures/groupmod/04_groupmod_group_open_failure/data/groupmod.err
rename to tests/failures/groupmod/04_groupmod_group_open_failure/data/groupmod.err
diff --git a/tests/tests/failures/groupmod/04_groupmod_group_open_failure/groupmod.test b/tests/failures/groupmod/04_groupmod_group_open_failure/groupmod.test
similarity index 100%
rename from tests/tests/failures/groupmod/04_groupmod_group_open_failure/groupmod.test
rename to tests/failures/groupmod/04_groupmod_group_open_failure/groupmod.test
diff --git a/tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config.txt b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config.txt
rename to tests/failures/groupmod/05_groupmod_gshadow_open_failure/config.txt
diff --git a/tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/default/useradd b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/default/useradd
rename to tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/group b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/group
rename to tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/group
diff --git a/tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/gshadow b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/gshadow
rename to tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/login.defs b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/login.defs
rename to tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/passwd b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/passwd
rename to tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/shadow b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/shadow
rename to tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/groupmod.err b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/groupmod.err
similarity index 100%
rename from tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/groupmod.err
rename to tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/groupmod.err
diff --git a/tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/groupmod.test b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/groupmod.test
similarity index 100%
rename from tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/groupmod.test
rename to tests/failures/groupmod/05_groupmod_gshadow_open_failure/groupmod.test
diff --git a/tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config.txt b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config.txt
rename to tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config.txt
diff --git a/tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/default/useradd b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/default/useradd
rename to tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/group b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/group
rename to tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/group
diff --git a/tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/gshadow b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/gshadow
rename to tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/login.defs b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/config/etc/login.defs
rename to tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/passwd b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/passwd
rename to tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/shadow b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/shadow
rename to tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/group b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/group
similarity index 100%
rename from tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/group
rename to tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/group
diff --git a/tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/groupmod.test b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/groupmod.test
similarity index 100%
rename from tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/groupmod.test
rename to tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/groupmod.test
diff --git a/tests/tests/failures/groupmod/04_groupmod_group_open_failure/config.txt b/tests/failures/groupmod/07_groupmod_passwd_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupmod/04_groupmod_group_open_failure/config.txt
rename to tests/failures/groupmod/07_groupmod_passwd_open_failure/config.txt
diff --git a/tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/default/useradd b/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/default/useradd
rename to tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/group b/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/group
rename to tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/group
diff --git a/tests/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/gshadow b/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/gshadow
rename to tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/login.defs b/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/login.defs
rename to tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/passwd b/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/passwd
rename to tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/shadow b/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/shadow
rename to tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/groupmod.err b/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/groupmod.err
similarity index 100%
rename from tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/groupmod.err
rename to tests/failures/groupmod/07_groupmod_passwd_open_failure/data/groupmod.err
diff --git a/tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/groupmod.test b/tests/failures/groupmod/07_groupmod_passwd_open_failure/groupmod.test
similarity index 100%
rename from tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/groupmod.test
rename to tests/failures/groupmod/07_groupmod_passwd_open_failure/groupmod.test
diff --git a/tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config.txt b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config.txt
rename to tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config.txt
diff --git a/tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/default/useradd b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/default/useradd
rename to tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/group b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/group
rename to tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/group
diff --git a/tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/gshadow b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/gshadow
rename to tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/login.defs b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/login.defs
rename to tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/passwd b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/passwd
rename to tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/shadow b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/shadow
rename to tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/groupmod.test b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/groupmod.test
similarity index 100%
rename from tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/groupmod.test
rename to tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/groupmod.test
diff --git a/tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config.txt b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config.txt
rename to tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config.txt
diff --git a/tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/default/useradd b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/default/useradd
rename to tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/group b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/group
rename to tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/group
diff --git a/tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/gshadow b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/gshadow
rename to tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/login.defs b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/login.defs
rename to tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/passwd b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/passwd
rename to tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/shadow b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/shadow
rename to tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/group b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/group
similarity index 100%
rename from tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/group
rename to tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/group
diff --git a/tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/gshadow b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/gshadow
similarity index 100%
rename from tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/gshadow
rename to tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/gshadow
diff --git a/tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/groupmod.test b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/groupmod.test
similarity index 100%
rename from tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/groupmod.test
rename to tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/groupmod.test
diff --git a/tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/config.txt b/tests/failures/grpck/01_grpck_system_group_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/config.txt
rename to tests/failures/grpck/01_grpck_system_group_open_failure/config.txt
diff --git a/tests/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/default/useradd b/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/default/useradd
rename to tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/group b/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/group
rename to tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/group
diff --git a/tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/gshadow b/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/gshadow
rename to tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/login.defs b/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupmod/07_groupmod_passwd_open_failure/config/etc/login.defs
rename to tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/passwd b/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/passwd
rename to tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/shadow b/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/config/etc/shadow
rename to tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/grpck/01_grpck_system_group_open_failure/data/grpck.err b/tests/failures/grpck/01_grpck_system_group_open_failure/data/grpck.err
similarity index 100%
rename from tests/tests/failures/grpck/01_grpck_system_group_open_failure/data/grpck.err
rename to tests/failures/grpck/01_grpck_system_group_open_failure/data/grpck.err
diff --git a/tests/tests/failures/grpck/01_grpck_system_group_open_failure/grpck.test b/tests/failures/grpck/01_grpck_system_group_open_failure/grpck.test
similarity index 100%
rename from tests/tests/failures/grpck/01_grpck_system_group_open_failure/grpck.test
rename to tests/failures/grpck/01_grpck_system_group_open_failure/grpck.test
diff --git a/tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config.txt b/tests/failures/grpck/02_grpck_group_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config.txt
rename to tests/failures/grpck/02_grpck_group_open_failure/config.txt
diff --git a/tests/tests/failures/grpck/02_grpck_group_open_failure/config/etc/default/useradd b/tests/failures/grpck/02_grpck_group_open_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/grpck/02_grpck_group_open_failure/config/etc/default/useradd
rename to tests/failures/grpck/02_grpck_group_open_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/group b/tests/failures/grpck/02_grpck_group_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/group
rename to tests/failures/grpck/02_grpck_group_open_failure/config/etc/group
diff --git a/tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/gshadow b/tests/failures/grpck/02_grpck_group_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/gshadow
rename to tests/failures/grpck/02_grpck_group_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/login.defs b/tests/failures/grpck/02_grpck_group_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/config/etc/login.defs
rename to tests/failures/grpck/02_grpck_group_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/passwd b/tests/failures/grpck/02_grpck_group_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/passwd
rename to tests/failures/grpck/02_grpck_group_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/shadow b/tests/failures/grpck/02_grpck_group_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/shadow
rename to tests/failures/grpck/02_grpck_group_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/grpck/02_grpck_group_open_failure/data/grpck.err b/tests/failures/grpck/02_grpck_group_open_failure/data/grpck.err
similarity index 100%
rename from tests/tests/failures/grpck/02_grpck_group_open_failure/data/grpck.err
rename to tests/failures/grpck/02_grpck_group_open_failure/data/grpck.err
diff --git a/tests/tests/failures/grpck/02_grpck_group_open_failure/grpck.test b/tests/failures/grpck/02_grpck_group_open_failure/grpck.test
similarity index 100%
rename from tests/tests/failures/grpck/02_grpck_group_open_failure/grpck.test
rename to tests/failures/grpck/02_grpck_group_open_failure/grpck.test
diff --git a/tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config.txt b/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config.txt
rename to tests/failures/grpck/03_grpck_system_gshadow_open_failure/config.txt
diff --git a/tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/default/useradd b/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/default/useradd
rename to tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/group b/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/group
rename to tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/group
diff --git a/tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/gshadow b/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/gshadow
rename to tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/login.defs b/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/config/etc/login.defs
rename to tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/grpck/02_grpck_group_open_failure/config/etc/passwd b/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/grpck/02_grpck_group_open_failure/config/etc/passwd
rename to tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/grpck/02_grpck_group_open_failure/config/etc/shadow b/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/grpck/02_grpck_group_open_failure/config/etc/shadow
rename to tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/data/grpck.err b/tests/failures/grpck/03_grpck_system_gshadow_open_failure/data/grpck.err
similarity index 100%
rename from tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/data/grpck.err
rename to tests/failures/grpck/03_grpck_system_gshadow_open_failure/data/grpck.err
diff --git a/tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/grpck.test b/tests/failures/grpck/03_grpck_system_gshadow_open_failure/grpck.test
similarity index 100%
rename from tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/grpck.test
rename to tests/failures/grpck/03_grpck_system_gshadow_open_failure/grpck.test
diff --git a/tests/tests/failures/grpck/01_grpck_system_group_open_failure/config.txt b/tests/failures/grpck/04_grpck_gshadow_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/grpck/01_grpck_system_group_open_failure/config.txt
rename to tests/failures/grpck/04_grpck_gshadow_open_failure/config.txt
diff --git a/tests/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/default/useradd b/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/default/useradd
rename to tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/group b/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/group
rename to tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/group
diff --git a/tests/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/gshadow b/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/gshadow
rename to tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/login.defs b/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/grpck/01_grpck_system_group_open_failure/config/etc/login.defs
rename to tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/login.defs
diff --git a/tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/passwd b/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/passwd
rename to tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/shadow b/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/shadow
rename to tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/grpck/02_grpck_group_open_failure/config/etc/group b/tests/failures/grpck/04_grpck_gshadow_open_failure/data/group
similarity index 100%
rename from tests/tests/failures/grpck/02_grpck_group_open_failure/config/etc/group
rename to tests/failures/grpck/04_grpck_gshadow_open_failure/data/group
diff --git a/tests/tests/failures/grpck/04_grpck_gshadow_open_failure/data/grpck.err b/tests/failures/grpck/04_grpck_gshadow_open_failure/data/grpck.err
similarity index 100%
rename from tests/tests/failures/grpck/04_grpck_gshadow_open_failure/data/grpck.err
rename to tests/failures/grpck/04_grpck_gshadow_open_failure/data/grpck.err
diff --git a/tests/tests/failures/grpck/02_grpck_group_open_failure/config/etc/gshadow b/tests/failures/grpck/04_grpck_gshadow_open_failure/data/gshadow
similarity index 100%
rename from tests/tests/failures/grpck/02_grpck_group_open_failure/config/etc/gshadow
rename to tests/failures/grpck/04_grpck_gshadow_open_failure/data/gshadow
diff --git a/tests/tests/failures/grpck/04_grpck_gshadow_open_failure/grpck.test b/tests/failures/grpck/04_grpck_gshadow_open_failure/grpck.test
similarity index 100%
rename from tests/tests/failures/grpck/04_grpck_gshadow_open_failure/grpck.test
rename to tests/failures/grpck/04_grpck_gshadow_open_failure/grpck.test
diff --git a/tests/tests/failures/grpck/02_grpck_group_open_failure/config.txt b/tests/failures/grpck/05_grpck_sort_group_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/grpck/02_grpck_group_open_failure/config.txt
rename to tests/failures/grpck/05_grpck_sort_group_rename_failure/config.txt
diff --git a/tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/default/useradd b/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/default/useradd
rename to tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/group b/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/group
rename to tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/group
diff --git a/tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/gshadow b/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/gshadow
rename to tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/grpck/02_grpck_group_open_failure/config/etc/login.defs b/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/grpck/02_grpck_group_open_failure/config/etc/login.defs
rename to tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/passwd b/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/passwd
rename to tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/shadow b/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chsh/01_chsh_open_passwd_failure/config/etc/shadow
rename to tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/data/grpck.err b/tests/failures/grpck/05_grpck_sort_group_rename_failure/data/grpck.err
similarity index 100%
rename from tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/data/grpck.err
rename to tests/failures/grpck/05_grpck_sort_group_rename_failure/data/grpck.err
diff --git a/tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/grpck.test b/tests/failures/grpck/05_grpck_sort_group_rename_failure/grpck.test
similarity index 100%
rename from tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/grpck.test
rename to tests/failures/grpck/05_grpck_sort_group_rename_failure/grpck.test
diff --git a/tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config.txt b/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config.txt
rename to tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config.txt
diff --git a/tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/default/useradd b/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/default/useradd
rename to tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/group b/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/group
rename to tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/group
diff --git a/tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/gshadow b/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/gshadow
rename to tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/login.defs b/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/login.defs
rename to tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/passwd b/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/passwd
rename to tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/shadow b/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/chsh/02_chsh_rename_passwd_failure/config/etc/shadow
rename to tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/data/group b/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/data/group
similarity index 100%
rename from tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/data/group
rename to tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/data/group
diff --git a/tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/data/grpck.err b/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/data/grpck.err
similarity index 100%
rename from tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/data/grpck.err
rename to tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/data/grpck.err
diff --git a/tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/grpck.test b/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/grpck.test
similarity index 100%
rename from tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/grpck.test
rename to tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/grpck.test
diff --git a/tests/tests/failures/grpck/04_grpck_gshadow_open_failure/config.txt b/tests/failures/grpconv/01_grpconv_open_group_failure/config.txt
similarity index 100%
rename from tests/tests/failures/grpck/04_grpck_gshadow_open_failure/config.txt
rename to tests/failures/grpconv/01_grpconv_open_group_failure/config.txt
diff --git a/tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/group b/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/group
rename to tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/group
diff --git a/tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/gshadow b/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/grpck/03_grpck_system_gshadow_open_failure/config/etc/gshadow
rename to tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/gshadow
diff --git a/tests/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/login.defs b/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/login.defs
rename to tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/login.defs
diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/passwd b/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/passwd
rename to tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/passwd
diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/shadow b/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/shadow
rename to tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/shadow
diff --git a/tests/tests/failures/grpconv/01_grpconv_open_group_failure/data/grpconv.err b/tests/failures/grpconv/01_grpconv_open_group_failure/data/grpconv.err
similarity index 100%
rename from tests/tests/failures/grpconv/01_grpconv_open_group_failure/data/grpconv.err
rename to tests/failures/grpconv/01_grpconv_open_group_failure/data/grpconv.err
diff --git a/tests/tests/failures/grpconv/01_grpconv_open_group_failure/grpconv.test b/tests/failures/grpconv/01_grpconv_open_group_failure/grpconv.test
similarity index 100%
rename from tests/tests/failures/grpconv/01_grpconv_open_group_failure/grpconv.test
rename to tests/failures/grpconv/01_grpconv_open_group_failure/grpconv.test
diff --git a/tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/config.txt b/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/config.txt
rename to tests/failures/grpconv/02_grpconv_open_gshadow_failure/config.txt
diff --git a/tests/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/group b/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/group
rename to tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/group
diff --git a/tests/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/gshadow b/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/gshadow
rename to tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/login.defs b/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/login.defs
rename to tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/passwd b/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/passwd
rename to tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/shadow b/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/shadow
rename to tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/data/grpconv.err b/tests/failures/grpconv/02_grpconv_open_gshadow_failure/data/grpconv.err
similarity index 100%
rename from tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/data/grpconv.err
rename to tests/failures/grpconv/02_grpconv_open_gshadow_failure/data/grpconv.err
diff --git a/tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/grpconv.test b/tests/failures/grpconv/02_grpconv_open_gshadow_failure/grpconv.test
similarity index 100%
rename from tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/grpconv.test
rename to tests/failures/grpconv/02_grpconv_open_gshadow_failure/grpconv.test
diff --git a/tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config.txt b/tests/failures/grpconv/03_grpconv_rename_group_failure/config.txt
similarity index 100%
rename from tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config.txt
rename to tests/failures/grpconv/03_grpconv_rename_group_failure/config.txt
diff --git a/tests/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/group b/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/group
rename to tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/group
diff --git a/tests/tests/failures/grpck/04_grpck_gshadow_open_failure/data/gshadow b/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/grpck/04_grpck_gshadow_open_failure/data/gshadow
rename to tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/gshadow
diff --git a/tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/login.defs b/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/login.defs
rename to tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/login.defs
diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/passwd b/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/passwd
rename to tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/passwd
diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/shadow b/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/shadow
rename to tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/shadow
diff --git a/tests/tests/failures/grpconv/03_grpconv_rename_group_failure/data/grpconv.err b/tests/failures/grpconv/03_grpconv_rename_group_failure/data/grpconv.err
similarity index 100%
rename from tests/tests/failures/grpconv/03_grpconv_rename_group_failure/data/grpconv.err
rename to tests/failures/grpconv/03_grpconv_rename_group_failure/data/grpconv.err
diff --git a/tests/tests/failures/grpconv/03_grpconv_rename_group_failure/data/gshadow b/tests/failures/grpconv/03_grpconv_rename_group_failure/data/gshadow
similarity index 100%
rename from tests/tests/failures/grpconv/03_grpconv_rename_group_failure/data/gshadow
rename to tests/failures/grpconv/03_grpconv_rename_group_failure/data/gshadow
diff --git a/tests/tests/failures/grpconv/03_grpconv_rename_group_failure/grpconv.test b/tests/failures/grpconv/03_grpconv_rename_group_failure/grpconv.test
similarity index 100%
rename from tests/tests/failures/grpconv/03_grpconv_rename_group_failure/grpconv.test
rename to tests/failures/grpconv/03_grpconv_rename_group_failure/grpconv.test
diff --git a/tests/tests/failures/grpconv/01_grpconv_open_group_failure/config.txt b/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/grpconv/01_grpconv_open_group_failure/config.txt
rename to tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config.txt
diff --git a/tests/tests/failures/grpck/04_grpck_gshadow_open_failure/data/group b/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/grpck/04_grpck_gshadow_open_failure/data/group
rename to tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/group
diff --git a/tests/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/gshadow b/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/gshadow
rename to tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/login.defs b/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/login.defs
rename to tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/passwd b/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/passwd
rename to tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/shadow b/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/config/etc/shadow
rename to tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/data/grpconv.err b/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/data/grpconv.err
similarity index 100%
rename from tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/data/grpconv.err
rename to tests/failures/grpconv/04_grpconv_rename_gshadow_failure/data/grpconv.err
diff --git a/tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/grpconv.test b/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/grpconv.test
similarity index 100%
rename from tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/grpconv.test
rename to tests/failures/grpconv/04_grpconv_rename_gshadow_failure/grpconv.test
diff --git a/tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config.txt b/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config.txt
rename to tests/failures/grpunconv/01_grpunconv_group_rename_failure/config.txt
diff --git a/tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/group b/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/group
rename to tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/group
diff --git a/tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/gshadow b/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/gshadow
rename to tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/login.defs b/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/login.defs
rename to tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/passwd b/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/passwd
rename to tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/shadow b/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/grpck/05_grpck_sort_group_rename_failure/config/etc/shadow
rename to tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/data/grpunconv.err b/tests/failures/grpunconv/01_grpunconv_group_rename_failure/data/grpunconv.err
similarity index 100%
rename from tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/data/grpunconv.err
rename to tests/failures/grpunconv/01_grpunconv_group_rename_failure/data/grpunconv.err
diff --git a/tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/grpunconv.test b/tests/failures/grpunconv/01_grpunconv_group_rename_failure/grpunconv.test
similarity index 100%
rename from tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/grpunconv.test
rename to tests/failures/grpunconv/01_grpunconv_group_rename_failure/grpunconv.test
diff --git a/tests/tests/failures/grpconv/03_grpconv_rename_group_failure/config.txt b/tests/failures/grpunconv/02_grpunconv_open_group_failure/config.txt
similarity index 100%
rename from tests/tests/failures/grpconv/03_grpconv_rename_group_failure/config.txt
rename to tests/failures/grpunconv/02_grpunconv_open_group_failure/config.txt
diff --git a/tests/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/group b/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/group
rename to tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/group
diff --git a/tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/gshadow b/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/gshadow
rename to tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/gshadow
diff --git a/tests/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/login.defs b/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/login.defs
rename to tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/login.defs
diff --git a/tests/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/passwd b/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/passwd
rename to tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/passwd
diff --git a/tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/shadow b/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config/etc/shadow
rename to tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/shadow
diff --git a/tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/data/grpunconv.err b/tests/failures/grpunconv/02_grpunconv_open_group_failure/data/grpunconv.err
similarity index 100%
rename from tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/data/grpunconv.err
rename to tests/failures/grpunconv/02_grpunconv_open_group_failure/data/grpunconv.err
diff --git a/tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/grpunconv.test b/tests/failures/grpunconv/02_grpunconv_open_group_failure/grpunconv.test
similarity index 100%
rename from tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/grpunconv.test
rename to tests/failures/grpunconv/02_grpunconv_open_group_failure/grpunconv.test
diff --git a/tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config.txt b/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config.txt
rename to tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config.txt
diff --git a/tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/group b/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/group
rename to tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/group
diff --git a/tests/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/gshadow b/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/gshadow
rename to tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/login.defs b/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/login.defs
rename to tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/passwd b/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/passwd
rename to tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/shadow b/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/shadow
rename to tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/data/grpunconv.err b/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/data/grpunconv.err
similarity index 100%
rename from tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/data/grpunconv.err
rename to tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/data/grpunconv.err
diff --git a/tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/grpunconv.test b/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/grpunconv.test
similarity index 100%
rename from tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/grpunconv.test
rename to tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/grpunconv.test
diff --git a/tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config.txt b/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config.txt
rename to tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config.txt
diff --git a/tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/group b/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/group
rename to tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/group
diff --git a/tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/gshadow b/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/gshadow
rename to tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/login.defs b/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/login.defs
rename to tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/passwd b/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/passwd
rename to tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/shadow b/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/shadow
rename to tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/data/group b/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/data/group
similarity index 100%
rename from tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/data/group
rename to tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/data/group
diff --git a/tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/data/grpunconv.err b/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/data/grpunconv.err
similarity index 100%
rename from tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/data/grpunconv.err
rename to tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/data/grpunconv.err
diff --git a/tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/grpunconv.test b/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/grpunconv.test
similarity index 100%
rename from tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/grpunconv.test
rename to tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/grpunconv.test
diff --git a/tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/config.txt b/tests/failures/newusers/01_newusers_open_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/config.txt
rename to tests/failures/newusers/01_newusers_open_passwd_failure/config.txt
diff --git a/tests/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/default/useradd b/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/default/useradd
rename to tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/group b/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/group
rename to tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/gshadow b/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/groupadd/04_groupadd_group_open_failure/config/etc/gshadow
rename to tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/login.defs b/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/login.defs
rename to tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/passwd b/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/passwd
rename to tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/shadow b/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/grpck/04_grpck_gshadow_open_failure/config/etc/shadow
rename to tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/newusers/01_newusers_open_passwd_failure/data/newusers.err b/tests/failures/newusers/01_newusers_open_passwd_failure/data/newusers.err
similarity index 100%
rename from tests/tests/failures/newusers/01_newusers_open_passwd_failure/data/newusers.err
rename to tests/failures/newusers/01_newusers_open_passwd_failure/data/newusers.err
diff --git a/tests/tests/failures/newusers/01_newusers_open_passwd_failure/data/newusers.list b/tests/failures/newusers/01_newusers_open_passwd_failure/data/newusers.list
similarity index 100%
rename from tests/tests/failures/newusers/01_newusers_open_passwd_failure/data/newusers.list
rename to tests/failures/newusers/01_newusers_open_passwd_failure/data/newusers.list
diff --git a/tests/tests/failures/newusers/01_newusers_open_passwd_failure/newusers.test b/tests/failures/newusers/01_newusers_open_passwd_failure/newusers.test
similarity index 100%
rename from tests/tests/failures/newusers/01_newusers_open_passwd_failure/newusers.test
rename to tests/failures/newusers/01_newusers_open_passwd_failure/newusers.test
diff --git a/tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config.txt b/tests/failures/newusers/02_newusers_open_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config.txt
rename to tests/failures/newusers/02_newusers_open_shadow_failure/config.txt
diff --git a/tests/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/default/useradd b/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/default/useradd
rename to tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/group b/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/group
rename to tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/gshadow b/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/gshadow
rename to tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/login.defs b/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/login.defs
rename to tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/passwd b/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/passwd
rename to tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/shadow b/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/shadow
rename to tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/newusers/02_newusers_open_shadow_failure/data/newusers.err b/tests/failures/newusers/02_newusers_open_shadow_failure/data/newusers.err
similarity index 100%
rename from tests/tests/failures/newusers/02_newusers_open_shadow_failure/data/newusers.err
rename to tests/failures/newusers/02_newusers_open_shadow_failure/data/newusers.err
diff --git a/tests/tests/failures/newusers/02_newusers_open_shadow_failure/data/newusers.list b/tests/failures/newusers/02_newusers_open_shadow_failure/data/newusers.list
similarity index 100%
rename from tests/tests/failures/newusers/02_newusers_open_shadow_failure/data/newusers.list
rename to tests/failures/newusers/02_newusers_open_shadow_failure/data/newusers.list
diff --git a/tests/tests/failures/newusers/02_newusers_open_shadow_failure/newusers.test b/tests/failures/newusers/02_newusers_open_shadow_failure/newusers.test
similarity index 100%
rename from tests/tests/failures/newusers/02_newusers_open_shadow_failure/newusers.test
rename to tests/failures/newusers/02_newusers_open_shadow_failure/newusers.test
diff --git a/tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config.txt b/tests/failures/newusers/03_newusers_open_group_failure/config.txt
similarity index 100%
rename from tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config.txt
rename to tests/failures/newusers/03_newusers_open_group_failure/config.txt
diff --git a/tests/tests/failures/newusers/03_newusers_open_group_failure/config/etc/default/useradd b/tests/failures/newusers/03_newusers_open_group_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/newusers/03_newusers_open_group_failure/config/etc/default/useradd
rename to tests/failures/newusers/03_newusers_open_group_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/group b/tests/failures/newusers/03_newusers_open_group_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/group
rename to tests/failures/newusers/03_newusers_open_group_failure/config/etc/group
diff --git a/tests/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/gshadow b/tests/failures/newusers/03_newusers_open_group_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/gshadow
rename to tests/failures/newusers/03_newusers_open_group_failure/config/etc/gshadow
diff --git a/tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/login.defs b/tests/failures/newusers/03_newusers_open_group_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/login.defs
rename to tests/failures/newusers/03_newusers_open_group_failure/config/etc/login.defs
diff --git a/tests/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/passwd b/tests/failures/newusers/03_newusers_open_group_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/passwd
rename to tests/failures/newusers/03_newusers_open_group_failure/config/etc/passwd
diff --git a/tests/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/shadow b/tests/failures/newusers/03_newusers_open_group_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/shadow
rename to tests/failures/newusers/03_newusers_open_group_failure/config/etc/shadow
diff --git a/tests/tests/failures/newusers/03_newusers_open_group_failure/data/newusers.err b/tests/failures/newusers/03_newusers_open_group_failure/data/newusers.err
similarity index 100%
rename from tests/tests/failures/newusers/03_newusers_open_group_failure/data/newusers.err
rename to tests/failures/newusers/03_newusers_open_group_failure/data/newusers.err
diff --git a/tests/tests/failures/newusers/03_newusers_open_group_failure/data/newusers.list b/tests/failures/newusers/03_newusers_open_group_failure/data/newusers.list
similarity index 100%
rename from tests/tests/failures/newusers/03_newusers_open_group_failure/data/newusers.list
rename to tests/failures/newusers/03_newusers_open_group_failure/data/newusers.list
diff --git a/tests/tests/failures/newusers/03_newusers_open_group_failure/newusers.test b/tests/failures/newusers/03_newusers_open_group_failure/newusers.test
similarity index 100%
rename from tests/tests/failures/newusers/03_newusers_open_group_failure/newusers.test
rename to tests/failures/newusers/03_newusers_open_group_failure/newusers.test
diff --git a/tests/tests/failures/newusers/01_newusers_open_passwd_failure/config.txt b/tests/failures/newusers/04_newusers_open_gshadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/newusers/01_newusers_open_passwd_failure/config.txt
rename to tests/failures/newusers/04_newusers_open_gshadow_failure/config.txt
diff --git a/tests/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/default/useradd b/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/default/useradd
rename to tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/newusers/03_newusers_open_group_failure/config/etc/group b/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/newusers/03_newusers_open_group_failure/config/etc/group
rename to tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/group
diff --git a/tests/tests/failures/newusers/03_newusers_open_group_failure/config/etc/gshadow b/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/newusers/03_newusers_open_group_failure/config/etc/gshadow
rename to tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/login.defs b/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/login.defs
rename to tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/newusers/03_newusers_open_group_failure/config/etc/passwd b/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/newusers/03_newusers_open_group_failure/config/etc/passwd
rename to tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/newusers/03_newusers_open_group_failure/config/etc/shadow b/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/newusers/03_newusers_open_group_failure/config/etc/shadow
rename to tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/newusers/04_newusers_open_gshadow_failure/data/newusers.err b/tests/failures/newusers/04_newusers_open_gshadow_failure/data/newusers.err
similarity index 100%
rename from tests/tests/failures/newusers/04_newusers_open_gshadow_failure/data/newusers.err
rename to tests/failures/newusers/04_newusers_open_gshadow_failure/data/newusers.err
diff --git a/tests/tests/failures/newusers/04_newusers_open_gshadow_failure/data/newusers.list b/tests/failures/newusers/04_newusers_open_gshadow_failure/data/newusers.list
similarity index 100%
rename from tests/tests/failures/newusers/04_newusers_open_gshadow_failure/data/newusers.list
rename to tests/failures/newusers/04_newusers_open_gshadow_failure/data/newusers.list
diff --git a/tests/tests/failures/newusers/04_newusers_open_gshadow_failure/newusers.test b/tests/failures/newusers/04_newusers_open_gshadow_failure/newusers.test
similarity index 100%
rename from tests/tests/failures/newusers/04_newusers_open_gshadow_failure/newusers.test
rename to tests/failures/newusers/04_newusers_open_gshadow_failure/newusers.test
diff --git a/tests/tests/failures/newusers/02_newusers_open_shadow_failure/config.txt b/tests/failures/newusers/05_newusers_rename_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/newusers/02_newusers_open_shadow_failure/config.txt
rename to tests/failures/newusers/05_newusers_rename_passwd_failure/config.txt
diff --git a/tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/default/useradd b/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/default/useradd
rename to tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/group b/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/group
rename to tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/gshadow b/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/gshadow
rename to tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/login.defs b/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/login.defs
rename to tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/passwd b/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/passwd
rename to tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/shadow b/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/shadow
rename to tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/newusers/05_newusers_rename_passwd_failure/data/newusers.err b/tests/failures/newusers/05_newusers_rename_passwd_failure/data/newusers.err
similarity index 100%
rename from tests/tests/failures/newusers/05_newusers_rename_passwd_failure/data/newusers.err
rename to tests/failures/newusers/05_newusers_rename_passwd_failure/data/newusers.err
diff --git a/tests/tests/failures/newusers/05_newusers_rename_passwd_failure/data/newusers.list b/tests/failures/newusers/05_newusers_rename_passwd_failure/data/newusers.list
similarity index 100%
rename from tests/tests/failures/newusers/05_newusers_rename_passwd_failure/data/newusers.list
rename to tests/failures/newusers/05_newusers_rename_passwd_failure/data/newusers.list
diff --git a/tests/tests/failures/newusers/05_newusers_rename_passwd_failure/newusers.test b/tests/failures/newusers/05_newusers_rename_passwd_failure/newusers.test
similarity index 100%
rename from tests/tests/failures/newusers/05_newusers_rename_passwd_failure/newusers.test
rename to tests/failures/newusers/05_newusers_rename_passwd_failure/newusers.test
diff --git a/tests/tests/failures/newusers/03_newusers_open_group_failure/config.txt b/tests/failures/newusers/06_newusers_rename_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/newusers/03_newusers_open_group_failure/config.txt
rename to tests/failures/newusers/06_newusers_rename_shadow_failure/config.txt
diff --git a/tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/group b/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/group
rename to tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/gshadow b/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/gshadow
rename to tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/newusers/03_newusers_open_group_failure/config/etc/login.defs b/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/newusers/03_newusers_open_group_failure/config/etc/login.defs
rename to tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/passwd b/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/passwd
rename to tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/shadow b/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/shadow
rename to tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/newusers/06_newusers_rename_shadow_failure/data/newusers.err b/tests/failures/newusers/06_newusers_rename_shadow_failure/data/newusers.err
similarity index 100%
rename from tests/tests/failures/newusers/06_newusers_rename_shadow_failure/data/newusers.err
rename to tests/failures/newusers/06_newusers_rename_shadow_failure/data/newusers.err
diff --git a/tests/tests/failures/newusers/06_newusers_rename_shadow_failure/data/newusers.list b/tests/failures/newusers/06_newusers_rename_shadow_failure/data/newusers.list
similarity index 100%
rename from tests/tests/failures/newusers/06_newusers_rename_shadow_failure/data/newusers.list
rename to tests/failures/newusers/06_newusers_rename_shadow_failure/data/newusers.list
diff --git a/tests/tests/failures/newusers/06_newusers_rename_shadow_failure/data/passwd b/tests/failures/newusers/06_newusers_rename_shadow_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/newusers/06_newusers_rename_shadow_failure/data/passwd
rename to tests/failures/newusers/06_newusers_rename_shadow_failure/data/passwd
diff --git a/tests/tests/failures/newusers/06_newusers_rename_shadow_failure/newusers.test b/tests/failures/newusers/06_newusers_rename_shadow_failure/newusers.test
similarity index 100%
rename from tests/tests/failures/newusers/06_newusers_rename_shadow_failure/newusers.test
rename to tests/failures/newusers/06_newusers_rename_shadow_failure/newusers.test
diff --git a/tests/tests/failures/newusers/04_newusers_open_gshadow_failure/config.txt b/tests/failures/newusers/07_newusers_rename_group_failure/config.txt
similarity index 100%
rename from tests/tests/failures/newusers/04_newusers_open_gshadow_failure/config.txt
rename to tests/failures/newusers/07_newusers_rename_group_failure/config.txt
diff --git a/tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/group b/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/group
rename to tests/failures/newusers/07_newusers_rename_group_failure/config/etc/group
diff --git a/tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/gshadow b/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/gshadow
rename to tests/failures/newusers/07_newusers_rename_group_failure/config/etc/gshadow
diff --git a/tests/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/login.defs b/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/login.defs
rename to tests/failures/newusers/07_newusers_rename_group_failure/config/etc/login.defs
diff --git a/tests/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/passwd b/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/passwd
rename to tests/failures/newusers/07_newusers_rename_group_failure/config/etc/passwd
diff --git a/tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/shadow b/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/shadow
rename to tests/failures/newusers/07_newusers_rename_group_failure/config/etc/shadow
diff --git a/tests/tests/failures/newusers/07_newusers_rename_group_failure/data/newusers.err b/tests/failures/newusers/07_newusers_rename_group_failure/data/newusers.err
similarity index 100%
rename from tests/tests/failures/newusers/07_newusers_rename_group_failure/data/newusers.err
rename to tests/failures/newusers/07_newusers_rename_group_failure/data/newusers.err
diff --git a/tests/tests/failures/newusers/07_newusers_rename_group_failure/data/newusers.list b/tests/failures/newusers/07_newusers_rename_group_failure/data/newusers.list
similarity index 100%
rename from tests/tests/failures/newusers/07_newusers_rename_group_failure/data/newusers.list
rename to tests/failures/newusers/07_newusers_rename_group_failure/data/newusers.list
diff --git a/tests/tests/failures/newusers/07_newusers_rename_group_failure/data/passwd b/tests/failures/newusers/07_newusers_rename_group_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/newusers/07_newusers_rename_group_failure/data/passwd
rename to tests/failures/newusers/07_newusers_rename_group_failure/data/passwd
diff --git a/tests/tests/failures/newusers/07_newusers_rename_group_failure/data/shadow b/tests/failures/newusers/07_newusers_rename_group_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/newusers/07_newusers_rename_group_failure/data/shadow
rename to tests/failures/newusers/07_newusers_rename_group_failure/data/shadow
diff --git a/tests/tests/failures/newusers/07_newusers_rename_group_failure/newusers.test b/tests/failures/newusers/07_newusers_rename_group_failure/newusers.test
similarity index 100%
rename from tests/tests/failures/newusers/07_newusers_rename_group_failure/newusers.test
rename to tests/failures/newusers/07_newusers_rename_group_failure/newusers.test
diff --git a/tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config.txt b/tests/failures/newusers/08_newusers_rename_gshadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config.txt
rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/config.txt
diff --git a/tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/group b/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/group
rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/group
diff --git a/tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/gshadow b/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/gshadow
rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/login.defs b/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/login.defs
rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/passwd b/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/passwd
rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/shadow b/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/shadow
rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/group b/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/group
similarity index 100%
rename from tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/group
rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/data/group
diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/newusers.err b/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/newusers.err
similarity index 100%
rename from tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/newusers.err
rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/data/newusers.err
diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/newusers.list b/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/newusers.list
similarity index 100%
rename from tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/newusers.list
rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/data/newusers.list
diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/passwd b/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/passwd
rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/data/passwd
diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/shadow b/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/data/shadow
rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/data/shadow
diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/newusers.test b/tests/failures/newusers/08_newusers_rename_gshadow_failure/newusers.test
similarity index 100%
rename from tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/newusers.test
rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/newusers.test
diff --git a/tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config.txt b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config.txt
similarity index 100%
rename from tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config.txt
rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config.txt
diff --git a/tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/group b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/group
similarity index 100%
rename from tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/group
rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/group
diff --git a/tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/gshadow b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/gshadow
rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/gshadow
diff --git a/tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/login.defs b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/login.defs
rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/login.defs
diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/passwd b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/passwd
rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/passwd
diff --git a/tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/shadow b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/shadow
rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/shadow
diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/group b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/group
similarity index 100%
rename from tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/group
rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/group
diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/gshadow b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/gshadow
similarity index 100%
rename from tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/gshadow
rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/gshadow
diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/newusers.err b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/newusers.err
similarity index 100%
rename from tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/newusers.err
rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/newusers.err
diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/newusers.list b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/newusers.list
similarity index 100%
rename from tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/newusers.list
rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/newusers.list
diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/passwd b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/passwd
similarity index 100%
rename from tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/passwd
rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/data/passwd
diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/newusers.test b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/newusers.test
similarity index 100%
rename from tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/newusers.test
rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/newusers.test
diff --git a/tests/tests/failures/newusers/10_newusers_time_0/config.txt b/tests/failures/newusers/10_newusers_time_0/config.txt
similarity index 100%
rename from tests/tests/failures/newusers/10_newusers_time_0/config.txt
rename to tests/failures/newusers/10_newusers_time_0/config.txt
diff --git a/tests/tests/failures/newusers/10_newusers_time_0/config/etc/default/useradd b/tests/failures/newusers/10_newusers_time_0/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/newusers/10_newusers_time_0/config/etc/default/useradd
rename to tests/failures/newusers/10_newusers_time_0/config/etc/default/useradd
diff --git a/tests/tests/failures/newusers/10_newusers_time_0/config/etc/group b/tests/failures/newusers/10_newusers_time_0/config/etc/group
similarity index 100%
rename from tests/tests/failures/newusers/10_newusers_time_0/config/etc/group
rename to tests/failures/newusers/10_newusers_time_0/config/etc/group
diff --git a/tests/tests/failures/newusers/10_newusers_time_0/config/etc/gshadow b/tests/failures/newusers/10_newusers_time_0/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/newusers/10_newusers_time_0/config/etc/gshadow
rename to tests/failures/newusers/10_newusers_time_0/config/etc/gshadow
diff --git a/tests/tests/failures/newusers/10_newusers_time_0/config/etc/pam.d/common-password b/tests/failures/newusers/10_newusers_time_0/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/failures/newusers/10_newusers_time_0/config/etc/pam.d/common-password
rename to tests/failures/newusers/10_newusers_time_0/config/etc/pam.d/common-password
diff --git a/tests/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/passwd b/tests/failures/newusers/10_newusers_time_0/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/passwd
rename to tests/failures/newusers/10_newusers_time_0/config/etc/passwd
diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/shadow b/tests/failures/newusers/10_newusers_time_0/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/shadow
rename to tests/failures/newusers/10_newusers_time_0/config/etc/shadow
diff --git a/tests/tests/failures/newusers/10_newusers_time_0/data/group b/tests/failures/newusers/10_newusers_time_0/data/group
similarity index 100%
rename from tests/tests/failures/newusers/10_newusers_time_0/data/group
rename to tests/failures/newusers/10_newusers_time_0/data/group
diff --git a/tests/tests/failures/newusers/10_newusers_time_0/data/gshadow b/tests/failures/newusers/10_newusers_time_0/data/gshadow
similarity index 100%
rename from tests/tests/failures/newusers/10_newusers_time_0/data/gshadow
rename to tests/failures/newusers/10_newusers_time_0/data/gshadow
diff --git a/tests/tests/failures/newusers/10_newusers_time_0/data/newusers.list b/tests/failures/newusers/10_newusers_time_0/data/newusers.list
similarity index 100%
rename from tests/tests/failures/newusers/10_newusers_time_0/data/newusers.list
rename to tests/failures/newusers/10_newusers_time_0/data/newusers.list
diff --git a/tests/tests/failures/newusers/10_newusers_time_0/data/passwd b/tests/failures/newusers/10_newusers_time_0/data/passwd
similarity index 100%
rename from tests/tests/failures/newusers/10_newusers_time_0/data/passwd
rename to tests/failures/newusers/10_newusers_time_0/data/passwd
diff --git a/tests/tests/failures/newusers/10_newusers_time_0/data/shadow b/tests/failures/newusers/10_newusers_time_0/data/shadow
similarity index 100%
rename from tests/tests/failures/newusers/10_newusers_time_0/data/shadow
rename to tests/failures/newusers/10_newusers_time_0/data/shadow
diff --git a/tests/tests/failures/newusers/10_newusers_time_0/newusers.test b/tests/failures/newusers/10_newusers_time_0/newusers.test
similarity index 100%
rename from tests/tests/failures/newusers/10_newusers_time_0/newusers.test
rename to tests/failures/newusers/10_newusers_time_0/newusers.test
diff --git a/tests/tests/failures/newusers/07_newusers_rename_group_failure/config.txt b/tests/failures/pwck/01_pwck_system_passwd_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/newusers/07_newusers_rename_group_failure/config.txt
rename to tests/failures/pwck/01_pwck_system_passwd_open_failure/config.txt
diff --git a/tests/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/group b/tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/group
rename to tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/group
diff --git a/tests/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/gshadow b/tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/gshadow
rename to tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/newusers/10_newusers_time_0/config/etc/passwd b/tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/newusers/10_newusers_time_0/config/etc/passwd
rename to tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/newusers/10_newusers_time_0/config/etc/shadow b/tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/newusers/10_newusers_time_0/config/etc/shadow
rename to tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwck/01_pwck_system_passwd_open_failure/data/pwck.err b/tests/failures/pwck/01_pwck_system_passwd_open_failure/data/pwck.err
similarity index 100%
rename from tests/tests/failures/pwck/01_pwck_system_passwd_open_failure/data/pwck.err
rename to tests/failures/pwck/01_pwck_system_passwd_open_failure/data/pwck.err
diff --git a/tests/tests/failures/pwck/01_pwck_system_passwd_open_failure/pwck.test b/tests/failures/pwck/01_pwck_system_passwd_open_failure/pwck.test
similarity index 100%
rename from tests/tests/failures/pwck/01_pwck_system_passwd_open_failure/pwck.test
rename to tests/failures/pwck/01_pwck_system_passwd_open_failure/pwck.test
diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/config.txt b/tests/failures/pwck/02_pwck_passwd_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/config.txt
rename to tests/failures/pwck/02_pwck_passwd_open_failure/config.txt
diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/group b/tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/group
rename to tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/group
diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/gshadow b/tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/gshadow
rename to tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/passwd b/tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/passwd
rename to tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/shadow b/tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/shadow
rename to tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwck/02_pwck_passwd_open_failure/data/pwck.err b/tests/failures/pwck/02_pwck_passwd_open_failure/data/pwck.err
similarity index 100%
rename from tests/tests/failures/pwck/02_pwck_passwd_open_failure/data/pwck.err
rename to tests/failures/pwck/02_pwck_passwd_open_failure/data/pwck.err
diff --git a/tests/tests/failures/pwck/02_pwck_passwd_open_failure/pwck.test b/tests/failures/pwck/02_pwck_passwd_open_failure/pwck.test
similarity index 100%
rename from tests/tests/failures/pwck/02_pwck_passwd_open_failure/pwck.test
rename to tests/failures/pwck/02_pwck_passwd_open_failure/pwck.test
diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config.txt b/tests/failures/pwck/03_pwck_system_shadow_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config.txt
rename to tests/failures/pwck/03_pwck_system_shadow_open_failure/config.txt
diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/group b/tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/group
rename to tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/group
diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/gshadow b/tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/gshadow
rename to tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/passwd b/tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/passwd
rename to tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/shadow b/tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/shadow
rename to tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/data/pwck.err b/tests/failures/pwck/03_pwck_system_shadow_open_failure/data/pwck.err
similarity index 100%
rename from tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/data/pwck.err
rename to tests/failures/pwck/03_pwck_system_shadow_open_failure/data/pwck.err
diff --git a/tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/pwck.test b/tests/failures/pwck/03_pwck_system_shadow_open_failure/pwck.test
similarity index 100%
rename from tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/pwck.test
rename to tests/failures/pwck/03_pwck_system_shadow_open_failure/pwck.test
diff --git a/tests/tests/failures/pwck/01_pwck_system_passwd_open_failure/config.txt b/tests/failures/pwck/04_pwck_shadow_open_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwck/01_pwck_system_passwd_open_failure/config.txt
rename to tests/failures/pwck/04_pwck_shadow_open_failure/config.txt
diff --git a/tests/tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/group b/tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/group
rename to tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/group
diff --git a/tests/tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/gshadow b/tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwck/01_pwck_system_passwd_open_failure/config/etc/gshadow
rename to tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/passwd b/tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/passwd
rename to tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/shadow b/tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/shadow
rename to tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/passwd b/tests/failures/pwck/04_pwck_shadow_open_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/passwd
rename to tests/failures/pwck/04_pwck_shadow_open_failure/data/passwd
diff --git a/tests/tests/failures/pwck/04_pwck_shadow_open_failure/data/pwck.err b/tests/failures/pwck/04_pwck_shadow_open_failure/data/pwck.err
similarity index 100%
rename from tests/tests/failures/pwck/04_pwck_shadow_open_failure/data/pwck.err
rename to tests/failures/pwck/04_pwck_shadow_open_failure/data/pwck.err
diff --git a/tests/tests/failures/pwck/04_pwck_shadow_open_failure/pwck.test b/tests/failures/pwck/04_pwck_shadow_open_failure/pwck.test
similarity index 100%
rename from tests/tests/failures/pwck/04_pwck_shadow_open_failure/pwck.test
rename to tests/failures/pwck/04_pwck_shadow_open_failure/pwck.test
diff --git a/tests/tests/failures/pwck/02_pwck_passwd_open_failure/config.txt b/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwck/02_pwck_passwd_open_failure/config.txt
rename to tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config.txt
diff --git a/tests/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/group b/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/group
rename to tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/group
diff --git a/tests/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/gshadow b/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/gshadow
rename to tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/passwd b/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/passwd
rename to tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/shadow b/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config/etc/shadow
rename to tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/data/pwck.err b/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/data/pwck.err
similarity index 100%
rename from tests/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/data/pwck.err
rename to tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/data/pwck.err
diff --git a/tests/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/pwck.test b/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/pwck.test
similarity index 100%
rename from tests/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/pwck.test
rename to tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/pwck.test
diff --git a/tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/config.txt b/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/config.txt
rename to tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config.txt
diff --git a/tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/group b/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/group
rename to tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/group
diff --git a/tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/gshadow b/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/gshadow
rename to tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/passwd b/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/passwd
rename to tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/shadow b/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/config/etc/shadow
rename to tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/data/passwd b/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/data/passwd
rename to tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/data/passwd
diff --git a/tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/data/pwck.err b/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/data/pwck.err
similarity index 100%
rename from tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/data/pwck.err
rename to tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/data/pwck.err
diff --git a/tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/pwck.test b/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/pwck.test
similarity index 100%
rename from tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/pwck.test
rename to tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/pwck.test
diff --git a/tests/tests/failures/pwck/04_pwck_shadow_open_failure/config.txt b/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwck/04_pwck_shadow_open_failure/config.txt
rename to tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config.txt
diff --git a/tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/group b/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/group
rename to tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/group
diff --git a/tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/gshadow b/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/gshadow
rename to tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/passwd b/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/passwd
rename to tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/shadow b/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/shadow
rename to tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/data/passwd b/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/data/passwd
rename to tests/failures/pwck/07_pwck_sort_passwd_rename_failure/data/passwd
diff --git a/tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/data/pwck.err b/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/data/pwck.err
similarity index 100%
rename from tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/data/pwck.err
rename to tests/failures/pwck/07_pwck_sort_passwd_rename_failure/data/pwck.err
diff --git a/tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/pwck.test b/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/pwck.test
similarity index 100%
rename from tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/pwck.test
rename to tests/failures/pwck/07_pwck_sort_passwd_rename_failure/pwck.test
diff --git a/tests/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config.txt b/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config.txt
rename to tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config.txt
diff --git a/tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/group b/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/group
rename to tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/group
diff --git a/tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/gshadow b/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/gshadow
rename to tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/passwd b/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/passwd
rename to tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/shadow b/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/shadow
rename to tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/passwd b/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/passwd
rename to tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/passwd
diff --git a/tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/passwd.out b/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/passwd.out
similarity index 100%
rename from tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/passwd.out
rename to tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/passwd.out
diff --git a/tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/pwck.err b/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/pwck.err
similarity index 100%
rename from tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/pwck.err
rename to tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/pwck.err
diff --git a/tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/shadow b/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/shadow
rename to tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/shadow
diff --git a/tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/pwck.test b/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/pwck.test
similarity index 100%
rename from tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/pwck.test
rename to tests/failures/pwck/08_pwck_sort_shadow_rename_failure/pwck.test
diff --git a/tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config.txt b/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config.txt
similarity index 100%
rename from tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config.txt
rename to tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config.txt
diff --git a/tests/tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/group b/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/group
rename to tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/group
diff --git a/tests/tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/gshadow b/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/gshadow
rename to tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/gshadow
diff --git a/tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/passwd b/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/passwd
rename to tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/passwd
diff --git a/tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/shadow b/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/shadow
rename to tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/shadow
diff --git a/tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/data/shadow b/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/data/shadow
similarity index 100%
rename from tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/data/shadow
rename to tests/failures/pwck/09_pwck_create_shadow_entry_time_0/data/shadow
diff --git a/tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/pwck.exp b/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/pwck.exp
similarity index 100%
rename from tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/pwck.exp
rename to tests/failures/pwck/09_pwck_create_shadow_entry_time_0/pwck.exp
diff --git a/tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/pwck.test b/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/pwck.test
similarity index 100%
rename from tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/pwck.test
rename to tests/failures/pwck/09_pwck_create_shadow_entry_time_0/pwck.test
diff --git a/tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config.txt b/tests/failures/pwconv/01_pwconv_open_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config.txt
rename to tests/failures/pwconv/01_pwconv_open_passwd_failure/config.txt
diff --git a/tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/group b/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/group
rename to tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/gshadow b/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/gshadow
rename to tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/login.defs b/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/login.defs
rename to tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/passwd b/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/passwd
rename to tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/shadow b/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/shadow
rename to tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/data/pwconv.err b/tests/failures/pwconv/01_pwconv_open_passwd_failure/data/pwconv.err
similarity index 100%
rename from tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/data/pwconv.err
rename to tests/failures/pwconv/01_pwconv_open_passwd_failure/data/pwconv.err
diff --git a/tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/pwconv.test b/tests/failures/pwconv/01_pwconv_open_passwd_failure/pwconv.test
similarity index 100%
rename from tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/pwconv.test
rename to tests/failures/pwconv/01_pwconv_open_passwd_failure/pwconv.test
diff --git a/tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config.txt b/tests/failures/pwconv/02_pwconv_open_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config.txt
rename to tests/failures/pwconv/02_pwconv_open_shadow_failure/config.txt
diff --git a/tests/tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/group b/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/group
rename to tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/gshadow b/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/gshadow
rename to tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/login.defs b/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/login.defs
rename to tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/passwd b/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/passwd
rename to tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/shadow b/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwck/05_pwck_sort_system_passwd_rename_failure/config/etc/shadow
rename to tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/data/pwconv.err b/tests/failures/pwconv/02_pwconv_open_shadow_failure/data/pwconv.err
similarity index 100%
rename from tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/data/pwconv.err
rename to tests/failures/pwconv/02_pwconv_open_shadow_failure/data/pwconv.err
diff --git a/tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/pwconv.test b/tests/failures/pwconv/02_pwconv_open_shadow_failure/pwconv.test
similarity index 100%
rename from tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/pwconv.test
rename to tests/failures/pwconv/02_pwconv_open_shadow_failure/pwconv.test
diff --git a/tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config.txt b/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config.txt
rename to tests/failures/pwconv/03_pwconv_rename_passwd_failure/config.txt
diff --git a/tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/group b/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/group
rename to tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/gshadow b/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwck/09_pwck_create_shadow_entry_time_0/config/etc/gshadow
rename to tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/login.defs b/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/login.defs
rename to tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/passwd b/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/passwd
rename to tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/shadow b/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwck/06_pwck_sort_system_shadow_rename_failure/config/etc/shadow
rename to tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/data/pwconv.err b/tests/failures/pwconv/03_pwconv_rename_passwd_failure/data/pwconv.err
similarity index 100%
rename from tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/data/pwconv.err
rename to tests/failures/pwconv/03_pwconv_rename_passwd_failure/data/pwconv.err
diff --git a/tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/data/shadow b/tests/failures/pwconv/03_pwconv_rename_passwd_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/data/shadow
rename to tests/failures/pwconv/03_pwconv_rename_passwd_failure/data/shadow
diff --git a/tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/pwconv.test b/tests/failures/pwconv/03_pwconv_rename_passwd_failure/pwconv.test
similarity index 100%
rename from tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/pwconv.test
rename to tests/failures/pwconv/03_pwconv_rename_passwd_failure/pwconv.test
diff --git a/tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config.txt b/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config.txt
rename to tests/failures/pwconv/04_pwconv_rename_shadow_failure/config.txt
diff --git a/tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/group b/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/group
rename to tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/gshadow b/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/gshadow
rename to tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/login.defs b/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/login.defs
rename to tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/passwd b/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/passwd
rename to tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/shadow b/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config/etc/shadow
rename to tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/data/pwconv.err b/tests/failures/pwconv/04_pwconv_rename_shadow_failure/data/pwconv.err
similarity index 100%
rename from tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/data/pwconv.err
rename to tests/failures/pwconv/04_pwconv_rename_shadow_failure/data/pwconv.err
diff --git a/tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/pwconv.test b/tests/failures/pwconv/04_pwconv_rename_shadow_failure/pwconv.test
similarity index 100%
rename from tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/pwconv.test
rename to tests/failures/pwconv/04_pwconv_rename_shadow_failure/pwconv.test
diff --git a/tests/tests/failures/pwconv/05_pwconv_time_0/config.txt b/tests/failures/pwconv/05_pwconv_time_0/config.txt
similarity index 100%
rename from tests/tests/failures/pwconv/05_pwconv_time_0/config.txt
rename to tests/failures/pwconv/05_pwconv_time_0/config.txt
diff --git a/tests/tests/cptools/10_cppw-g-s/config/etc/group b/tests/failures/pwconv/05_pwconv_time_0/config/etc/group
similarity index 100%
rename from tests/tests/cptools/10_cppw-g-s/config/etc/group
rename to tests/failures/pwconv/05_pwconv_time_0/config/etc/group
diff --git a/tests/tests/cptools/10_cppw-g-s/config/etc/gshadow b/tests/failures/pwconv/05_pwconv_time_0/config/etc/gshadow
similarity index 100%
rename from tests/tests/cptools/10_cppw-g-s/config/etc/gshadow
rename to tests/failures/pwconv/05_pwconv_time_0/config/etc/gshadow
diff --git a/tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/passwd b/tests/failures/pwconv/05_pwconv_time_0/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/passwd
rename to tests/failures/pwconv/05_pwconv_time_0/config/etc/passwd
diff --git a/tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/shadow b/tests/failures/pwconv/05_pwconv_time_0/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/config/etc/shadow
rename to tests/failures/pwconv/05_pwconv_time_0/config/etc/shadow
diff --git a/tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/passwd b/tests/failures/pwconv/05_pwconv_time_0/data/passwd
similarity index 100%
rename from tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/passwd
rename to tests/failures/pwconv/05_pwconv_time_0/data/passwd
diff --git a/tests/tests/failures/pwconv/05_pwconv_time_0/data/shadow b/tests/failures/pwconv/05_pwconv_time_0/data/shadow
similarity index 100%
rename from tests/tests/failures/pwconv/05_pwconv_time_0/data/shadow
rename to tests/failures/pwconv/05_pwconv_time_0/data/shadow
diff --git a/tests/tests/failures/pwconv/05_pwconv_time_0/pwconv.test b/tests/failures/pwconv/05_pwconv_time_0/pwconv.test
similarity index 100%
rename from tests/tests/failures/pwconv/05_pwconv_time_0/pwconv.test
rename to tests/failures/pwconv/05_pwconv_time_0/pwconv.test
diff --git a/tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config.txt b/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config.txt
rename to tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config.txt
diff --git a/tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/group b/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/group
rename to tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/group
diff --git a/tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/gshadow b/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/gshadow
rename to tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/login.defs b/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/login.defs
rename to tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/passwd b/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/passwd
rename to tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/shadow b/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/shadow
rename to tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/data/pwunconv.err b/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/data/pwunconv.err
similarity index 100%
rename from tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/data/pwunconv.err
rename to tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/data/pwunconv.err
diff --git a/tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/pwunconv.test b/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/pwunconv.test
similarity index 100%
rename from tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/pwunconv.test
rename to tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/pwunconv.test
diff --git a/tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config.txt b/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config.txt
rename to tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config.txt
diff --git a/tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/group b/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/group
rename to tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/gshadow b/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/gshadow
rename to tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/login.defs b/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/login.defs
rename to tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/passwd b/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/passwd
rename to tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/shadow b/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/shadow
rename to tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/data/pwunconv.err b/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/data/pwunconv.err
similarity index 100%
rename from tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/data/pwunconv.err
rename to tests/failures/pwunconv/02_pwunconv_open_passwd_failure/data/pwunconv.err
diff --git a/tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/pwunconv.test b/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/pwunconv.test
similarity index 100%
rename from tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/pwunconv.test
rename to tests/failures/pwunconv/02_pwunconv_open_passwd_failure/pwunconv.test
diff --git a/tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config.txt b/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config.txt
rename to tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config.txt
diff --git a/tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/group b/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/group
rename to tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/gshadow b/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/gshadow
rename to tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/login.defs b/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/login.defs
rename to tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/pwconv/05_pwconv_time_0/data/passwd b/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwconv/05_pwconv_time_0/data/passwd
rename to tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/shadow b/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/shadow
rename to tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/data/pwunconv.err b/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/data/pwunconv.err
similarity index 100%
rename from tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/data/pwunconv.err
rename to tests/failures/pwunconv/03_pwunconv_open_shadow_failure/data/pwunconv.err
diff --git a/tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/pwunconv.test b/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/pwunconv.test
similarity index 100%
rename from tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/pwunconv.test
rename to tests/failures/pwunconv/03_pwunconv_open_shadow_failure/pwunconv.test
diff --git a/tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config.txt b/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config.txt
rename to tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config.txt
diff --git a/tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/group b/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/group
rename to tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/gshadow b/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/gshadow
rename to tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/login.defs b/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/login.defs
rename to tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/passwd b/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/passwd
rename to tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/shadow b/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/shadow
rename to tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/data/passwd b/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/data/passwd
rename to tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/data/passwd
diff --git a/tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/data/pwunconv.err b/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/data/pwunconv.err
similarity index 100%
rename from tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/data/pwunconv.err
rename to tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/data/pwunconv.err
diff --git a/tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/pwunconv.test b/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/pwunconv.test
similarity index 100%
rename from tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/pwunconv.test
rename to tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/pwunconv.test
diff --git a/tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config.txt b/tests/failures/useradd/01_useradd_open_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config.txt
rename to tests/failures/useradd/01_useradd_open_passwd_failure/config.txt
diff --git a/tests/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/default/useradd b/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/default/useradd
rename to tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/group b/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/group
rename to tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/gshadow b/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/gshadow
rename to tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/login.defs b/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/login.defs
rename to tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/pwck/04_pwck_shadow_open_failure/data/passwd b/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwck/04_pwck_shadow_open_failure/data/passwd
rename to tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/shadow b/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwck/04_pwck_shadow_open_failure/config/etc/shadow
rename to tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/useradd/01_useradd_open_passwd_failure/data/useradd.err b/tests/failures/useradd/01_useradd_open_passwd_failure/data/useradd.err
similarity index 100%
rename from tests/tests/failures/useradd/01_useradd_open_passwd_failure/data/useradd.err
rename to tests/failures/useradd/01_useradd_open_passwd_failure/data/useradd.err
diff --git a/tests/tests/failures/useradd/01_useradd_open_passwd_failure/useradd.test b/tests/failures/useradd/01_useradd_open_passwd_failure/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/01_useradd_open_passwd_failure/useradd.test
rename to tests/failures/useradd/01_useradd_open_passwd_failure/useradd.test
diff --git a/tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config.txt b/tests/failures/useradd/02_useradd_open_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config.txt
rename to tests/failures/useradd/02_useradd_open_shadow_failure/config.txt
diff --git a/tests/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/default/useradd b/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/default/useradd
rename to tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/group b/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/group
rename to tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/gshadow b/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/gshadow
rename to tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/login.defs b/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/login.defs
rename to tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/passwd b/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/passwd
rename to tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/shadow b/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/shadow
rename to tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/useradd/02_useradd_open_shadow_failure/data/useradd.err b/tests/failures/useradd/02_useradd_open_shadow_failure/data/useradd.err
similarity index 100%
rename from tests/tests/failures/useradd/02_useradd_open_shadow_failure/data/useradd.err
rename to tests/failures/useradd/02_useradd_open_shadow_failure/data/useradd.err
diff --git a/tests/tests/failures/useradd/02_useradd_open_shadow_failure/useradd.test b/tests/failures/useradd/02_useradd_open_shadow_failure/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/02_useradd_open_shadow_failure/useradd.test
rename to tests/failures/useradd/02_useradd_open_shadow_failure/useradd.test
diff --git a/tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config.txt b/tests/failures/useradd/03_useradd_open_group_failure/config.txt
similarity index 100%
rename from tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config.txt
rename to tests/failures/useradd/03_useradd_open_group_failure/config.txt
diff --git a/tests/tests/failures/useradd/03_useradd_open_group_failure/config/etc/default/useradd b/tests/failures/useradd/03_useradd_open_group_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/03_useradd_open_group_failure/config/etc/default/useradd
rename to tests/failures/useradd/03_useradd_open_group_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/group b/tests/failures/useradd/03_useradd_open_group_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/group
rename to tests/failures/useradd/03_useradd_open_group_failure/config/etc/group
diff --git a/tests/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/gshadow b/tests/failures/useradd/03_useradd_open_group_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/gshadow
rename to tests/failures/useradd/03_useradd_open_group_failure/config/etc/gshadow
diff --git a/tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/login.defs b/tests/failures/useradd/03_useradd_open_group_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/login.defs
rename to tests/failures/useradd/03_useradd_open_group_failure/config/etc/login.defs
diff --git a/tests/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/passwd b/tests/failures/useradd/03_useradd_open_group_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/passwd
rename to tests/failures/useradd/03_useradd_open_group_failure/config/etc/passwd
diff --git a/tests/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/shadow b/tests/failures/useradd/03_useradd_open_group_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/shadow
rename to tests/failures/useradd/03_useradd_open_group_failure/config/etc/shadow
diff --git a/tests/tests/failures/useradd/03_useradd_open_group_failure/data/useradd.err b/tests/failures/useradd/03_useradd_open_group_failure/data/useradd.err
similarity index 100%
rename from tests/tests/failures/useradd/03_useradd_open_group_failure/data/useradd.err
rename to tests/failures/useradd/03_useradd_open_group_failure/data/useradd.err
diff --git a/tests/tests/failures/useradd/03_useradd_open_group_failure/useradd.test b/tests/failures/useradd/03_useradd_open_group_failure/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/03_useradd_open_group_failure/useradd.test
rename to tests/failures/useradd/03_useradd_open_group_failure/useradd.test
diff --git a/tests/tests/failures/useradd/01_useradd_open_passwd_failure/config.txt b/tests/failures/useradd/04_useradd_open_gshadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/01_useradd_open_passwd_failure/config.txt
rename to tests/failures/useradd/04_useradd_open_gshadow_failure/config.txt
diff --git a/tests/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/default/useradd b/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/default/useradd
rename to tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/03_useradd_open_group_failure/config/etc/group b/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/03_useradd_open_group_failure/config/etc/group
rename to tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/group
diff --git a/tests/tests/failures/useradd/03_useradd_open_group_failure/config/etc/gshadow b/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/03_useradd_open_group_failure/config/etc/gshadow
rename to tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/login.defs b/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/login.defs
rename to tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/useradd/03_useradd_open_group_failure/config/etc/passwd b/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/useradd/03_useradd_open_group_failure/config/etc/passwd
rename to tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/useradd/03_useradd_open_group_failure/config/etc/shadow b/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/useradd/03_useradd_open_group_failure/config/etc/shadow
rename to tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/useradd/04_useradd_open_gshadow_failure/data/useradd.err b/tests/failures/useradd/04_useradd_open_gshadow_failure/data/useradd.err
similarity index 100%
rename from tests/tests/failures/useradd/04_useradd_open_gshadow_failure/data/useradd.err
rename to tests/failures/useradd/04_useradd_open_gshadow_failure/data/useradd.err
diff --git a/tests/tests/failures/useradd/04_useradd_open_gshadow_failure/useradd.test b/tests/failures/useradd/04_useradd_open_gshadow_failure/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/04_useradd_open_gshadow_failure/useradd.test
rename to tests/failures/useradd/04_useradd_open_gshadow_failure/useradd.test
diff --git a/tests/tests/failures/useradd/02_useradd_open_shadow_failure/config.txt b/tests/failures/useradd/05_useradd_rename_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/02_useradd_open_shadow_failure/config.txt
rename to tests/failures/useradd/05_useradd_rename_passwd_failure/config.txt
diff --git a/tests/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/default/useradd b/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/default/useradd
rename to tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/group b/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/group
rename to tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/gshadow b/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/gshadow
rename to tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/login.defs b/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/login.defs
rename to tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/passwd b/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/passwd
rename to tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/shadow b/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/shadow
rename to tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/useradd/05_useradd_rename_passwd_failure/data/useradd.err b/tests/failures/useradd/05_useradd_rename_passwd_failure/data/useradd.err
similarity index 100%
rename from tests/tests/failures/useradd/05_useradd_rename_passwd_failure/data/useradd.err
rename to tests/failures/useradd/05_useradd_rename_passwd_failure/data/useradd.err
diff --git a/tests/tests/failures/useradd/05_useradd_rename_passwd_failure/useradd.test b/tests/failures/useradd/05_useradd_rename_passwd_failure/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/05_useradd_rename_passwd_failure/useradd.test
rename to tests/failures/useradd/05_useradd_rename_passwd_failure/useradd.test
diff --git a/tests/tests/failures/useradd/03_useradd_open_group_failure/config.txt b/tests/failures/useradd/06_useradd_rename_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/03_useradd_open_group_failure/config.txt
rename to tests/failures/useradd/06_useradd_rename_shadow_failure/config.txt
diff --git a/tests/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/default/useradd b/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/default/useradd
rename to tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/group b/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/group
rename to tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/gshadow b/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/gshadow
rename to tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/03_useradd_open_group_failure/config/etc/login.defs b/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/useradd/03_useradd_open_group_failure/config/etc/login.defs
rename to tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/passwd b/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/passwd
rename to tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/shadow b/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/shadow
rename to tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/useradd/06_useradd_rename_shadow_failure/data/passwd b/tests/failures/useradd/06_useradd_rename_shadow_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/useradd/06_useradd_rename_shadow_failure/data/passwd
rename to tests/failures/useradd/06_useradd_rename_shadow_failure/data/passwd
diff --git a/tests/tests/failures/useradd/06_useradd_rename_shadow_failure/data/useradd.err b/tests/failures/useradd/06_useradd_rename_shadow_failure/data/useradd.err
similarity index 100%
rename from tests/tests/failures/useradd/06_useradd_rename_shadow_failure/data/useradd.err
rename to tests/failures/useradd/06_useradd_rename_shadow_failure/data/useradd.err
diff --git a/tests/tests/failures/useradd/06_useradd_rename_shadow_failure/useradd.test b/tests/failures/useradd/06_useradd_rename_shadow_failure/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/06_useradd_rename_shadow_failure/useradd.test
rename to tests/failures/useradd/06_useradd_rename_shadow_failure/useradd.test
diff --git a/tests/tests/failures/useradd/04_useradd_open_gshadow_failure/config.txt b/tests/failures/useradd/07_useradd_rename_group_failure/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/04_useradd_open_gshadow_failure/config.txt
rename to tests/failures/useradd/07_useradd_rename_group_failure/config.txt
diff --git a/tests/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/default/useradd b/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/default/useradd
rename to tests/failures/useradd/07_useradd_rename_group_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/group b/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/group
rename to tests/failures/useradd/07_useradd_rename_group_failure/config/etc/group
diff --git a/tests/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/gshadow b/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/gshadow
rename to tests/failures/useradd/07_useradd_rename_group_failure/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/login.defs b/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/login.defs
rename to tests/failures/useradd/07_useradd_rename_group_failure/config/etc/login.defs
diff --git a/tests/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/passwd b/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/passwd
rename to tests/failures/useradd/07_useradd_rename_group_failure/config/etc/passwd
diff --git a/tests/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/shadow b/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/shadow
rename to tests/failures/useradd/07_useradd_rename_group_failure/config/etc/shadow
diff --git a/tests/tests/failures/useradd/07_useradd_rename_group_failure/data/passwd b/tests/failures/useradd/07_useradd_rename_group_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/useradd/07_useradd_rename_group_failure/data/passwd
rename to tests/failures/useradd/07_useradd_rename_group_failure/data/passwd
diff --git a/tests/tests/failures/useradd/07_useradd_rename_group_failure/data/shadow b/tests/failures/useradd/07_useradd_rename_group_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/useradd/07_useradd_rename_group_failure/data/shadow
rename to tests/failures/useradd/07_useradd_rename_group_failure/data/shadow
diff --git a/tests/tests/failures/useradd/07_useradd_rename_group_failure/data/useradd.err b/tests/failures/useradd/07_useradd_rename_group_failure/data/useradd.err
similarity index 100%
rename from tests/tests/failures/useradd/07_useradd_rename_group_failure/data/useradd.err
rename to tests/failures/useradd/07_useradd_rename_group_failure/data/useradd.err
diff --git a/tests/tests/failures/useradd/07_useradd_rename_group_failure/useradd.test b/tests/failures/useradd/07_useradd_rename_group_failure/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/07_useradd_rename_group_failure/useradd.test
rename to tests/failures/useradd/07_useradd_rename_group_failure/useradd.test
diff --git a/tests/tests/failures/useradd/05_useradd_rename_passwd_failure/config.txt b/tests/failures/useradd/08_useradd_rename_gshadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/05_useradd_rename_passwd_failure/config.txt
rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/config.txt
diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/default/useradd b/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/default/useradd
rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/group b/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/group
rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/group
diff --git a/tests/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/gshadow b/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/gshadow
rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/login.defs b/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/login.defs
rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/passwd b/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/passwd
rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/shadow b/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/shadow
rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/group b/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/group
similarity index 100%
rename from tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/group
rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/data/group
diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/passwd b/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/passwd
rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/data/passwd
diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/shadow b/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/shadow
rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/data/shadow
diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/useradd.err b/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/useradd.err
similarity index 100%
rename from tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/useradd.err
rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/data/useradd.err
diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/useradd.test b/tests/failures/useradd/08_useradd_rename_gshadow_failure/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/useradd.test
rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/useradd.test
diff --git a/tests/tests/failures/useradd/06_useradd_rename_shadow_failure/config.txt b/tests/failures/useradd/09_useradd_rename_defaults_failure/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/06_useradd_rename_shadow_failure/config.txt
rename to tests/failures/useradd/09_useradd_rename_defaults_failure/config.txt
diff --git a/tests/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/default/useradd b/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/default/useradd
rename to tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/group b/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/group
rename to tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/group
diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/gshadow b/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/gshadow
rename to tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/login.defs b/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/login.defs
rename to tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/login.defs
diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/passwd b/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/passwd
rename to tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/passwd
diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/shadow b/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/shadow
rename to tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/shadow
diff --git a/tests/tests/failures/useradd/09_useradd_rename_defaults_failure/data/useradd.err b/tests/failures/useradd/09_useradd_rename_defaults_failure/data/useradd.err
similarity index 100%
rename from tests/tests/failures/useradd/09_useradd_rename_defaults_failure/data/useradd.err
rename to tests/failures/useradd/09_useradd_rename_defaults_failure/data/useradd.err
diff --git a/tests/tests/failures/useradd/09_useradd_rename_defaults_failure/useradd.test b/tests/failures/useradd/09_useradd_rename_defaults_failure/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/09_useradd_rename_defaults_failure/useradd.test
rename to tests/failures/useradd/09_useradd_rename_defaults_failure/useradd.test
diff --git a/tests/tests/failures/useradd/07_useradd_rename_group_failure/config.txt b/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/07_useradd_rename_group_failure/config.txt
rename to tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config.txt
diff --git a/tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/default/useradd b/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/default/useradd
rename to tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/group b/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/group
rename to tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/group
diff --git a/tests/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/gshadow b/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/gshadow
rename to tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/login.defs b/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/useradd/07_useradd_rename_group_failure/config/etc/login.defs
rename to tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/login.defs
diff --git a/tests/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/passwd b/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/passwd
rename to tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/passwd
diff --git a/tests/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/shadow b/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/shadow
rename to tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/shadow
diff --git a/tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/data/useradd.err b/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/data/useradd.err
similarity index 100%
rename from tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/data/useradd.err
rename to tests/failures/useradd/10_useradd_rename_defaults_backup_failure/data/useradd.err
diff --git a/tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/useradd.test b/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/useradd.test
rename to tests/failures/useradd/10_useradd_rename_defaults_backup_failure/useradd.test
diff --git a/tests/tests/failures/useradd/11_useradd_time_0/config.txt b/tests/failures/useradd/11_useradd_time_0/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/11_useradd_time_0/config.txt
rename to tests/failures/useradd/11_useradd_time_0/config.txt
diff --git a/tests/tests/failures/useradd/11_useradd_time_0/config/etc/default/useradd b/tests/failures/useradd/11_useradd_time_0/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/11_useradd_time_0/config/etc/default/useradd
rename to tests/failures/useradd/11_useradd_time_0/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/11_useradd_time_0/config/etc/group b/tests/failures/useradd/11_useradd_time_0/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/11_useradd_time_0/config/etc/group
rename to tests/failures/useradd/11_useradd_time_0/config/etc/group
diff --git a/tests/tests/failures/useradd/11_useradd_time_0/config/etc/gshadow b/tests/failures/useradd/11_useradd_time_0/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/11_useradd_time_0/config/etc/gshadow
rename to tests/failures/useradd/11_useradd_time_0/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/11_useradd_time_0/config/etc/pam.d/common-password b/tests/failures/useradd/11_useradd_time_0/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/failures/useradd/11_useradd_time_0/config/etc/pam.d/common-password
rename to tests/failures/useradd/11_useradd_time_0/config/etc/pam.d/common-password
diff --git a/tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/passwd b/tests/failures/useradd/11_useradd_time_0/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/passwd
rename to tests/failures/useradd/11_useradd_time_0/config/etc/passwd
diff --git a/tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/shadow b/tests/failures/useradd/11_useradd_time_0/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/shadow
rename to tests/failures/useradd/11_useradd_time_0/config/etc/shadow
diff --git a/tests/tests/cptools/11_cppw-p-s/config/etc/group b/tests/failures/useradd/11_useradd_time_0/data/group
similarity index 100%
rename from tests/tests/cptools/11_cppw-p-s/config/etc/group
rename to tests/failures/useradd/11_useradd_time_0/data/group
diff --git a/tests/tests/failures/useradd/11_useradd_time_0/data/gshadow b/tests/failures/useradd/11_useradd_time_0/data/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/11_useradd_time_0/data/gshadow
rename to tests/failures/useradd/11_useradd_time_0/data/gshadow
diff --git a/tests/tests/failures/useradd/11_useradd_time_0/data/newusers.list b/tests/failures/useradd/11_useradd_time_0/data/newusers.list
similarity index 100%
rename from tests/tests/failures/useradd/11_useradd_time_0/data/newusers.list
rename to tests/failures/useradd/11_useradd_time_0/data/newusers.list
diff --git a/tests/tests/failures/useradd/11_useradd_time_0/data/passwd b/tests/failures/useradd/11_useradd_time_0/data/passwd
similarity index 100%
rename from tests/tests/failures/useradd/11_useradd_time_0/data/passwd
rename to tests/failures/useradd/11_useradd_time_0/data/passwd
diff --git a/tests/tests/failures/useradd/11_useradd_time_0/data/shadow b/tests/failures/useradd/11_useradd_time_0/data/shadow
similarity index 100%
rename from tests/tests/failures/useradd/11_useradd_time_0/data/shadow
rename to tests/failures/useradd/11_useradd_time_0/data/shadow
diff --git a/tests/tests/failures/useradd/11_useradd_time_0/useradd.test b/tests/failures/useradd/11_useradd_time_0/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/11_useradd_time_0/useradd.test
rename to tests/failures/useradd/11_useradd_time_0/useradd.test
diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/config.txt b/tests/failures/useradd/12_useradd_open_subuid_failure/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/config.txt
rename to tests/failures/useradd/12_useradd_open_subuid_failure/config.txt
diff --git a/tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/default/useradd b/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/default/useradd
rename to tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/group b/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/group
rename to tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/group
diff --git a/tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/gshadow b/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/gshadow
rename to tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/login.defs b/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/login.defs
rename to tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/login.defs
diff --git a/tests/tests/failures/useradd/11_useradd_time_0/config/etc/passwd b/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/useradd/11_useradd_time_0/config/etc/passwd
rename to tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/passwd
diff --git a/tests/tests/failures/useradd/11_useradd_time_0/config/etc/shadow b/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/useradd/11_useradd_time_0/config/etc/shadow
rename to tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/shadow
diff --git a/tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/subgid b/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/subgid
similarity index 100%
rename from tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/subgid
rename to tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/subgid
diff --git a/tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/subuid b/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/subuid
similarity index 100%
rename from tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/subuid
rename to tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/subuid
diff --git a/tests/tests/failures/useradd/12_useradd_open_subuid_failure/data/useradd.err b/tests/failures/useradd/12_useradd_open_subuid_failure/data/useradd.err
similarity index 100%
rename from tests/tests/failures/useradd/12_useradd_open_subuid_failure/data/useradd.err
rename to tests/failures/useradd/12_useradd_open_subuid_failure/data/useradd.err
diff --git a/tests/tests/failures/useradd/12_useradd_open_subuid_failure/useradd.test b/tests/failures/useradd/12_useradd_open_subuid_failure/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/12_useradd_open_subuid_failure/useradd.test
rename to tests/failures/useradd/12_useradd_open_subuid_failure/useradd.test
diff --git a/tests/tests/failures/useradd/09_useradd_rename_defaults_failure/config.txt b/tests/failures/useradd/13_useradd_open_subgid_failure/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/09_useradd_rename_defaults_failure/config.txt
rename to tests/failures/useradd/13_useradd_open_subgid_failure/config.txt
diff --git a/tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/default/useradd b/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/default/useradd
rename to tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/group b/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/group
rename to tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/group
diff --git a/tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/gshadow b/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/gshadow
rename to tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/login.defs b/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/login.defs
rename to tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/login.defs
diff --git a/tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/passwd b/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/passwd
rename to tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/passwd
diff --git a/tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/shadow b/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/shadow
rename to tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/shadow
diff --git a/tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/subgid b/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/subgid
similarity index 100%
rename from tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/subgid
rename to tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/subgid
diff --git a/tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/subuid b/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/subuid
similarity index 100%
rename from tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/subuid
rename to tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/subuid
diff --git a/tests/tests/failures/useradd/13_useradd_open_subgid_failure/data/useradd.err b/tests/failures/useradd/13_useradd_open_subgid_failure/data/useradd.err
similarity index 100%
rename from tests/tests/failures/useradd/13_useradd_open_subgid_failure/data/useradd.err
rename to tests/failures/useradd/13_useradd_open_subgid_failure/data/useradd.err
diff --git a/tests/tests/failures/useradd/13_useradd_open_subgid_failure/useradd.test b/tests/failures/useradd/13_useradd_open_subgid_failure/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/13_useradd_open_subgid_failure/useradd.test
rename to tests/failures/useradd/13_useradd_open_subgid_failure/useradd.test
diff --git a/tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config.txt b/tests/failures/useradd/14_username_rename_subuid_failure/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config.txt
rename to tests/failures/useradd/14_username_rename_subuid_failure/config.txt
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/default/useradd b/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/default/useradd
rename to tests/failures/useradd/14_username_rename_subuid_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/group b/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/group
rename to tests/failures/useradd/14_username_rename_subuid_failure/config/etc/group
diff --git a/tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/gshadow b/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/gshadow
rename to tests/failures/useradd/14_username_rename_subuid_failure/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/login.defs b/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/useradd/10_useradd_rename_defaults_backup_failure/config/etc/login.defs
rename to tests/failures/useradd/14_username_rename_subuid_failure/config/etc/login.defs
diff --git a/tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/passwd b/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/passwd
rename to tests/failures/useradd/14_username_rename_subuid_failure/config/etc/passwd
diff --git a/tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/shadow b/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/shadow
rename to tests/failures/useradd/14_username_rename_subuid_failure/config/etc/shadow
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/subgid b/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/subgid
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/subgid
rename to tests/failures/useradd/14_username_rename_subuid_failure/config/etc/subgid
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/subuid b/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/subuid
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/subuid
rename to tests/failures/useradd/14_username_rename_subuid_failure/config/etc/subuid
diff --git a/tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/group b/tests/failures/useradd/14_username_rename_subuid_failure/data/group
similarity index 100%
rename from tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/group
rename to tests/failures/useradd/14_username_rename_subuid_failure/data/group
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/data/gshadow b/tests/failures/useradd/14_username_rename_subuid_failure/data/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/data/gshadow
rename to tests/failures/useradd/14_username_rename_subuid_failure/data/gshadow
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/data/passwd b/tests/failures/useradd/14_username_rename_subuid_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/data/passwd
rename to tests/failures/useradd/14_username_rename_subuid_failure/data/passwd
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/data/shadow b/tests/failures/useradd/14_username_rename_subuid_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/data/shadow
rename to tests/failures/useradd/14_username_rename_subuid_failure/data/shadow
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/data/useradd.err b/tests/failures/useradd/14_username_rename_subuid_failure/data/useradd.err
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/data/useradd.err
rename to tests/failures/useradd/14_username_rename_subuid_failure/data/useradd.err
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/useradd.test b/tests/failures/useradd/14_username_rename_subuid_failure/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/useradd.test
rename to tests/failures/useradd/14_username_rename_subuid_failure/useradd.test
diff --git a/tests/tests/failures/useradd/12_useradd_open_subuid_failure/config.txt b/tests/failures/useradd/15_username_rename_subgid_failure/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/12_useradd_open_subuid_failure/config.txt
rename to tests/failures/useradd/15_username_rename_subgid_failure/config.txt
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/default/useradd b/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/default/useradd
rename to tests/failures/useradd/15_username_rename_subgid_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/group b/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/group
rename to tests/failures/useradd/15_username_rename_subgid_failure/config/etc/group
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/gshadow b/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/gshadow
rename to tests/failures/useradd/15_username_rename_subgid_failure/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/login.defs b/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/login.defs
rename to tests/failures/useradd/15_username_rename_subgid_failure/config/etc/login.defs
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/passwd b/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/passwd
rename to tests/failures/useradd/15_username_rename_subgid_failure/config/etc/passwd
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/shadow b/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/shadow
rename to tests/failures/useradd/15_username_rename_subgid_failure/config/etc/shadow
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/subgid b/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/subgid
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/subgid
rename to tests/failures/useradd/15_username_rename_subgid_failure/config/etc/subgid
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/subuid b/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/subuid
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/subuid
rename to tests/failures/useradd/15_username_rename_subgid_failure/config/etc/subuid
diff --git a/tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/group b/tests/failures/useradd/15_username_rename_subgid_failure/data/group
similarity index 100%
rename from tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/group
rename to tests/failures/useradd/15_username_rename_subgid_failure/data/group
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/data/gshadow b/tests/failures/useradd/15_username_rename_subgid_failure/data/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/data/gshadow
rename to tests/failures/useradd/15_username_rename_subgid_failure/data/gshadow
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/data/passwd b/tests/failures/useradd/15_username_rename_subgid_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/data/passwd
rename to tests/failures/useradd/15_username_rename_subgid_failure/data/passwd
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/data/shadow b/tests/failures/useradd/15_username_rename_subgid_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/data/shadow
rename to tests/failures/useradd/15_username_rename_subgid_failure/data/shadow
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/data/subuid b/tests/failures/useradd/15_username_rename_subgid_failure/data/subuid
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/data/subuid
rename to tests/failures/useradd/15_username_rename_subgid_failure/data/subuid
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/data/useradd.err b/tests/failures/useradd/15_username_rename_subgid_failure/data/useradd.err
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/data/useradd.err
rename to tests/failures/useradd/15_username_rename_subgid_failure/data/useradd.err
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/useradd.test b/tests/failures/useradd/15_username_rename_subgid_failure/useradd.test
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/useradd.test
rename to tests/failures/useradd/15_username_rename_subgid_failure/useradd.test
diff --git a/tests/tests/failures/useradd/13_useradd_open_subgid_failure/config.txt b/tests/failures/userdel/01_userdel_gshadow_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/13_useradd_open_subgid_failure/config.txt
rename to tests/failures/userdel/01_userdel_gshadow_rename_failure/config.txt
diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/default/useradd b/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/default/useradd
rename to tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/group b/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/group
rename to tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/group
diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/gshadow b/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/gshadow
rename to tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/login.defs b/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/login.defs
rename to tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/passwd b/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/passwd
rename to tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/shadow b/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/shadow
rename to tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/group b/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/group
rename to tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/passwd b/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/passwd
rename to tests/failures/userdel/01_userdel_gshadow_rename_failure/data/passwd
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/shadow b/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/shadow
rename to tests/failures/userdel/01_userdel_gshadow_rename_failure/data/shadow
diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/userdel.err b/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/userdel.err
rename to tests/failures/userdel/01_userdel_gshadow_rename_failure/data/userdel.err
diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test b/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test
similarity index 100%
rename from tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test
rename to tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/config.txt b/tests/failures/userdel/02_userdel_group_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/config.txt
rename to tests/failures/userdel/02_userdel_group_rename_failure/config.txt
diff --git a/tests/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/default/useradd b/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/default/useradd
rename to tests/failures/userdel/02_userdel_group_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/group b/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/group
rename to tests/failures/userdel/02_userdel_group_rename_failure/config/etc/group
diff --git a/tests/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/gshadow b/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/gshadow
rename to tests/failures/userdel/02_userdel_group_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/login.defs b/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/config/etc/login.defs
rename to tests/failures/userdel/02_userdel_group_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/passwd b/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/passwd
rename to tests/failures/userdel/02_userdel_group_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/shadow b/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/shadow
rename to tests/failures/userdel/02_userdel_group_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/passwd b/tests/failures/userdel/02_userdel_group_rename_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/passwd
rename to tests/failures/userdel/02_userdel_group_rename_failure/data/passwd
diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/shadow b/tests/failures/userdel/02_userdel_group_rename_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/shadow
rename to tests/failures/userdel/02_userdel_group_rename_failure/data/shadow
diff --git a/tests/tests/failures/userdel/02_userdel_group_rename_failure/data/userdel.err b/tests/failures/userdel/02_userdel_group_rename_failure/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/02_userdel_group_rename_failure/data/userdel.err
rename to tests/failures/userdel/02_userdel_group_rename_failure/data/userdel.err
diff --git a/tests/tests/failures/userdel/02_userdel_group_rename_failure/userdel.test b/tests/failures/userdel/02_userdel_group_rename_failure/userdel.test
similarity index 100%
rename from tests/tests/failures/userdel/02_userdel_group_rename_failure/userdel.test
rename to tests/failures/userdel/02_userdel_group_rename_failure/userdel.test
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/config.txt b/tests/failures/userdel/03_userdel_shadow_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/config.txt
rename to tests/failures/userdel/03_userdel_shadow_rename_failure/config.txt
diff --git a/tests/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/default/useradd b/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/default/useradd
rename to tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/group b/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/group
rename to tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/group
diff --git a/tests/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/gshadow b/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/gshadow
rename to tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/login.defs b/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/login.defs
rename to tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/passwd b/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/passwd
rename to tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/shadow b/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/shadow
rename to tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/userdel/02_userdel_group_rename_failure/data/passwd b/tests/failures/userdel/03_userdel_shadow_rename_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/userdel/02_userdel_group_rename_failure/data/passwd
rename to tests/failures/userdel/03_userdel_shadow_rename_failure/data/passwd
diff --git a/tests/tests/failures/userdel/03_userdel_shadow_rename_failure/data/userdel.err b/tests/failures/userdel/03_userdel_shadow_rename_failure/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/03_userdel_shadow_rename_failure/data/userdel.err
rename to tests/failures/userdel/03_userdel_shadow_rename_failure/data/userdel.err
diff --git a/tests/tests/failures/userdel/03_userdel_shadow_rename_failure/userdel.test b/tests/failures/userdel/03_userdel_shadow_rename_failure/userdel.test
similarity index 100%
rename from tests/tests/failures/userdel/03_userdel_shadow_rename_failure/userdel.test
rename to tests/failures/userdel/03_userdel_shadow_rename_failure/userdel.test
diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/config.txt b/tests/failures/userdel/04_userdel_passwd_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/config.txt
rename to tests/failures/userdel/04_userdel_passwd_rename_failure/config.txt
diff --git a/tests/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/default/useradd b/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/default/useradd
rename to tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/group b/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/group
rename to tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/group
diff --git a/tests/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/gshadow b/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/gshadow
rename to tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/login.defs b/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/login.defs
rename to tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/passwd b/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/passwd
rename to tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/shadow b/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/shadow
rename to tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/userdel/04_userdel_passwd_rename_failure/data/userdel.err b/tests/failures/userdel/04_userdel_passwd_rename_failure/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/04_userdel_passwd_rename_failure/data/userdel.err
rename to tests/failures/userdel/04_userdel_passwd_rename_failure/data/userdel.err
diff --git a/tests/tests/failures/userdel/04_userdel_passwd_rename_failure/userdel.test b/tests/failures/userdel/04_userdel_passwd_rename_failure/userdel.test
similarity index 100%
rename from tests/tests/failures/userdel/04_userdel_passwd_rename_failure/userdel.test
rename to tests/failures/userdel/04_userdel_passwd_rename_failure/userdel.test
diff --git a/tests/tests/failures/userdel/02_userdel_group_rename_failure/config.txt b/tests/failures/userdel/05_userdel_failure_remove_mailbox/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/02_userdel_group_rename_failure/config.txt
rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/config.txt
diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/default/useradd b/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/default/useradd
rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/group b/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/group
rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/group
diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/gshadow b/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/gshadow
rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/login.defs b/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/login.defs
rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/passwd b/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/passwd
rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/passwd
diff --git a/tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/shadow b/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/shadow
rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/shadow
diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/var/mail/foo b/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/var/mail/foo
similarity index 100%
rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/var/mail/foo
rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/config/var/mail/foo
diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group b/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/group
similarity index 100%
rename from tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group
rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/data/group
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/gshadow b/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/gshadow
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/config/etc/gshadow
rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/data/gshadow
diff --git a/tests/tests/failures/userdel/03_userdel_shadow_rename_failure/data/passwd b/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/passwd
similarity index 100%
rename from tests/tests/failures/userdel/03_userdel_shadow_rename_failure/data/passwd
rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/data/passwd
diff --git a/tests/tests/failures/userdel/02_userdel_group_rename_failure/data/shadow b/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/shadow
similarity index 100%
rename from tests/tests/failures/userdel/02_userdel_group_rename_failure/data/shadow
rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/data/shadow
diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/userdel.err b/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/userdel.err
rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/data/userdel.err
diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/userdel.test b/tests/failures/userdel/05_userdel_failure_remove_mailbox/userdel.test
similarity index 100%
rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/userdel.test
rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/userdel.test
diff --git a/tests/tests/failures/userdel/03_userdel_shadow_rename_failure/config.txt b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/03_userdel_shadow_rename_failure/config.txt
rename to tests/failures/userdel/06_userdel_failure_remove_file_homedir/config.txt
diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/default/useradd b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/default/useradd
rename to tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/group b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/group
rename to tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/group
diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/gshadow b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/gshadow
rename to tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/login.defs b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/login.defs
rename to tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/passwd b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/passwd
rename to tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/passwd
diff --git a/tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/shadow b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/shadow
rename to tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/shadow
diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/group b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/group
similarity index 100%
rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/group
rename to tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/group
diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/gshadow b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/gshadow
rename to tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/gshadow
diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/passwd b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/passwd
similarity index 100%
rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/passwd
rename to tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/passwd
diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/shadow b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/shadow
similarity index 100%
rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/shadow
rename to tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/shadow
diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/userdel.err b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/userdel.err
rename to tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/userdel.err
diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/userdel.test b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/userdel.test
similarity index 100%
rename from tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/userdel.test
rename to tests/failures/userdel/06_userdel_failure_remove_file_homedir/userdel.test
diff --git a/tests/tests/failures/userdel/04_userdel_passwd_rename_failure/config.txt b/tests/failures/userdel/07_userdel_failure_remove_homedir/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/04_userdel_passwd_rename_failure/config.txt
rename to tests/failures/userdel/07_userdel_failure_remove_homedir/config.txt
diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/default/useradd b/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/default/useradd
rename to tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/group b/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/group
rename to tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/group
diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/gshadow b/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/gshadow
rename to tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/login.defs b/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/login.defs
rename to tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/passwd b/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/passwd
rename to tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/passwd
diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/shadow b/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/shadow
rename to tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/shadow
diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/group b/tests/failures/userdel/07_userdel_failure_remove_homedir/data/group
similarity index 100%
rename from tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/group
rename to tests/failures/userdel/07_userdel_failure_remove_homedir/data/group
diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/gshadow b/tests/failures/userdel/07_userdel_failure_remove_homedir/data/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/gshadow
rename to tests/failures/userdel/07_userdel_failure_remove_homedir/data/gshadow
diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/passwd b/tests/failures/userdel/07_userdel_failure_remove_homedir/data/passwd
similarity index 100%
rename from tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/passwd
rename to tests/failures/userdel/07_userdel_failure_remove_homedir/data/passwd
diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/shadow b/tests/failures/userdel/07_userdel_failure_remove_homedir/data/shadow
similarity index 100%
rename from tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/shadow
rename to tests/failures/userdel/07_userdel_failure_remove_homedir/data/shadow
diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/userdel.err b/tests/failures/userdel/07_userdel_failure_remove_homedir/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/userdel.err
rename to tests/failures/userdel/07_userdel_failure_remove_homedir/data/userdel.err
diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/userdel.test b/tests/failures/userdel/07_userdel_failure_remove_homedir/userdel.test
similarity index 100%
rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/userdel.test
rename to tests/failures/userdel/07_userdel_failure_remove_homedir/userdel.test
diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config.txt b/tests/failures/userdel/08_userdel_open_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config.txt
rename to tests/failures/userdel/08_userdel_open_passwd_failure/config.txt
diff --git a/tests/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/default/useradd b/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/default/useradd
rename to tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/group b/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/group
rename to tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/gshadow b/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/gshadow
rename to tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/login.defs b/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/login.defs
rename to tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/passwd b/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/passwd
rename to tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/shadow b/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/02_userdel_group_rename_failure/config/etc/shadow
rename to tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/userdel/08_userdel_open_passwd_failure/data/userdel.err b/tests/failures/userdel/08_userdel_open_passwd_failure/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/08_userdel_open_passwd_failure/data/userdel.err
rename to tests/failures/userdel/08_userdel_open_passwd_failure/data/userdel.err
diff --git a/tests/tests/failures/userdel/08_userdel_open_passwd_failure/userdel.test b/tests/failures/userdel/08_userdel_open_passwd_failure/userdel.test
similarity index 100%
rename from tests/tests/failures/userdel/08_userdel_open_passwd_failure/userdel.test
rename to tests/failures/userdel/08_userdel_open_passwd_failure/userdel.test
diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config.txt b/tests/failures/userdel/09_userdel_open_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config.txt
rename to tests/failures/userdel/09_userdel_open_shadow_failure/config.txt
diff --git a/tests/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/default/useradd b/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/default/useradd
rename to tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_failure/data/group b/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/data/group
rename to tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/gshadow b/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/gshadow
rename to tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/login.defs b/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/login.defs
rename to tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/passwd b/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/passwd
rename to tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/shadow b/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/03_userdel_shadow_rename_failure/config/etc/shadow
rename to tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/userdel/09_userdel_open_shadow_failure/data/userdel.err b/tests/failures/userdel/09_userdel_open_shadow_failure/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/09_userdel_open_shadow_failure/data/userdel.err
rename to tests/failures/userdel/09_userdel_open_shadow_failure/data/userdel.err
diff --git a/tests/tests/failures/userdel/09_userdel_open_shadow_failure/userdel.test b/tests/failures/userdel/09_userdel_open_shadow_failure/userdel.test
similarity index 100%
rename from tests/tests/failures/userdel/09_userdel_open_shadow_failure/userdel.test
rename to tests/failures/userdel/09_userdel_open_shadow_failure/userdel.test
diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/config.txt b/tests/failures/userdel/10_userdel_open_group_failure/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/config.txt
rename to tests/failures/userdel/10_userdel_open_group_failure/config.txt
diff --git a/tests/tests/failures/userdel/10_userdel_open_group_failure/config/etc/default/useradd b/tests/failures/userdel/10_userdel_open_group_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/10_userdel_open_group_failure/config/etc/default/useradd
rename to tests/failures/userdel/10_userdel_open_group_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_failure/data/group b/tests/failures/userdel/10_userdel_open_group_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/data/group
rename to tests/failures/userdel/10_userdel_open_group_failure/config/etc/group
diff --git a/tests/tests/failures/userdel/10_userdel_open_group_failure/config/etc/gshadow b/tests/failures/userdel/10_userdel_open_group_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/10_userdel_open_group_failure/config/etc/gshadow
rename to tests/failures/userdel/10_userdel_open_group_failure/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/login.defs b/tests/failures/userdel/10_userdel_open_group_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/login.defs
rename to tests/failures/userdel/10_userdel_open_group_failure/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/10_userdel_open_group_failure/config/etc/passwd b/tests/failures/userdel/10_userdel_open_group_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/10_userdel_open_group_failure/config/etc/passwd
rename to tests/failures/userdel/10_userdel_open_group_failure/config/etc/passwd
diff --git a/tests/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/shadow b/tests/failures/userdel/10_userdel_open_group_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/04_userdel_passwd_rename_failure/config/etc/shadow
rename to tests/failures/userdel/10_userdel_open_group_failure/config/etc/shadow
diff --git a/tests/tests/failures/userdel/10_userdel_open_group_failure/data/userdel.err b/tests/failures/userdel/10_userdel_open_group_failure/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/10_userdel_open_group_failure/data/userdel.err
rename to tests/failures/userdel/10_userdel_open_group_failure/data/userdel.err
diff --git a/tests/tests/failures/userdel/10_userdel_open_group_failure/userdel.test b/tests/failures/userdel/10_userdel_open_group_failure/userdel.test
similarity index 100%
rename from tests/tests/failures/userdel/10_userdel_open_group_failure/userdel.test
rename to tests/failures/userdel/10_userdel_open_group_failure/userdel.test
diff --git a/tests/tests/failures/userdel/08_userdel_open_passwd_failure/config.txt b/tests/failures/userdel/11_userdel_open_gshadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/08_userdel_open_passwd_failure/config.txt
rename to tests/failures/userdel/11_userdel_open_gshadow_failure/config.txt
diff --git a/tests/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/default/useradd b/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/default/useradd
rename to tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/group b/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/group
rename to tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/group
diff --git a/tests/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/gshadow b/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/gshadow
rename to tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/login.defs b/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/login.defs
rename to tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/passwd b/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/passwd
rename to tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/shadow b/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/etc/shadow
rename to tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/userdel/11_userdel_open_gshadow_failure/data/userdel.err b/tests/failures/userdel/11_userdel_open_gshadow_failure/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/11_userdel_open_gshadow_failure/data/userdel.err
rename to tests/failures/userdel/11_userdel_open_gshadow_failure/data/userdel.err
diff --git a/tests/tests/failures/userdel/11_userdel_open_gshadow_failure/userdel.test b/tests/failures/userdel/11_userdel_open_gshadow_failure/userdel.test
similarity index 100%
rename from tests/tests/failures/userdel/11_userdel_open_gshadow_failure/userdel.test
rename to tests/failures/userdel/11_userdel_open_gshadow_failure/userdel.test
diff --git a/tests/tests/failures/userdel/09_userdel_open_shadow_failure/config.txt b/tests/failures/userdel/12_userdel_open_subuid_failure/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/09_userdel_open_shadow_failure/config.txt
rename to tests/failures/userdel/12_userdel_open_subuid_failure/config.txt
diff --git a/tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/default/useradd b/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/default/useradd
rename to tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/group b/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/group
rename to tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/group
diff --git a/tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/gshadow b/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/gshadow
rename to tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/login.defs b/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/login.defs
rename to tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/passwd b/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/passwd
rename to tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/passwd
diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/shadow b/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config/etc/shadow
rename to tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/shadow
diff --git a/tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/subgid b/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/subgid
similarity index 100%
rename from tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/subgid
rename to tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/subgid
diff --git a/tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/subuid b/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/subuid
similarity index 100%
rename from tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/subuid
rename to tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/subuid
diff --git a/tests/tests/failures/userdel/12_userdel_open_subuid_failure/data/userdel.err b/tests/failures/userdel/12_userdel_open_subuid_failure/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/12_userdel_open_subuid_failure/data/userdel.err
rename to tests/failures/userdel/12_userdel_open_subuid_failure/data/userdel.err
diff --git a/tests/tests/failures/userdel/12_userdel_open_subuid_failure/userdel.test b/tests/failures/userdel/12_userdel_open_subuid_failure/userdel.test
similarity index 100%
rename from tests/tests/failures/userdel/12_userdel_open_subuid_failure/userdel.test
rename to tests/failures/userdel/12_userdel_open_subuid_failure/userdel.test
diff --git a/tests/tests/failures/userdel/10_userdel_open_group_failure/config.txt b/tests/failures/userdel/13_userdel_open_subgid_failure/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/10_userdel_open_group_failure/config.txt
rename to tests/failures/userdel/13_userdel_open_subgid_failure/config.txt
diff --git a/tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/default/useradd b/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/default/useradd
rename to tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/10_userdel_open_group_failure/config/etc/group b/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/10_userdel_open_group_failure/config/etc/group
rename to tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/group
diff --git a/tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/gshadow b/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/gshadow
rename to tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/10_userdel_open_group_failure/config/etc/login.defs b/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/10_userdel_open_group_failure/config/etc/login.defs
rename to tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/passwd b/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/passwd
rename to tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/passwd
diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/shadow b/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/config/etc/shadow
rename to tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/shadow
diff --git a/tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/subgid b/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/subgid
similarity index 100%
rename from tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/subgid
rename to tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/subgid
diff --git a/tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/subuid b/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/subuid
similarity index 100%
rename from tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/subuid
rename to tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/subuid
diff --git a/tests/tests/failures/userdel/13_userdel_open_subgid_failure/data/userdel.err b/tests/failures/userdel/13_userdel_open_subgid_failure/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/13_userdel_open_subgid_failure/data/userdel.err
rename to tests/failures/userdel/13_userdel_open_subgid_failure/data/userdel.err
diff --git a/tests/tests/failures/userdel/13_userdel_open_subgid_failure/userdel.test b/tests/failures/userdel/13_userdel_open_subgid_failure/userdel.test
similarity index 100%
rename from tests/tests/failures/userdel/13_userdel_open_subgid_failure/userdel.test
rename to tests/failures/userdel/13_userdel_open_subgid_failure/userdel.test
diff --git a/tests/tests/failures/userdel/11_userdel_open_gshadow_failure/config.txt b/tests/failures/userdel/14_userdel_rename_subuid_failure/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/11_userdel_open_gshadow_failure/config.txt
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/config.txt
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/default/useradd b/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/default/useradd
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/group b/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/group
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/group
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/gshadow b/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/gshadow
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/login.defs b/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/login.defs
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/passwd b/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/passwd
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/passwd
diff --git a/tests/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/shadow b/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/08_userdel_open_passwd_failure/config/etc/shadow
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/shadow
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/subgid b/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/subgid
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/subgid
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/subgid
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/subuid b/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/subuid
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/subuid
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/subuid
diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/group b/tests/failures/userdel/14_userdel_rename_subuid_failure/data/group
similarity index 100%
rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/group
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/data/group
diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/gshadow b/tests/failures/userdel/14_userdel_rename_subuid_failure/data/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/gshadow
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/data/gshadow
diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/passwd b/tests/failures/userdel/14_userdel_rename_subuid_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/passwd
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/data/passwd
diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/shadow b/tests/failures/userdel/14_userdel_rename_subuid_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/shadow
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/data/shadow
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/userdel.err b/tests/failures/userdel/14_userdel_rename_subuid_failure/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/userdel.err
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/data/userdel.err
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/usedel.test b/tests/failures/userdel/14_userdel_rename_subuid_failure/usedel.test
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/usedel.test
rename to tests/failures/userdel/14_userdel_rename_subuid_failure/usedel.test
diff --git a/tests/tests/failures/userdel/12_userdel_open_subuid_failure/config.txt b/tests/failures/userdel/15_userdel_rename_subgid_failure/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/12_userdel_open_subuid_failure/config.txt
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/config.txt
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/default/useradd b/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/default/useradd
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/group b/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/group
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/group
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/gshadow b/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/gshadow
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/login.defs b/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/login.defs
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/passwd b/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/passwd
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/passwd
diff --git a/tests/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/shadow b/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/09_userdel_open_shadow_failure/config/etc/shadow
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/shadow
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/subgid b/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/subgid
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/subgid
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/subgid
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/subuid b/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/subuid
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/subuid
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/subuid
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/group b/tests/failures/userdel/15_userdel_rename_subgid_failure/data/group
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/group
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/data/group
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/gshadow b/tests/failures/userdel/15_userdel_rename_subgid_failure/data/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/gshadow
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/data/gshadow
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/passwd b/tests/failures/userdel/15_userdel_rename_subgid_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/passwd
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/data/passwd
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/shadow b/tests/failures/userdel/15_userdel_rename_subgid_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/shadow
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/data/shadow
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/subuid b/tests/failures/userdel/15_userdel_rename_subgid_failure/data/subuid
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/subuid
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/data/subuid
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/userdel.err b/tests/failures/userdel/15_userdel_rename_subgid_failure/data/userdel.err
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/userdel.err
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/data/userdel.err
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/usedel.test b/tests/failures/userdel/15_userdel_rename_subgid_failure/usedel.test
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/usedel.test
rename to tests/failures/userdel/15_userdel_rename_subgid_failure/usedel.test
diff --git a/tests/tests/failures/userdel/13_userdel_open_subgid_failure/config.txt b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/13_userdel_open_subgid_failure/config.txt
rename to tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config.txt
diff --git a/tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/default/useradd b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/default/useradd
rename to tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/group b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/group
rename to tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/group
diff --git a/tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/gshadow b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/gshadow
rename to tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/login.defs b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/login.defs
rename to tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/passwd b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/passwd
rename to tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/userdel/10_userdel_open_group_failure/config/etc/shadow b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/10_userdel_open_group_failure/config/etc/shadow
rename to tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/group b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/group
similarity index 100%
rename from tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/group
rename to tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/group
diff --git a/tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/passwd b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/passwd
rename to tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/passwd
diff --git a/tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/shadow b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/shadow
rename to tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/shadow
diff --git a/tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/usermod.err b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/usermod.err
rename to tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/usermod.test b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/usermod.test
rename to tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/usermod.test
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config.txt b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config.txt
rename to tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config.txt
diff --git a/tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/default/useradd b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/default/useradd
rename to tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/group b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/group
rename to tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/group
diff --git a/tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/gshadow b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/gshadow
rename to tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/login.defs b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/login.defs
rename to tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/passwd b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/passwd
rename to tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/shadow b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/11_userdel_open_gshadow_failure/config/etc/shadow
rename to tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/usermod.err b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/usermod.err
rename to tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/usermod.test b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/usermod.test
rename to tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/usermod.test
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config.txt b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config.txt
rename to tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config.txt
diff --git a/tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/default/useradd b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/default/useradd
rename to tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/group b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/group
rename to tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/group
diff --git a/tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/gshadow b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/gshadow
rename to tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/login.defs b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/login.defs
rename to tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/passwd b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/passwd
rename to tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/shadow b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/12_userdel_open_subuid_failure/config/etc/shadow
rename to tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/passwd b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/passwd
rename to tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/passwd
diff --git a/tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/shadow b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/shadow
rename to tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/shadow
diff --git a/tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/usermod.err b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/usermod.err
rename to tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/usermod.test b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/usermod.test
rename to tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/usermod.test
diff --git a/tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config.txt b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config.txt
rename to tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config.txt
diff --git a/tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/default/useradd b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/default/useradd
rename to tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/group b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/group
rename to tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/group
diff --git a/tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/gshadow b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/gshadow
rename to tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/login.defs b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/login.defs
rename to tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/login.defs
diff --git a/tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/passwd b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/passwd
rename to tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/passwd
diff --git a/tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/shadow b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/13_userdel_open_subgid_failure/config/etc/shadow
rename to tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/passwd b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/passwd
rename to tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/passwd
diff --git a/tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/shadow b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/shadow
similarity index 100%
rename from tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/shadow
rename to tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/shadow
diff --git a/tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/usermod.test b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/usermod.test
rename to tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/usermod.test
diff --git a/tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config.txt b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config.txt
rename to tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config.txt
diff --git a/tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/default/useradd b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/default/useradd
rename to tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/group b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/group
rename to tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/group
diff --git a/tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/gshadow b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/gshadow
rename to tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/login.defs b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/login.defs
rename to tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/login.defs
diff --git a/tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/passwd b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/passwd
rename to tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/passwd
diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/shadow b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/config/etc/shadow
rename to tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/passwd b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/passwd
similarity index 100%
rename from tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/passwd
rename to tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/passwd
diff --git a/tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/usermod.err b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/usermod.err
rename to tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/usermod.test b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/usermod.test
rename to tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/usermod.test
diff --git a/tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config.txt b/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config.txt
rename to tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config.txt
diff --git a/tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/default/useradd b/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/default/useradd
rename to tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/group b/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/group
rename to tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/gshadow b/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/gshadow
rename to tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/login.defs b/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/login.defs
rename to tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/passwd b/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/passwd
rename to tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/shadow b/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/config/etc/shadow
rename to tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/data/usermod.err b/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/data/usermod.err
rename to tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/usermod.test b/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/usermod.test
rename to tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/usermod.test
diff --git a/tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config.txt b/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config.txt
rename to tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config.txt
diff --git a/tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/default/useradd b/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/default/useradd
rename to tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/group b/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/group
rename to tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/group
diff --git a/tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/gshadow b/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/gshadow
rename to tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/login.defs b/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/login.defs
rename to tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/passwd b/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/passwd
rename to tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/shadow b/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/config/etc/shadow
rename to tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/data/usermod.err b/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/data/usermod.err
rename to tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/usermod.test b/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/usermod.test
rename to tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/usermod.test
diff --git a/tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config.txt b/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config.txt
rename to tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config.txt
diff --git a/tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/default/useradd b/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/default/useradd
rename to tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/group b/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/group
rename to tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/group
diff --git a/tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/gshadow b/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/gshadow
rename to tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/login.defs b/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/login.defs
rename to tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/login.defs
diff --git a/tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/passwd b/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/passwd
rename to tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/passwd
diff --git a/tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/shadow b/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/config/etc/shadow
rename to tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/data/usermod.err b/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/data/usermod.err
rename to tests/failures/usermod/08_usermod_change_user_name_open_group_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/usermod.test b/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/usermod.test
rename to tests/failures/usermod/08_usermod_change_user_name_open_group_failure/usermod.test
diff --git a/tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config.txt b/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config.txt
rename to tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config.txt
diff --git a/tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/default/useradd b/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/default/useradd
rename to tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/group b/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/group
rename to tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/group
diff --git a/tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/gshadow b/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/gshadow
rename to tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/login.defs b/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/login.defs
rename to tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/login.defs
diff --git a/tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/passwd b/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/passwd
rename to tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/passwd
diff --git a/tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/shadow b/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/config/etc/shadow
rename to tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/data/usermod.err b/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/data/usermod.err
rename to tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/usermod.test b/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/usermod.test
rename to tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/usermod.test
diff --git a/tests/tests/failures/usermod/10_usermod_-p_time_0/config.txt b/tests/failures/usermod/10_usermod_-p_time_0/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/10_usermod_-p_time_0/config.txt
rename to tests/failures/usermod/10_usermod_-p_time_0/config.txt
diff --git a/tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/default/useradd b/tests/failures/usermod/10_usermod_-p_time_0/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/default/useradd
rename to tests/failures/usermod/10_usermod_-p_time_0/config/etc/default/useradd
diff --git a/tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/group b/tests/failures/usermod/10_usermod_-p_time_0/config/etc/group
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/group
rename to tests/failures/usermod/10_usermod_-p_time_0/config/etc/group
diff --git a/tests/tests/cptools/11_cppw-p-s/config/etc/gshadow b/tests/failures/usermod/10_usermod_-p_time_0/config/etc/gshadow
similarity index 100%
rename from tests/tests/cptools/11_cppw-p-s/config/etc/gshadow
rename to tests/failures/usermod/10_usermod_-p_time_0/config/etc/gshadow
diff --git a/tests/tests/cptools/10_cppw-g-s/config/etc/passwd b/tests/failures/usermod/10_usermod_-p_time_0/config/etc/passwd
similarity index 100%
rename from tests/tests/cptools/10_cppw-g-s/config/etc/passwd
rename to tests/failures/usermod/10_usermod_-p_time_0/config/etc/passwd
diff --git a/tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/shadow b/tests/failures/usermod/10_usermod_-p_time_0/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/config/etc/shadow
rename to tests/failures/usermod/10_usermod_-p_time_0/config/etc/shadow
diff --git a/tests/tests/failures/usermod/10_usermod_-p_time_0/data/passwd b/tests/failures/usermod/10_usermod_-p_time_0/data/passwd
similarity index 100%
rename from tests/tests/failures/usermod/10_usermod_-p_time_0/data/passwd
rename to tests/failures/usermod/10_usermod_-p_time_0/data/passwd
diff --git a/tests/tests/failures/usermod/10_usermod_-p_time_0/data/shadow b/tests/failures/usermod/10_usermod_-p_time_0/data/shadow
similarity index 100%
rename from tests/tests/failures/usermod/10_usermod_-p_time_0/data/shadow
rename to tests/failures/usermod/10_usermod_-p_time_0/data/shadow
diff --git a/tests/tests/failures/usermod/10_usermod_-p_time_0/usermod.test b/tests/failures/usermod/10_usermod_-p_time_0/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/10_usermod_-p_time_0/usermod.test
rename to tests/failures/usermod/10_usermod_-p_time_0/usermod.test
diff --git a/tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config.txt b/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config.txt
rename to tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config.txt
diff --git a/tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/default/useradd b/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/default/useradd
rename to tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/default/useradd
diff --git a/tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/group b/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/group
similarity index 100%
rename from tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/group
rename to tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/group
diff --git a/tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/gshadow b/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/gshadow
rename to tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/gshadow
diff --git a/tests/tests/cptools/11_cppw-p-s/config/etc/passwd b/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/passwd
similarity index 100%
rename from tests/tests/cptools/11_cppw-p-s/config/etc/passwd
rename to tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/passwd
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/shadow b/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/shadow
rename to tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/shadow
diff --git a/tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/data/shadow b/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/data/shadow
similarity index 100%
rename from tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/data/shadow
rename to tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/data/shadow
diff --git a/tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/usermod.test b/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/usermod.test
rename to tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/usermod.test
diff --git a/tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config.txt b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config.txt
rename to tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config.txt
diff --git a/tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/default/useradd b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/default/useradd
rename to tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/group b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/group
rename to tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/group
diff --git a/tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/gshadow b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/gshadow
rename to tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/login.defs b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/login.defs
rename to tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/login.defs
diff --git a/tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/passwd b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/passwd
rename to tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/passwd
diff --git a/tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/shadow b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/config/etc/shadow
rename to tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/usermod.err b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/usermod.err
rename to tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/usermod.test b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/usermod.test
rename to tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/usermod.test
diff --git a/tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config.txt b/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config.txt
rename to tests/failures/usermod/13_usermod_-v_open_subuid_failure/config.txt
diff --git a/tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/default/useradd b/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/default/useradd
rename to tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/group b/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/group
rename to tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/group
diff --git a/tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/gshadow b/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/gshadow
rename to tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/login.defs b/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/login.defs
rename to tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/login.defs
diff --git a/tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/passwd b/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/passwd
rename to tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/passwd
diff --git a/tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/shadow b/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/06_usermod_change_user_name_open_passwd_failure/config/etc/shadow
rename to tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/subgid b/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/subgid
similarity index 100%
rename from tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/subgid
rename to tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/subgid
diff --git a/tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/subuid b/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/subuid
similarity index 100%
rename from tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/subuid
rename to tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/subuid
diff --git a/tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/data/usermod.err b/tests/failures/usermod/13_usermod_-v_open_subuid_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/data/usermod.err
rename to tests/failures/usermod/13_usermod_-v_open_subuid_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/usermod.test b/tests/failures/usermod/13_usermod_-v_open_subuid_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/usermod.test
rename to tests/failures/usermod/13_usermod_-v_open_subuid_failure/usermod.test
diff --git a/tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config.txt b/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config.txt
rename to tests/failures/usermod/14_usermod_-V_open_subuid_failure/config.txt
diff --git a/tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/default/useradd b/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/default/useradd
rename to tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/group b/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/group
rename to tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/group
diff --git a/tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/gshadow b/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/gshadow
rename to tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/login.defs b/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/login.defs
rename to tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/login.defs
diff --git a/tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/passwd b/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/passwd
rename to tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/passwd
diff --git a/tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/shadow b/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/07_usermod_change_user_name_open_shadow_failure/config/etc/shadow
rename to tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/subgid b/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/subgid
similarity index 100%
rename from tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/subgid
rename to tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/subgid
diff --git a/tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/subuid b/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/subuid
similarity index 100%
rename from tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/subuid
rename to tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/subuid
diff --git a/tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/data/usermod.err b/tests/failures/usermod/14_usermod_-V_open_subuid_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/data/usermod.err
rename to tests/failures/usermod/14_usermod_-V_open_subuid_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/usermod.test b/tests/failures/usermod/14_usermod_-V_open_subuid_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/usermod.test
rename to tests/failures/usermod/14_usermod_-V_open_subuid_failure/usermod.test
diff --git a/tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config.txt b/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config.txt
rename to tests/failures/usermod/15_usermod_-w_open_subgid_failure/config.txt
diff --git a/tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/default/useradd b/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/default/useradd
rename to tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/group b/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/group
rename to tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/group
diff --git a/tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/gshadow b/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/gshadow
rename to tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/login.defs b/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/login.defs
rename to tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/login.defs
diff --git a/tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/passwd b/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/passwd
rename to tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/passwd
diff --git a/tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/shadow b/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/shadow
rename to tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/subgid b/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/subgid
similarity index 100%
rename from tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/subgid
rename to tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/subgid
diff --git a/tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/subuid b/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/subuid
similarity index 100%
rename from tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/subuid
rename to tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/subuid
diff --git a/tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/data/usermod.err b/tests/failures/usermod/15_usermod_-w_open_subgid_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/data/usermod.err
rename to tests/failures/usermod/15_usermod_-w_open_subgid_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/usermod.test b/tests/failures/usermod/15_usermod_-w_open_subgid_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/usermod.test
rename to tests/failures/usermod/15_usermod_-w_open_subgid_failure/usermod.test
diff --git a/tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config.txt b/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config.txt
rename to tests/failures/usermod/16_usermod_-W_open_subgid_failure/config.txt
diff --git a/tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/default/useradd b/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/default/useradd
rename to tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/group b/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/group
rename to tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/group
diff --git a/tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/gshadow b/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/gshadow
rename to tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/login.defs b/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/login.defs
rename to tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/login.defs
diff --git a/tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/passwd b/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/passwd
rename to tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/passwd
diff --git a/tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/shadow b/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/shadow
rename to tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/subgid b/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/subgid
similarity index 100%
rename from tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/subgid
rename to tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/subgid
diff --git a/tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/subuid b/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/subuid
similarity index 100%
rename from tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/subuid
rename to tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/subuid
diff --git a/tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/data/usermod.err b/tests/failures/usermod/16_usermod_-W_open_subgid_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/data/usermod.err
rename to tests/failures/usermod/16_usermod_-W_open_subgid_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/usermod.test b/tests/failures/usermod/16_usermod_-W_open_subgid_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/usermod.test
rename to tests/failures/usermod/16_usermod_-W_open_subgid_failure/usermod.test
diff --git a/tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config.txt b/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config.txt
rename to tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config.txt
diff --git a/tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/default/useradd b/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/default/useradd
rename to tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/group b/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/group
rename to tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/group
diff --git a/tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/gshadow b/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/gshadow
rename to tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/login.defs b/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/login.defs
rename to tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/login.defs
diff --git a/tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/passwd b/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/passwd
rename to tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/passwd
diff --git a/tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/shadow b/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/shadow
rename to tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/subgid b/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/subgid
similarity index 100%
rename from tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/subgid
rename to tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/subgid
diff --git a/tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/subuid b/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/subuid
similarity index 100%
rename from tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/subuid
rename to tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/subuid
diff --git a/tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/data/usermod.err b/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/data/usermod.err
rename to tests/failures/usermod/17_usermod_-v_rename_subuid_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/usermod.test b/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/usermod.test
rename to tests/failures/usermod/17_usermod_-v_rename_subuid_failure/usermod.test
diff --git a/tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config.txt b/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config.txt
rename to tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config.txt
diff --git a/tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/default/useradd b/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/default/useradd
similarity index 100%
rename from tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/default/useradd
rename to tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/group b/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/group
rename to tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/group
diff --git a/tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/gshadow b/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/gshadow
rename to tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/login.defs b/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/login.defs
rename to tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/login.defs
diff --git a/tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/passwd b/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/passwd
rename to tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/passwd
diff --git a/tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/shadow b/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/shadow
rename to tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/shadow
diff --git a/tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/subgid b/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/subgid
similarity index 100%
rename from tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/subgid
rename to tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/subgid
diff --git a/tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/subuid b/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/subuid
similarity index 100%
rename from tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/subuid
rename to tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/subuid
diff --git a/tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/data/usermod.err b/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/data/usermod.err
similarity index 100%
rename from tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/data/usermod.err
rename to tests/failures/usermod/18_usermod_-w_rename_subgid_failure/data/usermod.err
diff --git a/tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/usermod.test b/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/usermod.test
similarity index 100%
rename from tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/usermod.test
rename to tests/failures/usermod/18_usermod_-w_rename_subgid_failure/usermod.test
diff --git a/tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/chgpasswd.test b/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/chgpasswd.test
rename to tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/chgpasswd.test
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/group b/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/group
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/group
rename to tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/group
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/gshadow b/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/gshadow
rename to tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/login.defs b/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/login.defs
rename to tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/login.defs
diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/passwd b/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/passwd
rename to tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/passwd
diff --git a/tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/shadow b/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/shadow
rename to tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/data/chgpasswd.err b/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/data/chgpasswd.err
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/data/chgpasswd.err
rename to tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/data/chgpasswd.err
diff --git a/tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/chgpasswd.test b/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/chgpasswd.test
rename to tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/group b/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/group
rename to tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/gshadow b/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/gshadow
rename to tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/login.defs b/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/login.defs
rename to tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/login.defs
diff --git a/tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/passwd b/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/passwd
rename to tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/shadow b/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/shadow
rename to tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/data/gshadow b/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/data/gshadow
rename to tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/data/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/chgpasswd.test b/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/chgpasswd.test
rename to tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/group b/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/group
rename to tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/gshadow b/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/gshadow
rename to tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/login.defs b/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/login.defs
rename to tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/login.defs
diff --git a/tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/passwd b/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/passwd
rename to tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/shadow b/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/shadow
rename to tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/data/group b/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/data/group
rename to tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/chgpasswd.test b/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/chgpasswd.test
rename to tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/group b/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/group
rename to tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/gshadow b/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/gshadow
rename to tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/login.defs b/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/login.defs
rename to tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/login.defs
diff --git a/tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/passwd b/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/passwd
rename to tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/shadow b/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/shadow
rename to tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/group b/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/data/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/group
rename to tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/data/group
diff --git a/tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/data/gshadow b/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/data/gshadow
rename to tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/data/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/chgpasswd.test b/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/chgpasswd.test
rename to tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/data/group b/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/data/group
rename to tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/gshadow b/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/login.defs b/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/login.defs
rename to tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/login.defs
diff --git a/tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/passwd b/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/passwd
rename to tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/shadow b/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/shadow
rename to tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/data/chgpasswd.err b/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/data/chgpasswd.err
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/data/chgpasswd.err
rename to tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/data/chgpasswd.err
diff --git a/tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/chgpasswd.test b/tests/grouptools/chgpasswd/06_chgpasswd_usage/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/chgpasswd.test
rename to tests/grouptools/chgpasswd/06_chgpasswd_usage/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config.txt b/tests/grouptools/chgpasswd/06_chgpasswd_usage/config.txt
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config.txt
rename to tests/grouptools/chgpasswd/06_chgpasswd_usage/config.txt
diff --git a/tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/default/useradd b/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/default/useradd
rename to tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/default/useradd
diff --git a/tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/group b/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/group
rename to tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/gshadow b/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/gshadow
rename to tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/passwd b/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/passwd
rename to tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/shadow b/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/shadow
rename to tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/data/usage.out b/tests/grouptools/chgpasswd/06_chgpasswd_usage/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/data/usage.out
rename to tests/grouptools/chgpasswd/06_chgpasswd_usage/data/usage.out
diff --git a/tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/chgpasswd.test b/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/chgpasswd.test
rename to tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config.txt b/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config.txt
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config.txt
rename to tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config.txt
diff --git a/tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/default/useradd b/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/default/useradd
rename to tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/default/useradd
diff --git a/tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/group b/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/group
rename to tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/gshadow b/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/gshadow
rename to tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/passwd b/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/passwd
rename to tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/shadow b/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/shadow
rename to tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/data/usage.out b/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/data/usage.out
rename to tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/data/usage.out
diff --git a/tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/chgpasswd.test b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/chgpasswd.test
rename to tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config.txt b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config.txt
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config.txt
rename to tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config.txt
diff --git a/tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/default/useradd b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/default/useradd
rename to tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/default/useradd
diff --git a/tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/group b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/group
rename to tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/gshadow b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/gshadow
rename to tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/passwd b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/passwd
rename to tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/shadow b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/shadow
rename to tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/data/usage.out b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/data/usage.out
rename to tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/data/usage.out
diff --git a/tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/chgpasswd.test b/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/chgpasswd.test
rename to tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config.txt b/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config.txt
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config.txt
rename to tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config.txt
diff --git a/tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/default/useradd b/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/default/useradd
rename to tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/default/useradd
diff --git a/tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/group b/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/group
rename to tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/gshadow b/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/gshadow
rename to tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/passwd b/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/passwd
rename to tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/shadow b/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/shadow
rename to tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/data/usage.out b/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/data/usage.out
rename to tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/data/usage.out
diff --git a/tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/chgpasswd.test b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/chgpasswd.test
rename to tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config.txt b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config.txt
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config.txt
rename to tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config.txt
diff --git a/tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/default/useradd b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/default/useradd
rename to tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/default/useradd
diff --git a/tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/group b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/group
rename to tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/gshadow b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/gshadow
rename to tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/passwd b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/passwd
rename to tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/shadow b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/shadow
rename to tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/data/usage.out b/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/data/usage.out
rename to tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/data/usage.out
diff --git a/tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/chgpasswd.test b/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/chgpasswd.test
rename to tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config.txt b/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config.txt
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config.txt
rename to tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config.txt
diff --git a/tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/default/useradd b/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/default/useradd
rename to tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/default/useradd
diff --git a/tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/group b/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/group
rename to tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/gshadow b/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/gshadow
rename to tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/passwd b/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/passwd
rename to tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/shadow b/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/shadow
rename to tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/data/usage.out b/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/data/usage.out
rename to tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/data/usage.out
diff --git a/tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/chgpasswd.test b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/chgpasswd.test
rename to tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config.txt b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config.txt
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config.txt
rename to tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config.txt
diff --git a/tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/default/useradd b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/default/useradd
rename to tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/default/useradd
diff --git a/tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/group b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/group
rename to tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/gshadow b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/gshadow
rename to tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/passwd b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/10_chgpasswd_usage-m-c_exclusive/config/etc/passwd
rename to tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/shadow b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/shadow
rename to tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/data/usage.out b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/data/usage.out
rename to tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/data/usage.out
diff --git a/tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/chgpasswd.test b/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/chgpasswd.test
rename to tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config.txt b/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config.txt
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config.txt
rename to tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config.txt
diff --git a/tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/default/useradd b/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/default/useradd
rename to tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/default/useradd
diff --git a/tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/group b/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/group
rename to tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/gshadow b/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/gshadow
rename to tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/passwd b/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/passwd
rename to tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/shadow b/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/shadow
rename to tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/data/usage.out b/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/data/usage.out
rename to tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/data/usage.out
diff --git a/tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/chgpasswd.test b/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/chgpasswd.test
rename to tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/group b/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/group
rename to tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/gshadow b/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/gshadow
rename to tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/passwd b/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/passwd
rename to tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/shadow b/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/shadow
rename to tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/data/gshadow b/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/data/gshadow
rename to tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/data/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/chgpasswd.test b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/chgpasswd.test
rename to tests/grouptools/chgpasswd/15_chgpasswd_password_md5/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/group b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/group
rename to tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/gshadow b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/gshadow
rename to tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/passwd b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/passwd
rename to tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/shadow b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/shadow
rename to tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/data/gshadow b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/data/gshadow
rename to tests/grouptools/chgpasswd/15_chgpasswd_password_md5/data/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/chgpasswd.test b/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/chgpasswd.test
rename to tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/group b/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/group
rename to tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/gshadow b/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/gshadow
rename to tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/passwd b/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/passwd
rename to tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/shadow b/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/shadow
rename to tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/data/gshadow b/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/data/gshadow
rename to tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/data/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test
rename to tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/group b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/group
rename to tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/gshadow b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/gshadow
rename to tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/passwd b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/passwd
rename to tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/shadow b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/shadow
rename to tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/data/gshadow b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/data/gshadow
rename to tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/data/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/chgpasswd.test b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/chgpasswd.test
rename to tests/grouptools/chgpasswd/18_chgpasswd_password_DES/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/group b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/group
rename to tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/gshadow b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/gshadow
rename to tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/passwd b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/passwd
rename to tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/shadow b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/shadow
rename to tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/data/gshadow b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/data/gshadow
rename to tests/grouptools/chgpasswd/18_chgpasswd_password_DES/data/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/chgpasswd.test b/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/chgpasswd.test
rename to tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/group b/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/group
rename to tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/gshadow b/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/gshadow
rename to tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/passwd b/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/passwd
rename to tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/shadow b/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/shadow
rename to tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/data/gshadow b/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/data/gshadow
rename to tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/data/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/chgpasswd.test b/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/chgpasswd.test
rename to tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/group b/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/group
rename to tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/gshadow b/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/gshadow
rename to tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/passwd b/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/passwd
rename to tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/shadow b/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/shadow
rename to tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/data/gshadow b/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/data/gshadow
rename to tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/data/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/chgpasswd.test b/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/chgpasswd.test
rename to tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/group b/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/group
rename to tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/gshadow b/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/gshadow
rename to tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/passwd b/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/passwd
rename to tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/shadow b/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/shadow
rename to tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/data/gshadow b/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/data/gshadow
rename to tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/data/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/chgpasswd.test b/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/chgpasswd.test
rename to tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/group b/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/group
rename to tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/gshadow b/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/gshadow
rename to tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/passwd b/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/passwd
rename to tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/shadow b/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/shadow
rename to tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/data/gshadow b/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/data/gshadow
rename to tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/data/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/chgpasswd.test b/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/chgpasswd.test
rename to tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/group b/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/group
rename to tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/gshadow b/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/gshadow
rename to tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/passwd b/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/passwd
rename to tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/shadow b/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/shadow
rename to tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/data/gshadow b/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/data/gshadow
rename to tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/data/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/chgpasswd.test b/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/chgpasswd.test
rename to tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/group b/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/group
rename to tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/gshadow b/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/gshadow
rename to tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/passwd b/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/passwd
rename to tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/shadow b/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/shadow
rename to tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/data/gshadow b/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/data/gshadow
rename to tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/data/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/chgpasswd.test b/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/chgpasswd.test
rename to tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/group b/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/group
rename to tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/gshadow b/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/gshadow
rename to tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/passwd b/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/passwd
rename to tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/shadow b/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/shadow
rename to tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/data/group b/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/data/group
rename to tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/chgpasswd.test b/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/chgpasswd.test
rename to tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/group b/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/group
rename to tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/gshadow b/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/passwd b/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/passwd
rename to tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/shadow b/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/shadow
rename to tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/data/group b/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/data/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/data/group
rename to tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/data/group
diff --git a/tests/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/chgpasswd.test b/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/chgpasswd.test
rename to tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/chgpasswd.test
diff --git a/tests/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/group b/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/group
rename to tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/gshadow b/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/gshadow
rename to tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/passwd b/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/passwd
rename to tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/shadow b/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/shadow
rename to tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/group b/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/data/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/group
rename to tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/data/group
diff --git a/tests/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/data/gshadow b/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/data/gshadow
rename to tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/data/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/chgpasswd.test b/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/chgpasswd.test
rename to tests/grouptools/chgpasswd/30_chgpasswd_locked_group/chgpasswd.test
diff --git a/tests/tests/cptools/02_cppw_usage/config.txt b/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config.txt
similarity index 100%
rename from tests/tests/cptools/02_cppw_usage/config.txt
rename to tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config.txt
diff --git a/tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/default/useradd b/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/default/useradd
rename to tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/default/useradd
diff --git a/tests/tests/failures/useradd/11_useradd_time_0/data/group b/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/group
similarity index 100%
rename from tests/tests/failures/useradd/11_useradd_time_0/data/group
rename to tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/group
diff --git a/tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/gshadow b/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/gshadow
rename to tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/passwd b/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/passwd
rename to tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/passwd
diff --git a/tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/shadow b/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/13_usermod_-v_open_subuid_failure/config/etc/shadow
rename to tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/data/chgpasswd.err b/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/data/chgpasswd.err
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/data/chgpasswd.err
rename to tests/grouptools/chgpasswd/30_chgpasswd_locked_group/data/chgpasswd.err
diff --git a/tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/chgpasswd.test b/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/chgpasswd.test
rename to tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/chgpasswd.test
diff --git a/tests/tests/cptools/03_cppw_usage_invalid_option/config.txt b/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config.txt
similarity index 100%
rename from tests/tests/cptools/03_cppw_usage_invalid_option/config.txt
rename to tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config.txt
diff --git a/tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/default/useradd b/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/default/useradd
rename to tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/group b/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/group
rename to tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/group
diff --git a/tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/gshadow b/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/gshadow
rename to tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/passwd b/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/passwd
rename to tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/passwd
diff --git a/tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/shadow b/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/14_usermod_-V_open_subuid_failure/config/etc/shadow
rename to tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/data/chgpasswd.err b/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/data/chgpasswd.err
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/data/chgpasswd.err
rename to tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/data/chgpasswd.err
diff --git a/tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/chgpasswd.test b/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/chgpasswd.test
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/chgpasswd.test
rename to tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/chgpasswd.test
diff --git a/tests/tests/cptools/04_cppw_no_file_argument/config.txt b/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config.txt
similarity index 100%
rename from tests/tests/cptools/04_cppw_no_file_argument/config.txt
rename to tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config.txt
diff --git a/tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/default/useradd b/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/default/useradd
rename to tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/group b/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/group
rename to tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/group
diff --git a/tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/gshadow b/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/gshadow
rename to tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/passwd b/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/passwd
rename to tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/passwd
diff --git a/tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/shadow b/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/15_usermod_-w_open_subgid_failure/config/etc/shadow
rename to tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/shadow
diff --git a/tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/data/chgpasswd.err b/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/data/chgpasswd.err
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/data/chgpasswd.err
rename to tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/data/chgpasswd.err
diff --git a/tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config.txt b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config.txt
rename to tests/grouptools/gpasswd/01_gpasswd_change_member_list/config.txt
diff --git a/tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/default/useradd b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/default/useradd
rename to tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/group b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/group
rename to tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/gshadow b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/gshadow
rename to tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/passwd b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/passwd
rename to tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/passwd
diff --git a/tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/shadow b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/shadow
rename to tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/shadow
diff --git a/tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/group b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/group
similarity index 100%
rename from tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/group
rename to tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/group
diff --git a/tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/gshadow b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/08_usermod_change_user_name_open_group_failure/config/etc/gshadow
rename to tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/gpasswd.test b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/gpasswd.test
rename to tests/grouptools/gpasswd/01_gpasswd_change_member_list/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config.txt b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config.txt
rename to tests/grouptools/gpasswd/02_gpasswd_change_member_list/config.txt
diff --git a/tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/default/useradd b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/default/useradd
rename to tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/group b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/group
rename to tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/gshadow b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/gshadow
rename to tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/passwd b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/passwd
rename to tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/passwd
diff --git a/tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/shadow b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/shadow
rename to tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/shadow
diff --git a/tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/group b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/group
similarity index 100%
rename from tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/group
rename to tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/group
diff --git a/tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/gshadow b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/09_usermod_change_user_name_open_gshadow_failure/config/etc/gshadow
rename to tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/gpasswd.test b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/gpasswd.test
rename to tests/grouptools/gpasswd/02_gpasswd_change_member_list/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config.txt b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config.txt
rename to tests/grouptools/gpasswd/03_gpasswd_change_member_list/config.txt
diff --git a/tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/default/useradd b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/default/useradd
rename to tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/default/useradd
diff --git a/tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/group b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/group
similarity index 100%
rename from tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/group
rename to tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/group
diff --git a/tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/gshadow b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/gshadow
similarity index 100%
rename from tests/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/config/etc/gshadow
rename to tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/passwd b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/passwd
rename to tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/passwd
diff --git a/tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/shadow b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/shadow
similarity index 100%
rename from tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/shadow
rename to tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/group b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/group
rename to tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/group
diff --git a/tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/gshadow b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/gshadow
rename to tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/gpasswd.test b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/gpasswd.test
rename to tests/grouptools/gpasswd/03_gpasswd_change_member_list/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config.txt b/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config.txt
rename to tests/grouptools/gpasswd/04_gpasswd_change_member_list/config.txt
diff --git a/tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/default/useradd b/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/default/useradd
rename to tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/group b/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/group
rename to tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/gshadow b/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/gshadow
rename to tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/passwd b/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/passwd
rename to tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/shadow b/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/shadow
rename to tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/group b/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/group
rename to tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/group
diff --git a/tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/gshadow b/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/gshadow
rename to tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/gpasswd.test b/tests/grouptools/gpasswd/04_gpasswd_change_member_list/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/gpasswd.test
rename to tests/grouptools/gpasswd/04_gpasswd_change_member_list/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config.txt b/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config.txt
rename to tests/grouptools/gpasswd/05_gpasswd_change_member_list/config.txt
diff --git a/tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/default/useradd b/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/default/useradd
rename to tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/group b/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/group
rename to tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/gshadow b/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/gshadow
rename to tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/passwd b/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/passwd
rename to tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/shadow b/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/shadow
rename to tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/group b/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/group
rename to tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/group
diff --git a/tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/gshadow b/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/gshadow
rename to tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/gpasswd.test b/tests/grouptools/gpasswd/05_gpasswd_change_member_list/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/gpasswd.test
rename to tests/grouptools/gpasswd/05_gpasswd_change_member_list/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config.txt b/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config.txt
rename to tests/grouptools/gpasswd/06_gpasswd_change_member_list/config.txt
diff --git a/tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/default/useradd b/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/default/useradd
rename to tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/group b/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/group
rename to tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/gshadow b/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/gshadow
rename to tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/passwd b/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/passwd
rename to tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/shadow b/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/shadow
rename to tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/group b/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/group
rename to tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/group
diff --git a/tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/gshadow b/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/gshadow
rename to tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/gpasswd.test b/tests/grouptools/gpasswd/06_gpasswd_change_member_list/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/gpasswd.test
rename to tests/grouptools/gpasswd/06_gpasswd_change_member_list/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config.txt b/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config.txt
rename to tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd b/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/group b/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/group
rename to tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow b/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/passwd b/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
rename to tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/shadow b/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/shadow
rename to tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/group b/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/group
rename to tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/gshadow b/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/gshadow
rename to tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/gpasswd.test
rename to tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config.txt b/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config.txt
rename to tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd b/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/group b/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/group
rename to tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow b/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/passwd b/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
rename to tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/shadow b/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/shadow
rename to tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/group b/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/group
rename to tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/gshadow b/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/gshadow
rename to tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/gpasswd.test
rename to tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config.txt b/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config.txt
rename to tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd b/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/group b/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/group
rename to tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow b/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/passwd b/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
rename to tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/shadow b/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/shadow
rename to tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/group b/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/group
rename to tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/gshadow b/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/gshadow
rename to tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/gpasswd.test
rename to tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config.txt b/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config.txt
rename to tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd b/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/group b/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/group
rename to tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow b/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/passwd b/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
rename to tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/shadow b/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/04_gpasswd_change_member_list/config/etc/shadow
rename to tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/group b/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/group
rename to tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/gshadow b/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/gshadow
rename to tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/gpasswd.test
rename to tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config.txt b/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config.txt
rename to tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd b/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/group b/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/group
rename to tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow b/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/passwd b/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
rename to tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/shadow b/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/05_gpasswd_change_member_list/config/etc/shadow
rename to tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/group b/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/group
rename to tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/gshadow b/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/gshadow
rename to tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/gpasswd.test
rename to tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config.txt b/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config.txt
rename to tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd b/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/group b/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/group
rename to tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow b/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/passwd b/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
rename to tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/shadow b/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/06_gpasswd_change_member_list/config/etc/shadow
rename to tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/group b/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/group
rename to tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/gshadow b/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/gshadow
rename to tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/gpasswd.test
rename to tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd b/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/group b/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/group
rename to tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow b/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/shadow b/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
rename to tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/group b/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/group
rename to tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd b/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/group b/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/group
rename to tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow b/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/shadow b/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
rename to tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/group b/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/group
rename to tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd b/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/group b/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/group
rename to tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/gshadow b/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/gshadow
rename to tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/shadow b/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
rename to tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/group b/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/group
rename to tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd b/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/group b/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/group
rename to tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow b/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/shadow b/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
rename to tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/group b/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/group
rename to tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd b/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/group b/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/group
rename to tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow b/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/shadow b/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
rename to tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/group b/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/group
rename to tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd b/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/group b/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/group
rename to tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow b/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/shadow b/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/config/etc/shadow
rename to tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/group b/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/group
rename to tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config.txt b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config.txt
rename to tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config.txt
diff --git a/tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/group b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/group
rename to tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/gshadow b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/gshadow
rename to tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/login.defs b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/login.defs
rename to tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/login.defs
diff --git a/tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/passwd b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/passwd
rename to tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/gshadow b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/gshadow
rename to tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.exp b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.exp
similarity index 100%
rename from tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.exp
rename to tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.exp
diff --git a/tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.test b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.test
rename to tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config.txt b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config.txt
rename to tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/group b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/group
rename to tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/gshadow b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/login.defs b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/login.defs
rename to tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/passwd b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/passwd
rename to tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/gshadow b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/gshadow
rename to tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.exp b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.exp
similarity index 100%
rename from tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.exp
rename to tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.exp
diff --git a/tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.test
rename to tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/group b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/group
rename to tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/gshadow b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/login.defs b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/login.defs
rename to tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/login.defs
diff --git a/tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/group b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/group
rename to tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.exp b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.exp
similarity index 100%
rename from tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.exp
rename to tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.exp
diff --git a/tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config.txt b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config.txt
rename to tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config.txt
diff --git a/tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/group b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/group
rename to tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/gshadow b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/gshadow
rename to tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/login.defs b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/login.defs
rename to tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/login.defs
diff --git a/tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/passwd b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/passwd
rename to tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/shadow b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/shadow
rename to tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/gshadow b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/gshadow
rename to tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.exp b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.exp
similarity index 100%
rename from tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.exp
rename to tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.exp
diff --git a/tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.test b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.test
rename to tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config.txt b/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config.txt
rename to tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config.txt
diff --git a/tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/group b/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/group
rename to tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/gshadow b/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/gshadow
rename to tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/passwd b/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/passwd
rename to tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/shadow b/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/shadow
rename to tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.exp b/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.exp
similarity index 100%
rename from tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.exp
rename to tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.exp
diff --git a/tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.test b/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.test
rename to tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/group b/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/group
rename to tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow b/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.exp b/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.exp
similarity index 100%
rename from tests/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.exp
rename to tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.exp
diff --git a/tests/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/config.txt b/tests/grouptools/gpasswd/25_gpasswd_remove_password/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/config.txt
rename to tests/grouptools/gpasswd/25_gpasswd_remove_password/config.txt
diff --git a/tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/default/useradd b/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/default/useradd
rename to tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/group b/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/group
rename to tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/gshadow b/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/gshadow
rename to tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/passwd b/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/passwd
rename to tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/group b/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/group
rename to tests/grouptools/gpasswd/25_gpasswd_remove_password/data/group
diff --git a/tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/gshadow b/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/gshadow
rename to tests/grouptools/gpasswd/25_gpasswd_remove_password/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/gpasswd.test b/tests/grouptools/gpasswd/25_gpasswd_remove_password/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/gpasswd.test
rename to tests/grouptools/gpasswd/25_gpasswd_remove_password/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config.txt b/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config.txt
rename to tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/default/useradd b/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/group b/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/group
rename to tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/gshadow b/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/passwd b/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/passwd
rename to tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/group b/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/group
rename to tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/gshadow b/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/gshadow
rename to tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/gpasswd.test
rename to tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/default/useradd b/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/group b/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/group
rename to tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/gshadow b/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/group b/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/group
rename to tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/config.txt b/tests/grouptools/gpasswd/28_gpasswd_lock_password/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/config.txt
rename to tests/grouptools/gpasswd/28_gpasswd_lock_password/config.txt
diff --git a/tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/default/useradd b/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/default/useradd
rename to tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/group b/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/group
rename to tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/gshadow b/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/gshadow
rename to tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/passwd b/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/passwd
rename to tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/shadow b/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/shadow
rename to tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/group b/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/group
rename to tests/grouptools/gpasswd/28_gpasswd_lock_password/data/group
diff --git a/tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/gshadow b/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/gshadow
rename to tests/grouptools/gpasswd/28_gpasswd_lock_password/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/gpasswd.test b/tests/grouptools/gpasswd/28_gpasswd_lock_password/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/gpasswd.test
rename to tests/grouptools/gpasswd/28_gpasswd_lock_password/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config.txt b/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config.txt
rename to tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/default/useradd b/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/group b/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/group
rename to tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/gshadow b/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/passwd b/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/passwd
rename to tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/shadow b/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/config/etc/shadow
rename to tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/group b/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/group
rename to tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/gshadow b/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/gshadow
rename to tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/gpasswd.test
rename to tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/default/useradd b/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/group b/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/group
rename to tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/gshadow b/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/group b/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/group
rename to tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config.txt b/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config.txt
rename to tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/default/useradd b/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/group b/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/group
rename to tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/gshadow b/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/passwd b/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/passwd
rename to tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/shadow b/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/shadow
rename to tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/group b/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/group
rename to tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/gshadow b/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/gshadow
rename to tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/gpasswd.test b/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/gpasswd.test
rename to tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config.txt b/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config.txt
rename to tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/default/useradd b/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/group b/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/group
rename to tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/gshadow b/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/passwd b/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/passwd
rename to tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/shadow b/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/config/etc/shadow
rename to tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/group b/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/group
rename to tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/gshadow b/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/gshadow
rename to tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/gpasswd.test
rename to tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/default/useradd b/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/group b/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/group
rename to tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/gshadow b/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/group b/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/group
rename to tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config.txt b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config.txt
rename to tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/default/useradd b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/group b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/group
rename to tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/gshadow b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/passwd b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/passwd
rename to tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/shadow b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/shadow
rename to tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/group b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/group
rename to tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/gshadow b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/gshadow
rename to tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/gpasswd.test b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/gpasswd.test
rename to tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config.txt b/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config.txt
rename to tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/default/useradd b/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/group b/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/group
rename to tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/gshadow b/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/passwd b/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/passwd
rename to tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/shadow b/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/config/etc/shadow
rename to tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/group b/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/group
rename to tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/gshadow b/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/gshadow
rename to tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/gpasswd.test b/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/gpasswd.test
rename to tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config.txt b/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config.txt
rename to tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/default/useradd b/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/group b/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/group
rename to tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/gshadow b/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/passwd b/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/passwd
rename to tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/group b/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/group
rename to tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/gshadow b/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/gshadow
rename to tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/gpasswd.test b/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/gpasswd.test
rename to tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config.txt b/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config.txt
rename to tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/default/useradd b/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/group b/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/group
rename to tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/gshadow b/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/passwd b/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/passwd
rename to tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/shadow b/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/config/etc/shadow
rename to tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/group b/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/group
rename to tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/gshadow b/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/gshadow
rename to tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
rename to tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config.txt b/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config.txt
rename to tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/default/useradd b/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/group b/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/group
rename to tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/gshadow b/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/passwd b/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/passwd
rename to tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/shadow b/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/config/etc/shadow
rename to tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/group b/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/group
rename to tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/gshadow b/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/gshadow
rename to tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
rename to tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config.txt b/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config.txt
rename to tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/default/useradd b/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/group b/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/group
rename to tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/gshadow b/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/passwd b/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/passwd
rename to tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/group b/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/group
rename to tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/gshadow b/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/gshadow
rename to tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
rename to tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/default/useradd b/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/group b/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/group
rename to tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/gshadow b/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/shadow b/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/shadow
rename to tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/group b/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/group
rename to tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/default/useradd b/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/group b/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/group
rename to tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/gshadow b/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/shadow b/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/config/etc/shadow
rename to tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/group b/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/group
rename to tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/default/useradd b/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/group b/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/group
rename to tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/gshadow b/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/shadow b/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/config/etc/shadow
rename to tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/group b/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/group
rename to tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config.txt b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config.txt
rename to tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/default/useradd b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/group b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/group
rename to tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/gshadow b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/passwd b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/passwd
rename to tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/shadow b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/config/etc/shadow
rename to tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gpasswd.err b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gpasswd.err
similarity index 100%
rename from tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gpasswd.err
rename to tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gpasswd.err
diff --git a/tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/gpasswd.test b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/gpasswd.test
rename to tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config.txt b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config.txt
rename to tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config.txt
diff --git a/tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/default/useradd b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/default/useradd
rename to tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/default/useradd
diff --git a/tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/group b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/group
rename to tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/gshadow b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/gshadow
rename to tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/passwd b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/passwd
rename to tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/shadow b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/config/etc/shadow
rename to tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gpasswd.err b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gpasswd.err
similarity index 100%
rename from tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gpasswd.err
rename to tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gpasswd.err
diff --git a/tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/gpasswd.test b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/gpasswd.test
rename to tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config.txt b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config.txt
rename to tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/default/useradd b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/group b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/group
rename to tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/gshadow b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/passwd b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/passwd
rename to tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/shadow b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/config/etc/shadow
rename to tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gpasswd.err b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gpasswd.err
similarity index 100%
rename from tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gpasswd.err
rename to tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gpasswd.err
diff --git a/tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/gpasswd.test b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/gpasswd.test
rename to tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config.txt b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config.txt
rename to tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config.txt
diff --git a/tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/default/useradd b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/default/useradd
rename to tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/group b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/group
rename to tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/gshadow b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/passwd b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/passwd
rename to tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gpasswd.err b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gpasswd.err
similarity index 100%
rename from tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gpasswd.err
rename to tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gpasswd.err
diff --git a/tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/gpasswd.test b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/gpasswd.test
rename to tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config.txt b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config.txt
rename to tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config.txt
diff --git a/tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/default/useradd b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/default/useradd
rename to tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/group b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/group
rename to tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/gshadow b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/gshadow
rename to tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/passwd b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/passwd
rename to tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gpasswd.err b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gpasswd.err
similarity index 100%
rename from tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gpasswd.err
rename to tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gpasswd.err
diff --git a/tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/gpasswd.test b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/gpasswd.test
rename to tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config.txt b/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config.txt
rename to tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config.txt
diff --git a/tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/default/useradd b/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/default/useradd
rename to tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/group b/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/group
rename to tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/gshadow b/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/gshadow
rename to tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/passwd b/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/passwd
rename to tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/gshadow b/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/gshadow
rename to tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/gpasswd.test b/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/gpasswd.test
rename to tests/grouptools/gpasswd/48_gpasswd_change_admin_list/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config.txt b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config.txt
rename to tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config.txt
diff --git a/tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/default/useradd b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/default/useradd
rename to tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/group b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/group
rename to tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/gshadow b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/gshadow
rename to tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/passwd b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/passwd
rename to tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/shadow b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/shadow
rename to tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/gshadow b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/gshadow
rename to tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/gpasswd.test b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/gpasswd.test
rename to tests/grouptools/gpasswd/49_gpasswd_change_admin_list/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config.txt b/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config.txt
rename to tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config.txt
diff --git a/tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/default/useradd b/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/default/useradd
rename to tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/group b/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/group
rename to tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/gshadow b/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/gshadow
rename to tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/passwd b/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/passwd
rename to tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/shadow b/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/shadow
rename to tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/gshadow b/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/gshadow
rename to tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/gpasswd.test b/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/gpasswd.test
rename to tests/grouptools/gpasswd/50_gpasswd_change_admin_list/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config.txt b/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config.txt
rename to tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config.txt
diff --git a/tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/default/useradd b/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/default/useradd
rename to tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/group b/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/group
rename to tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/gshadow b/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/gshadow
rename to tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/passwd b/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/passwd
rename to tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/shadow b/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/shadow
rename to tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/gshadow b/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/gshadow
rename to tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/gpasswd.test b/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/gpasswd.test
rename to tests/grouptools/gpasswd/51_gpasswd_change_admin_list/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config.txt b/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config.txt
rename to tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config.txt
diff --git a/tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/default/useradd b/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/default/useradd
rename to tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/group b/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/group
rename to tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/gshadow b/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/gshadow
rename to tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/passwd b/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/passwd
rename to tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/shadow b/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/shadow
rename to tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/gshadow b/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/gshadow
rename to tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/gpasswd.test b/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/gpasswd.test
rename to tests/grouptools/gpasswd/52_gpasswd_change_admin_list/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config.txt b/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config.txt
rename to tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config.txt
diff --git a/tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/default/useradd b/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/default/useradd
rename to tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/group b/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/group
rename to tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/gshadow b/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/gshadow
rename to tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/passwd b/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/passwd
rename to tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/shadow b/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/shadow
rename to tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/gshadow b/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/gshadow
rename to tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/gpasswd.test b/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/gpasswd.test
rename to tests/grouptools/gpasswd/53_gpasswd_change_admin_list/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config.txt b/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config.txt
rename to tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/default/useradd b/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/group b/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/group
rename to tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/gshadow b/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/passwd b/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/passwd
rename to tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/shadow b/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/config/etc/shadow
rename to tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/gshadow b/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/gshadow
rename to tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/gpasswd.test
rename to tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config.txt b/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config.txt
rename to tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/default/useradd b/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/group b/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/group
rename to tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/gshadow b/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/passwd b/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/shadow b/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/config/etc/shadow
rename to tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/gpasswd.err b/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/gpasswd.err
similarity index 100%
rename from tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/gpasswd.err
rename to tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/gpasswd.err
diff --git a/tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/gpasswd.test
rename to tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config.txt b/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config.txt
rename to tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/default/useradd b/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/group b/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/group
rename to tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/gshadow b/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/passwd b/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/passwd
rename to tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/shadow b/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/config/etc/shadow
rename to tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/gpasswd.test b/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/gpasswd.test
rename to tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config.txt b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config.txt
rename to tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config.txt
diff --git a/tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/default/useradd b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/default/useradd
rename to tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/group b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/group
rename to tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/gshadow b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/gshadow
rename to tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/passwd b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/passwd
rename to tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/shadow b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/config/etc/shadow
rename to tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gpasswd.err b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gpasswd.err
similarity index 100%
rename from tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gpasswd.err
rename to tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gpasswd.err
diff --git a/tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/gpasswd.test b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/gpasswd.test
rename to tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config.txt b/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config.txt
rename to tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config.txt
diff --git a/tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/default/useradd b/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/default/useradd
rename to tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/group b/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/group
rename to tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/gshadow b/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/gshadow
rename to tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/passwd b/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/passwd
rename to tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/shadow b/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/config/etc/shadow
rename to tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/group b/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/group
rename to tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/group
diff --git a/tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/gpasswd.test b/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/gpasswd.test
rename to tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config.txt b/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config.txt
rename to tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config.txt
diff --git a/tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/default/useradd b/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/default/useradd
rename to tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/group b/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/group
rename to tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/gshadow b/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/gshadow
rename to tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/passwd b/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/passwd
rename to tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/shadow b/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/config/etc/shadow
rename to tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/gshadow b/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/gpasswd.test b/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/gpasswd.test
rename to tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config.txt b/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config.txt
rename to tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config.txt
diff --git a/tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/default/useradd b/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/default/useradd
rename to tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/group b/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/group
rename to tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/gshadow b/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/passwd b/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/passwd
rename to tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/shadow b/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/shadow
rename to tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/group b/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/group
rename to tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/group
diff --git a/tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/gshadow b/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/gshadow
rename to tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test b/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test
rename to tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/61_gpasswd_usage/config.txt b/tests/grouptools/gpasswd/61_gpasswd_usage/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/61_gpasswd_usage/config.txt
rename to tests/grouptools/gpasswd/61_gpasswd_usage/config.txt
diff --git a/tests/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/data/group b/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/data/group
rename to tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/group
diff --git a/tests/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/gshadow b/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/gshadow
rename to tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/passwd b/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/29_chgpasswd-e_no_gshadow_entry/config/etc/passwd
rename to tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/passwd
diff --git a/tests/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/shadow b/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/26_chgpasswd_no_gshadow_file_invalid_group/config/etc/shadow
rename to tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/61_gpasswd_usage/data/usage.out b/tests/grouptools/gpasswd/61_gpasswd_usage/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/gpasswd/61_gpasswd_usage/data/usage.out
rename to tests/grouptools/gpasswd/61_gpasswd_usage/data/usage.out
diff --git a/tests/tests/grouptools/gpasswd/61_gpasswd_usage/gpasswd.test b/tests/grouptools/gpasswd/61_gpasswd_usage/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/61_gpasswd_usage/gpasswd.test
rename to tests/grouptools/gpasswd/61_gpasswd_usage/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config.txt b/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config.txt
rename to tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config.txt
diff --git a/tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/default/useradd b/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/default/useradd
rename to tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/group b/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/group
rename to tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/gshadow b/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/config/etc/gshadow
rename to tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/passwd b/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/passwd
rename to tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/shadow b/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/config/etc/shadow
rename to tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/data/gpasswd.err b/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/data/gpasswd.err
similarity index 100%
rename from tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/data/gpasswd.err
rename to tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/data/gpasswd.err
diff --git a/tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/gpasswd.test b/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/gpasswd.test
rename to tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config.txt b/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config.txt
rename to tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config.txt
diff --git a/tests/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/group b/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/group
rename to tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/gshadow b/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/gshadow
rename to tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/passwd b/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/passwd
rename to tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/shadow b/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/shadow
rename to tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/data/usage.out b/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/data/usage.out
rename to tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/data/usage.out
diff --git a/tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/gpasswd.test b/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/gpasswd.test
rename to tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config.txt b/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config.txt
rename to tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config.txt
diff --git a/tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/group b/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/group
rename to tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/gshadow b/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/gshadow
rename to tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/passwd b/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/passwd
rename to tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/shadow b/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/shadow
rename to tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/data/usage.out b/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/data/usage.out
rename to tests/grouptools/gpasswd/64_gpasswd_usage-a-d/data/usage.out
diff --git a/tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/gpasswd.test b/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/gpasswd.test
rename to tests/grouptools/gpasswd/64_gpasswd_usage-a-d/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config.txt b/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config.txt
rename to tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config.txt
diff --git a/tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/group b/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/group
rename to tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/gshadow b/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/gshadow
rename to tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/passwd b/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/passwd
rename to tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/shadow b/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/shadow
rename to tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/data/usage.out b/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/data/usage.out
rename to tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/data/usage.out
diff --git a/tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/gpasswd.test b/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/gpasswd.test
rename to tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config.txt b/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config.txt
rename to tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config.txt
diff --git a/tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/group b/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/group
rename to tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/gshadow b/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/gshadow
rename to tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/passwd b/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/passwd
rename to tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/shadow b/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/shadow
rename to tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/data/usage.out b/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/data/usage.out
rename to tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/data/usage.out
diff --git a/tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/gpasswd.test b/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/gpasswd.test
rename to tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config.txt b/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config.txt
rename to tests/grouptools/gpasswd/67_gpasswd-A_myuser/config.txt
diff --git a/tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/group b/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/group
rename to tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/gshadow b/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/gshadow
rename to tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/passwd b/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/passwd
rename to tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/shadow b/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/shadow
rename to tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/gpasswd.exp b/tests/grouptools/gpasswd/67_gpasswd-A_myuser/gpasswd.exp
similarity index 100%
rename from tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/gpasswd.exp
rename to tests/grouptools/gpasswd/67_gpasswd-A_myuser/gpasswd.exp
diff --git a/tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/gpasswd.test b/tests/grouptools/gpasswd/67_gpasswd-A_myuser/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/gpasswd.test
rename to tests/grouptools/gpasswd/67_gpasswd-A_myuser/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config.txt b/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config.txt
rename to tests/grouptools/gpasswd/68_gpasswd-M_myuser/config.txt
diff --git a/tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/group b/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/group
rename to tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/gshadow b/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/gshadow
rename to tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/passwd b/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/passwd
rename to tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/shadow b/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/shadow
rename to tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/gpasswd.exp b/tests/grouptools/gpasswd/68_gpasswd-M_myuser/gpasswd.exp
similarity index 100%
rename from tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/gpasswd.exp
rename to tests/grouptools/gpasswd/68_gpasswd-M_myuser/gpasswd.exp
diff --git a/tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/gpasswd.test b/tests/grouptools/gpasswd/68_gpasswd-M_myuser/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/gpasswd.test
rename to tests/grouptools/gpasswd/68_gpasswd-M_myuser/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config.txt b/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config.txt
rename to tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config.txt
diff --git a/tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/group b/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/group
rename to tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/gshadow b/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/gshadow
rename to tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/login.defs b/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/login.defs
rename to tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/login.defs
diff --git a/tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/passwd b/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/passwd
rename to tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/shadow b/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/shadow
rename to tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/data/gshadow b/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/data/gshadow
rename to tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/gpasswd.exp b/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/gpasswd.exp
similarity index 100%
rename from tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/gpasswd.exp
rename to tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/gpasswd.exp
diff --git a/tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/gpasswd.test b/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/gpasswd.test
rename to tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config.txt b/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config.txt
rename to tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config.txt
diff --git a/tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/group b/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/group
rename to tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/gshadow b/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/gshadow
rename to tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/login.defs b/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/login.defs
rename to tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/login.defs
diff --git a/tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/passwd b/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/passwd
rename to tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/shadow b/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/shadow
rename to tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/data/gshadow b/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/data/gshadow
rename to tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/gpasswd.exp b/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/gpasswd.exp
similarity index 100%
rename from tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/gpasswd.exp
rename to tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/gpasswd.exp
diff --git a/tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/gpasswd.test b/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/gpasswd.test
rename to tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config.txt b/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config.txt
rename to tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config.txt
diff --git a/tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/group b/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/group
rename to tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/gshadow b/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/gshadow
rename to tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/login.defs b/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/login.defs
rename to tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/login.defs
diff --git a/tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/passwd b/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/passwd
rename to tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/shadow b/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/shadow
rename to tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/gpasswd.exp b/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/gpasswd.exp
similarity index 100%
rename from tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/gpasswd.exp
rename to tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/gpasswd.exp
diff --git a/tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/gpasswd.test b/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/gpasswd.test
rename to tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/gpasswd.test
diff --git a/tests/tests/grouptools/gpasswd/72_gpasswd-M-A/config.txt b/tests/grouptools/gpasswd/72_gpasswd-M-A/config.txt
similarity index 100%
rename from tests/tests/grouptools/gpasswd/72_gpasswd-M-A/config.txt
rename to tests/grouptools/gpasswd/72_gpasswd-M-A/config.txt
diff --git a/tests/tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/group b/tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/group
rename to tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/gshadow b/tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/gshadow
rename to tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/gshadow
diff --git a/tests/tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/passwd b/tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/passwd
rename to tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/shadow b/tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/72_gpasswd-M-A/data/group b/tests/grouptools/gpasswd/72_gpasswd-M-A/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/72_gpasswd-M-A/data/group
rename to tests/grouptools/gpasswd/72_gpasswd-M-A/data/group
diff --git a/tests/tests/grouptools/gpasswd/72_gpasswd-M-A/data/gshadow b/tests/grouptools/gpasswd/72_gpasswd-M-A/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/72_gpasswd-M-A/data/gshadow
rename to tests/grouptools/gpasswd/72_gpasswd-M-A/data/gshadow
diff --git a/tests/tests/grouptools/gpasswd/72_gpasswd-M-A/gpasswd.test b/tests/grouptools/gpasswd/72_gpasswd-M-A/gpasswd.test
similarity index 100%
rename from tests/tests/grouptools/gpasswd/72_gpasswd-M-A/gpasswd.test
rename to tests/grouptools/gpasswd/72_gpasswd-M-A/gpasswd.test
diff --git a/tests/tests/grouptools/groupadd/01_groupadd_add_group/config.txt b/tests/grouptools/groupadd/01_groupadd_add_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/01_groupadd_add_group/config.txt
rename to tests/grouptools/groupadd/01_groupadd_add_group/config.txt
diff --git a/tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/default/useradd b/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/default/useradd
rename to tests/grouptools/groupadd/01_groupadd_add_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/group b/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/group
rename to tests/grouptools/groupadd/01_groupadd_add_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/gshadow b/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/gshadow
rename to tests/grouptools/groupadd/01_groupadd_add_group/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/login.defs b/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config/etc/login.defs
rename to tests/grouptools/groupadd/01_groupadd_add_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/passwd b/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/passwd
rename to tests/grouptools/groupadd/01_groupadd_add_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/shadow b/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/shadow
rename to tests/grouptools/groupadd/01_groupadd_add_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/01_groupadd_add_group/data/group b/tests/grouptools/groupadd/01_groupadd_add_group/data/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/01_groupadd_add_group/data/group
rename to tests/grouptools/groupadd/01_groupadd_add_group/data/group
diff --git a/tests/tests/grouptools/groupadd/01_groupadd_add_group/data/gshadow b/tests/grouptools/groupadd/01_groupadd_add_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/01_groupadd_add_group/data/gshadow
rename to tests/grouptools/groupadd/01_groupadd_add_group/data/gshadow
diff --git a/tests/tests/grouptools/groupadd/01_groupadd_add_group/groupadd.test b/tests/grouptools/groupadd/01_groupadd_add_group/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/01_groupadd_add_group/groupadd.test
rename to tests/grouptools/groupadd/01_groupadd_add_group/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config.txt b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config.txt
rename to tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config.txt
diff --git a/tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/default/useradd b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/default/useradd
rename to tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/group b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/group
rename to tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/gshadow b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/gshadow
rename to tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/login.defs b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/login.defs
rename to tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/passwd b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/passwd
rename to tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/shadow b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/shadow
rename to tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/shadow
diff --git a/tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/group b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/69_gpasswd_change_passwd_2_tries/config/etc/group
rename to tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/group
diff --git a/tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/gshadow b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/gshadow
rename to tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/gshadow
diff --git a/tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/groupadd.test b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/groupadd.test
rename to tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config.txt b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config.txt
rename to tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config.txt
diff --git a/tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/default/useradd b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/default/useradd
rename to tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/group b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/group
rename to tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/gshadow b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/gshadow
rename to tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/login.defs b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config/etc/login.defs
rename to tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/passwd b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/passwd
rename to tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/shadow b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/config/etc/shadow
rename to tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/group b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/group
rename to tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/group
diff --git a/tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/gshadow b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/gshadow
rename to tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/gshadow
diff --git a/tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/groupadd.test b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/groupadd.test
rename to tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/04_groupadd_set_password/config.txt b/tests/grouptools/groupadd/04_groupadd_set_password/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/04_groupadd_set_password/config.txt
rename to tests/grouptools/groupadd/04_groupadd_set_password/config.txt
diff --git a/tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/default/useradd b/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/default/useradd
rename to tests/grouptools/groupadd/04_groupadd_set_password/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/group b/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/group
rename to tests/grouptools/groupadd/04_groupadd_set_password/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/gshadow b/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/gshadow
rename to tests/grouptools/groupadd/04_groupadd_set_password/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/login.defs b/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/login.defs
similarity index 100%
rename from tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config/etc/login.defs
rename to tests/grouptools/groupadd/04_groupadd_set_password/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/passwd b/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/passwd
rename to tests/grouptools/groupadd/04_groupadd_set_password/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/shadow b/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/shadow
rename to tests/grouptools/groupadd/04_groupadd_set_password/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/04_groupadd_set_password/data/group b/tests/grouptools/groupadd/04_groupadd_set_password/data/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/04_groupadd_set_password/data/group
rename to tests/grouptools/groupadd/04_groupadd_set_password/data/group
diff --git a/tests/tests/grouptools/groupadd/04_groupadd_set_password/data/gshadow b/tests/grouptools/groupadd/04_groupadd_set_password/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/04_groupadd_set_password/data/gshadow
rename to tests/grouptools/groupadd/04_groupadd_set_password/data/gshadow
diff --git a/tests/tests/grouptools/groupadd/04_groupadd_set_password/groupadd.test b/tests/grouptools/groupadd/04_groupadd_set_password/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/04_groupadd_set_password/groupadd.test
rename to tests/grouptools/groupadd/04_groupadd_set_password/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/05_groupadd_set_GID/config.txt b/tests/grouptools/groupadd/05_groupadd_set_GID/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/05_groupadd_set_GID/config.txt
rename to tests/grouptools/groupadd/05_groupadd_set_GID/config.txt
diff --git a/tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/default/useradd b/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/default/useradd
rename to tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/group b/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/group
rename to tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/gshadow b/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/gshadow
rename to tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/login.defs b/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/login.defs
rename to tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/passwd b/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/passwd
rename to tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/shadow b/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/shadow
rename to tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/05_groupadd_set_GID/data/group b/tests/grouptools/groupadd/05_groupadd_set_GID/data/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/05_groupadd_set_GID/data/group
rename to tests/grouptools/groupadd/05_groupadd_set_GID/data/group
diff --git a/tests/tests/grouptools/groupadd/05_groupadd_set_GID/data/gshadow b/tests/grouptools/groupadd/05_groupadd_set_GID/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/05_groupadd_set_GID/data/gshadow
rename to tests/grouptools/groupadd/05_groupadd_set_GID/data/gshadow
diff --git a/tests/tests/grouptools/groupadd/05_groupadd_set_GID/groupadd.test b/tests/grouptools/groupadd/05_groupadd_set_GID/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/05_groupadd_set_GID/groupadd.test
rename to tests/grouptools/groupadd/05_groupadd_set_GID/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config.txt b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config.txt
rename to tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config.txt
diff --git a/tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/default/useradd b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/default/useradd
rename to tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/group b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/group
rename to tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/gshadow b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/gshadow
rename to tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/login.defs b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/config/etc/login.defs
rename to tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/passwd b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/passwd
rename to tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/shadow b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/shadow
rename to tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/groupadd.test b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/groupadd.test
rename to tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config.txt b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config.txt
rename to tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config.txt
diff --git a/tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/default/useradd b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/default/useradd
rename to tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/group b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/group
rename to tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/gshadow b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/gshadow
rename to tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/login.defs b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/login.defs
rename to tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/passwd b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/passwd
rename to tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/shadow b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/shadow
rename to tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/group b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/group
rename to tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/group
diff --git a/tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/gshadow b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/gshadow
rename to tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/gshadow
diff --git a/tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/groupadd.test b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/groupadd.test
rename to tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/08_groupadd_locked_group/config.txt b/tests/grouptools/groupadd/08_groupadd_locked_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/08_groupadd_locked_group/config.txt
rename to tests/grouptools/groupadd/08_groupadd_locked_group/config.txt
diff --git a/tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/default/useradd b/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/default/useradd
rename to tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/group b/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/group
rename to tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/gshadow b/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/gshadow
rename to tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/passwd b/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/passwd
rename to tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/shadow b/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/shadow
rename to tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/08_groupadd_locked_group/data/groupadd.err b/tests/grouptools/groupadd/08_groupadd_locked_group/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/08_groupadd_locked_group/data/groupadd.err
rename to tests/grouptools/groupadd/08_groupadd_locked_group/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/08_groupadd_locked_group/groupadd.test b/tests/grouptools/groupadd/08_groupadd_locked_group/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/08_groupadd_locked_group/groupadd.test
rename to tests/grouptools/groupadd/08_groupadd_locked_group/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config.txt b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config.txt
rename to tests/grouptools/groupadd/09_groupadd_locked_gshadow/config.txt
diff --git a/tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/default/useradd b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/default/useradd
rename to tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/group b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/group
rename to tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/gshadow b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/gshadow
rename to tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/passwd b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/passwd
rename to tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/shadow b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/shadow
rename to tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/groupadd.err b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/groupadd.err
rename to tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/groupadd.test b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/groupadd.test
rename to tests/grouptools/groupadd/09_groupadd_locked_gshadow/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config.txt b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config.txt
rename to tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config.txt
diff --git a/tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/default/useradd b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/default/useradd
rename to tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/group b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/group
rename to tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/gshadow b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/gshadow
rename to tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/login.defs b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/login.defs
rename to tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/passwd b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/passwd
rename to tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/shadow b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/shadow
rename to tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/group b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/group
rename to tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/group
diff --git a/tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/gshadow b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/gshadow
rename to tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/gshadow
diff --git a/tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/groupadd.test b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/groupadd.test
rename to tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config.txt b/tests/grouptools/groupadd/11_groupadd_invalid_GID/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config.txt
rename to tests/grouptools/groupadd/11_groupadd_invalid_GID/config.txt
diff --git a/tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/default/useradd b/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/default/useradd
rename to tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/group b/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/group
rename to tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/gshadow b/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/gshadow
rename to tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/passwd b/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/passwd
rename to tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/shadow b/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/shadow
rename to tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/groupadd.err b/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/groupadd.err
rename to tests/grouptools/groupadd/11_groupadd_invalid_GID/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/groupadd.test b/tests/grouptools/groupadd/11_groupadd_invalid_GID/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/groupadd.test
rename to tests/grouptools/groupadd/11_groupadd_invalid_GID/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config.txt b/tests/grouptools/groupadd/12_groupadd_negative_GID/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config.txt
rename to tests/grouptools/groupadd/12_groupadd_negative_GID/config.txt
diff --git a/tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/default/useradd b/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/default/useradd
rename to tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/group b/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/group
rename to tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/gshadow b/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/gshadow
rename to tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/passwd b/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/passwd
rename to tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/shadow b/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/shadow
rename to tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/12_groupadd_negative_GID/data/groupadd.err b/tests/grouptools/groupadd/12_groupadd_negative_GID/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/12_groupadd_negative_GID/data/groupadd.err
rename to tests/grouptools/groupadd/12_groupadd_negative_GID/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/12_groupadd_negative_GID/groupadd.test b/tests/grouptools/groupadd/12_groupadd_negative_GID/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/12_groupadd_negative_GID/groupadd.test
rename to tests/grouptools/groupadd/12_groupadd_negative_GID/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config.txt b/tests/grouptools/groupadd/13_groupadd_invalid_name/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config.txt
rename to tests/grouptools/groupadd/13_groupadd_invalid_name/config.txt
diff --git a/tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/default/useradd b/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/default/useradd
rename to tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/group b/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/group
rename to tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/gshadow b/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/gshadow
rename to tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/passwd b/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/passwd
rename to tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/shadow b/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/shadow
rename to tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/13_groupadd_invalid_name/data/groupadd.err b/tests/grouptools/groupadd/13_groupadd_invalid_name/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/13_groupadd_invalid_name/data/groupadd.err
rename to tests/grouptools/groupadd/13_groupadd_invalid_name/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/13_groupadd_invalid_name/groupadd.test b/tests/grouptools/groupadd/13_groupadd_invalid_name/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/13_groupadd_invalid_name/groupadd.test
rename to tests/grouptools/groupadd/13_groupadd_invalid_name/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config.txt b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config.txt
rename to tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config.txt
diff --git a/tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/default/useradd b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/default/useradd
rename to tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/group b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/group
rename to tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/gshadow b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/gshadow
rename to tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/passwd b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/passwd
rename to tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/shadow b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/shadow
rename to tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/groupadd.err b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/groupadd.err
rename to tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/groupadd.test b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/groupadd.test
rename to tests/grouptools/groupadd/14_groupadd_invalid_-K_option/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config.txt b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config.txt
rename to tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config.txt
diff --git a/tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/default/useradd b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/default/useradd
rename to tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/group b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/group
rename to tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/gshadow b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/gshadow
rename to tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/passwd b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/passwd
rename to tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/shadow b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/shadow
rename to tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/groupadd.err b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/groupadd.err
rename to tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/groupadd.test b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/groupadd.test
rename to tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/16_groupadd_existing_group/config.txt b/tests/grouptools/groupadd/16_groupadd_existing_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/16_groupadd_existing_group/config.txt
rename to tests/grouptools/groupadd/16_groupadd_existing_group/config.txt
diff --git a/tests/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/default/useradd b/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/default/useradd
rename to tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/group b/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/group
rename to tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/gshadow b/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/gshadow
rename to tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/passwd b/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/passwd
rename to tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/shadow b/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/shadow
rename to tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/16_groupadd_existing_group/data/groupadd.err b/tests/grouptools/groupadd/16_groupadd_existing_group/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/16_groupadd_existing_group/data/groupadd.err
rename to tests/grouptools/groupadd/16_groupadd_existing_group/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/16_groupadd_existing_group/groupadd.test b/tests/grouptools/groupadd/16_groupadd_existing_group/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/16_groupadd_existing_group/groupadd.test
rename to tests/grouptools/groupadd/16_groupadd_existing_group/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config.txt b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config.txt
rename to tests/grouptools/groupadd/17_groupadd_add_systemgroup/config.txt
diff --git a/tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/default/useradd b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/default/useradd
rename to tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/group b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/group
rename to tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/gshadow b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/gshadow
rename to tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/login.defs b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/login.defs
rename to tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/passwd b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/passwd
rename to tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/shadow b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/shadow
rename to tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/group b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/group
rename to tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/group
diff --git a/tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/gshadow b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/gshadow
rename to tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/gshadow
diff --git a/tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/groupadd.test b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/groupadd.test
rename to tests/grouptools/groupadd/17_groupadd_add_systemgroup/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config.txt b/tests/grouptools/groupadd/18_groupadd_no_more_GID/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config.txt
rename to tests/grouptools/groupadd/18_groupadd_no_more_GID/config.txt
diff --git a/tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/default/useradd b/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/default/useradd
rename to tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/group b/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/group
rename to tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/gshadow b/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/gshadow
rename to tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/login.defs b/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/login.defs
rename to tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/passwd b/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/passwd
rename to tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/shadow b/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/shadow
rename to tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/groupadd.err b/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/groupadd.err
rename to tests/grouptools/groupadd/18_groupadd_no_more_GID/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/groupadd.test b/tests/grouptools/groupadd/18_groupadd_no_more_GID/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/groupadd.test
rename to tests/grouptools/groupadd/18_groupadd_no_more_GID/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config.txt b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config.txt
rename to tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config.txt
diff --git a/tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/default/useradd b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/default/useradd
rename to tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/group b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/group
rename to tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/gshadow b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/gshadow
rename to tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/login.defs b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/login.defs
rename to tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/passwd b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/passwd
rename to tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/shadow b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/shadow
rename to tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/groupadd.err b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/groupadd.err
rename to tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/groupadd.test b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/groupadd.test
rename to tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config.txt b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config.txt
rename to tests/grouptools/groupadd/20_groupadd_add_existing_GID/config.txt
diff --git a/tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/default/useradd b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/default/useradd
rename to tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/group b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/70_gpasswd_change_passwd_3_tries/config/etc/group
rename to tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/gshadow b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/gshadow
rename to tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/passwd b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/passwd
rename to tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/shadow b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/shadow
rename to tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/groupadd.err b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/groupadd.err
rename to tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/groupadd.test b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/groupadd.test
rename to tests/grouptools/groupadd/20_groupadd_add_existing_GID/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config.txt b/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config.txt
rename to tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config.txt
diff --git a/tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/default/useradd b/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/default/useradd
rename to tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/group b/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/group
rename to tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/gshadow b/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/gshadow
rename to tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/passwd b/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/passwd
rename to tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/shadow b/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/shadow
rename to tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/groupadd.err b/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/groupadd.err
rename to tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/groupadd.test b/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/groupadd.test
rename to tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/22_groupadd_usage/config.txt b/tests/grouptools/groupadd/22_groupadd_usage/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/22_groupadd_usage/config.txt
rename to tests/grouptools/groupadd/22_groupadd_usage/config.txt
diff --git a/tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/default/useradd b/tests/grouptools/groupadd/22_groupadd_usage/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/default/useradd
rename to tests/grouptools/groupadd/22_groupadd_usage/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/group b/tests/grouptools/groupadd/22_groupadd_usage/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/group
rename to tests/grouptools/groupadd/22_groupadd_usage/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/gshadow b/tests/grouptools/groupadd/22_groupadd_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/gshadow
rename to tests/grouptools/groupadd/22_groupadd_usage/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/passwd b/tests/grouptools/groupadd/22_groupadd_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/passwd
rename to tests/grouptools/groupadd/22_groupadd_usage/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/shadow b/tests/grouptools/groupadd/22_groupadd_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/shadow
rename to tests/grouptools/groupadd/22_groupadd_usage/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/22_groupadd_usage/data/usage.out b/tests/grouptools/groupadd/22_groupadd_usage/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/groupadd/22_groupadd_usage/data/usage.out
rename to tests/grouptools/groupadd/22_groupadd_usage/data/usage.out
diff --git a/tests/tests/grouptools/groupadd/22_groupadd_usage/groupadd.test b/tests/grouptools/groupadd/22_groupadd_usage/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/22_groupadd_usage/groupadd.test
rename to tests/grouptools/groupadd/22_groupadd_usage/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/23_groupadd_no_groups/config.txt b/tests/grouptools/groupadd/23_groupadd_no_groups/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/23_groupadd_no_groups/config.txt
rename to tests/grouptools/groupadd/23_groupadd_no_groups/config.txt
diff --git a/tests/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/default/useradd b/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/default/useradd
rename to tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/group b/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/group
rename to tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/gshadow b/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/gshadow
rename to tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/passwd b/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/passwd
rename to tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/shadow b/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/shadow
rename to tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/23_groupadd_no_groups/data/groupadd.err b/tests/grouptools/groupadd/23_groupadd_no_groups/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/23_groupadd_no_groups/data/groupadd.err
rename to tests/grouptools/groupadd/23_groupadd_no_groups/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/23_groupadd_no_groups/groupadd.test b/tests/grouptools/groupadd/23_groupadd_no_groups/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/23_groupadd_no_groups/groupadd.test
rename to tests/grouptools/groupadd/23_groupadd_no_groups/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/24_groupadd_2_groups/config.txt b/tests/grouptools/groupadd/24_groupadd_2_groups/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/24_groupadd_2_groups/config.txt
rename to tests/grouptools/groupadd/24_groupadd_2_groups/config.txt
diff --git a/tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/default/useradd b/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/default/useradd
rename to tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/group b/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/group
rename to tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/gshadow b/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/gshadow
rename to tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/passwd b/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/passwd
rename to tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/shadow b/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/shadow
rename to tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/24_groupadd_2_groups/data/groupadd.err b/tests/grouptools/groupadd/24_groupadd_2_groups/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/24_groupadd_2_groups/data/groupadd.err
rename to tests/grouptools/groupadd/24_groupadd_2_groups/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/24_groupadd_2_groups/groupadd.test b/tests/grouptools/groupadd/24_groupadd_2_groups/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/24_groupadd_2_groups/groupadd.test
rename to tests/grouptools/groupadd/24_groupadd_2_groups/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config.txt b/tests/grouptools/groupadd/25_groupadd_no_gshadow/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config.txt
rename to tests/grouptools/groupadd/25_groupadd_no_gshadow/config.txt
diff --git a/tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/default/useradd b/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/default/useradd
rename to tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/group b/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/group
rename to tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/gshadow b/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/gshadow
rename to tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/login.defs b/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/login.defs
rename to tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/passwd b/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/passwd
rename to tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/shadow b/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/shadow
rename to tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/group b/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/group
rename to tests/grouptools/groupadd/25_groupadd_no_gshadow/data/group
diff --git a/tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/groupadd.test b/tests/grouptools/groupadd/25_groupadd_no_gshadow/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/groupadd.test
rename to tests/grouptools/groupadd/25_groupadd_no_gshadow/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config.txt b/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config.txt
rename to tests/grouptools/groupadd/26_groupadd_-o_without_-g/config.txt
diff --git a/tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/default/useradd b/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/default/useradd
rename to tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/group b/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/group
rename to tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/gshadow b/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/gshadow
rename to tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/passwd b/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/passwd
rename to tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/shadow b/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/shadow
rename to tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/data/groupadd.err b/tests/grouptools/groupadd/26_groupadd_-o_without_-g/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/data/groupadd.err
rename to tests/grouptools/groupadd/26_groupadd_-o_without_-g/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/groupadd.test b/tests/grouptools/groupadd/26_groupadd_-o_without_-g/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/groupadd.test
rename to tests/grouptools/groupadd/26_groupadd_-o_without_-g/groupadd.test
diff --git a/tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config.txt b/tests/grouptools/groupadd/27_groupadd_invalid_option/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config.txt
rename to tests/grouptools/groupadd/27_groupadd_invalid_option/config.txt
diff --git a/tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/group b/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/group
rename to tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/gshadow b/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/gshadow
rename to tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/passwd b/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/passwd
rename to tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/shadow b/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/shadow
rename to tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/27_groupadd_invalid_option/data/groupadd.err b/tests/grouptools/groupadd/27_groupadd_invalid_option/data/groupadd.err
similarity index 100%
rename from tests/tests/grouptools/groupadd/27_groupadd_invalid_option/data/groupadd.err
rename to tests/grouptools/groupadd/27_groupadd_invalid_option/data/groupadd.err
diff --git a/tests/tests/grouptools/groupadd/27_groupadd_invalid_option/groupadd.test b/tests/grouptools/groupadd/27_groupadd_invalid_option/groupadd.test
similarity index 100%
rename from tests/tests/grouptools/groupadd/27_groupadd_invalid_option/groupadd.test
rename to tests/grouptools/groupadd/27_groupadd_invalid_option/groupadd.test
diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/config.txt b/tests/grouptools/groupdel/01_groupdel_delete_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupdel/01_groupdel_delete_group/config.txt
rename to tests/grouptools/groupdel/01_groupdel_delete_group/config.txt
diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/default/useradd b/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/default/useradd
rename to tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/group b/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/71_gpasswd_change_passwd_4_tries/config/etc/group
rename to tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/gshadow b/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/gshadow
rename to tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/login.defs b/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/login.defs
rename to tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/passwd b/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/passwd
rename to tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/shadow b/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/shadow
rename to tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/group b/tests/grouptools/groupdel/01_groupdel_delete_group/data/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/group
rename to tests/grouptools/groupdel/01_groupdel_delete_group/data/group
diff --git a/tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/gshadow b/tests/grouptools/groupdel/01_groupdel_delete_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/gshadow
rename to tests/grouptools/groupdel/01_groupdel_delete_group/data/gshadow
diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/groupdel.test b/tests/grouptools/groupdel/01_groupdel_delete_group/groupdel.test
similarity index 100%
rename from tests/tests/grouptools/groupdel/01_groupdel_delete_group/groupdel.test
rename to tests/grouptools/groupdel/01_groupdel_delete_group/groupdel.test
diff --git a/tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config.txt b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config.txt
rename to tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config.txt
diff --git a/tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/default/useradd b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/default/useradd
rename to tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/group b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/group
rename to tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/group
diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/data/gshadow b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/01_groupdel_delete_group/data/gshadow
rename to tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/login.defs b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/login.defs
rename to tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/passwd b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/passwd
rename to tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/shadow b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/shadow
rename to tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/data/group b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/groupdel/01_groupdel_delete_group/data/group
rename to tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/group
diff --git a/tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/groupdel.test b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/groupdel.test
similarity index 100%
rename from tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/groupdel.test
rename to tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/groupdel.test
diff --git a/tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config.txt b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config.txt
rename to tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/default/useradd b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/group b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/group
rename to tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/gshadow b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/config/etc/gshadow
rename to tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/login.defs b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/login.defs
rename to tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/passwd b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/passwd
rename to tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/shadow b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/shadow
rename to tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/group b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/group
rename to tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/groupdel.test b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/groupdel.test
similarity index 100%
rename from tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/groupdel.test
rename to tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/groupdel.test
diff --git a/tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config.txt b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config.txt
rename to tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config.txt
diff --git a/tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/default/useradd b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/default/useradd
rename to tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/group b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/group
rename to tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/group
diff --git a/tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/gshadow b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/gshadow
rename to tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/login.defs b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/login.defs
rename to tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/passwd b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/passwd
rename to tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/shadow b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/shadow
rename to tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/groupdel.err b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/groupdel.err
similarity index 100%
rename from tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/groupdel.err
rename to tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/groupdel.err
diff --git a/tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/groupdel.test b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/groupdel.test
similarity index 100%
rename from tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/groupdel.test
rename to tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/groupdel.test
diff --git a/tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config.txt b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config.txt
rename to tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config.txt
diff --git a/tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/default/useradd b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/default/useradd
rename to tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/group b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/group
rename to tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/group
diff --git a/tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/gshadow b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/gshadow
rename to tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/login.defs b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/login.defs
rename to tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/passwd b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/passwd
rename to tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/shadow b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/shadow
rename to tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/groupdel.err b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/groupdel.err
similarity index 100%
rename from tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/groupdel.err
rename to tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/groupdel.err
diff --git a/tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/groupdel.test b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/groupdel.test
similarity index 100%
rename from tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/groupdel.test
rename to tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/groupdel.test
diff --git a/tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config.txt b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config.txt
rename to tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config.txt
diff --git a/tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/default/useradd b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/default/useradd
rename to tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/group b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/group
rename to tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/group
diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/gshadow b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/gshadow
rename to tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/login.defs b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/login.defs
rename to tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/passwd b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/passwd
rename to tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/shadow b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/shadow
rename to tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/groupdel.err b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/groupdel.err
similarity index 100%
rename from tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/groupdel.err
rename to tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/groupdel.err
diff --git a/tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/groupdel.test b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/groupdel.test
similarity index 100%
rename from tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/groupdel.test
rename to tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/groupdel.test
diff --git a/tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config.txt b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config.txt
rename to tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config.txt
diff --git a/tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/default/useradd b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/default/useradd
rename to tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/group b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/group
rename to tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/group
diff --git a/tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/gshadow b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/login.defs b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/login.defs
rename to tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/passwd b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/passwd
rename to tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/passwd
diff --git a/tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/shadow b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/shadow
rename to tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/shadow
diff --git a/tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/groupdel.err b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/groupdel.err
similarity index 100%
rename from tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/groupdel.err
rename to tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/groupdel.err
diff --git a/tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/groupdel.test b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/groupdel.test
similarity index 100%
rename from tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/groupdel.test
rename to tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/groupdel.test
diff --git a/tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config.txt b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config.txt
rename to tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config.txt
diff --git a/tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/default/useradd b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/default/useradd
rename to tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/group b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/group
rename to tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/group
diff --git a/tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/gshadow b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/gshadow
rename to tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/login.defs b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/config/etc/login.defs
rename to tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/passwd b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/passwd
rename to tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/passwd
diff --git a/tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/shadow b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/shadow
rename to tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/shadow
diff --git a/tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/groupdel.err b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/groupdel.err
similarity index 100%
rename from tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/groupdel.err
rename to tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/groupdel.err
diff --git a/tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/groupdel.test b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/groupdel.test
similarity index 100%
rename from tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/groupdel.test
rename to tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/groupdel.test
diff --git a/tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config.txt b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config.txt
rename to tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config.txt
diff --git a/tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/default/useradd b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/default/useradd
rename to tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/group b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/group
rename to tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/group
diff --git a/tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/gshadow b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/gshadow
rename to tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/login.defs b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/login.defs
rename to tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/passwd b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/passwd
rename to tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/passwd
diff --git a/tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/shadow b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/shadow
rename to tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/shadow
diff --git a/tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/groupdel.err b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/groupdel.err
similarity index 100%
rename from tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/groupdel.err
rename to tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/groupdel.err
diff --git a/tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/groupdel.test b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/groupdel.test
similarity index 100%
rename from tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/groupdel.test
rename to tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/groupdel.test
diff --git a/tests/tests/grouptools/groupdel/10_groupdel_usage/config.txt b/tests/grouptools/groupdel/10_groupdel_usage/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupdel/10_groupdel_usage/config.txt
rename to tests/grouptools/groupdel/10_groupdel_usage/config.txt
diff --git a/tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/default/useradd b/tests/grouptools/groupdel/10_groupdel_usage/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/default/useradd
rename to tests/grouptools/groupdel/10_groupdel_usage/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/group b/tests/grouptools/groupdel/10_groupdel_usage/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/group
rename to tests/grouptools/groupdel/10_groupdel_usage/config/etc/group
diff --git a/tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/gshadow b/tests/grouptools/groupdel/10_groupdel_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/config/etc/gshadow
rename to tests/grouptools/groupdel/10_groupdel_usage/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/login.defs b/tests/grouptools/groupdel/10_groupdel_usage/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/login.defs
rename to tests/grouptools/groupdel/10_groupdel_usage/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/passwd b/tests/grouptools/groupdel/10_groupdel_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/passwd
rename to tests/grouptools/groupdel/10_groupdel_usage/config/etc/passwd
diff --git a/tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/shadow b/tests/grouptools/groupdel/10_groupdel_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/shadow
rename to tests/grouptools/groupdel/10_groupdel_usage/config/etc/shadow
diff --git a/tests/tests/grouptools/groupdel/10_groupdel_usage/data/usage.out b/tests/grouptools/groupdel/10_groupdel_usage/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/groupdel/10_groupdel_usage/data/usage.out
rename to tests/grouptools/groupdel/10_groupdel_usage/data/usage.out
diff --git a/tests/tests/grouptools/groupdel/10_groupdel_usage/groupdel.test b/tests/grouptools/groupdel/10_groupdel_usage/groupdel.test
similarity index 100%
rename from tests/tests/grouptools/groupdel/10_groupdel_usage/groupdel.test
rename to tests/grouptools/groupdel/10_groupdel_usage/groupdel.test
diff --git a/tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config.txt b/tests/grouptools/groupdel/11_groupdel_invalid_option/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config.txt
rename to tests/grouptools/groupdel/11_groupdel_invalid_option/config.txt
diff --git a/tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/default/useradd b/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/default/useradd
rename to tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/group b/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/group
rename to tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/group
diff --git a/tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/gshadow b/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/config/etc/gshadow
rename to tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/login.defs b/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/config/etc/login.defs
rename to tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/passwd b/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/passwd
rename to tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/passwd
diff --git a/tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/shadow b/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/shadow
rename to tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/shadow
diff --git a/tests/tests/grouptools/groupdel/11_groupdel_invalid_option/data/groupdel.err b/tests/grouptools/groupdel/11_groupdel_invalid_option/data/groupdel.err
similarity index 100%
rename from tests/tests/grouptools/groupdel/11_groupdel_invalid_option/data/groupdel.err
rename to tests/grouptools/groupdel/11_groupdel_invalid_option/data/groupdel.err
diff --git a/tests/tests/grouptools/groupdel/11_groupdel_invalid_option/groupdel.test b/tests/grouptools/groupdel/11_groupdel_invalid_option/groupdel.test
similarity index 100%
rename from tests/tests/grouptools/groupdel/11_groupdel_invalid_option/groupdel.test
rename to tests/grouptools/groupdel/11_groupdel_invalid_option/groupdel.test
diff --git a/tests/tests/grouptools/groupmems/01_groupmems_root_add_user/config.txt b/tests/grouptools/groupmems/01_groupmems_root_add_user/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/01_groupmems_root_add_user/config.txt
rename to tests/grouptools/groupmems/01_groupmems_root_add_user/config.txt
diff --git a/tests/tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/group b/tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/group
rename to tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/gshadow b/tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/gshadow
rename to tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/passwd b/tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/passwd
rename to tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/shadow b/tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/shadow
rename to tests/grouptools/groupmems/01_groupmems_root_add_user/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/01_groupmems_root_add_user/data/group b/tests/grouptools/groupmems/01_groupmems_root_add_user/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/01_groupmems_root_add_user/data/group
rename to tests/grouptools/groupmems/01_groupmems_root_add_user/data/group
diff --git a/tests/tests/grouptools/groupmems/01_groupmems_root_add_user/data/gshadow b/tests/grouptools/groupmems/01_groupmems_root_add_user/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/01_groupmems_root_add_user/data/gshadow
rename to tests/grouptools/groupmems/01_groupmems_root_add_user/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/01_groupmems_root_add_user/groupmems.test b/tests/grouptools/groupmems/01_groupmems_root_add_user/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/01_groupmems_root_add_user/groupmems.test
rename to tests/grouptools/groupmems/01_groupmems_root_add_user/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/02_groupmems_root_del_user/config.txt b/tests/grouptools/groupmems/02_groupmems_root_del_user/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/02_groupmems_root_del_user/config.txt
rename to tests/grouptools/groupmems/02_groupmems_root_del_user/config.txt
diff --git a/tests/tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/group b/tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/group
rename to tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/gshadow b/tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/gshadow
rename to tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/passwd b/tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/passwd
rename to tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/shadow b/tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/shadow
rename to tests/grouptools/groupmems/02_groupmems_root_del_user/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/02_groupmems_root_del_user/data/group b/tests/grouptools/groupmems/02_groupmems_root_del_user/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/02_groupmems_root_del_user/data/group
rename to tests/grouptools/groupmems/02_groupmems_root_del_user/data/group
diff --git a/tests/tests/grouptools/groupmems/02_groupmems_root_del_user/data/gshadow b/tests/grouptools/groupmems/02_groupmems_root_del_user/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/02_groupmems_root_del_user/data/gshadow
rename to tests/grouptools/groupmems/02_groupmems_root_del_user/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/02_groupmems_root_del_user/groupmems.test b/tests/grouptools/groupmems/02_groupmems_root_del_user/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/02_groupmems_root_del_user/groupmems.test
rename to tests/grouptools/groupmems/02_groupmems_root_del_user/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config.txt b/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config.txt
rename to tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config.txt
diff --git a/tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/group b/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/group
rename to tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/gshadow b/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/gshadow
rename to tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/passwd b/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/passwd
rename to tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/shadow b/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/shadow
rename to tests/grouptools/groupmems/03_groupmems_root_del_user_admin/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/group b/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/group
rename to tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/group
diff --git a/tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/gshadow b/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/gshadow
rename to tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/groupmems.test b/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/groupmems.test
rename to tests/grouptools/groupmems/03_groupmems_root_del_user_admin/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config.txt b/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config.txt
rename to tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config.txt
diff --git a/tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/group b/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/group
rename to tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/gshadow b/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/gshadow
rename to tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/passwd b/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/passwd
rename to tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/shadow b/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/shadow
rename to tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/group b/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/group
rename to tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/group
diff --git a/tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/gshadow b/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/gshadow
rename to tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/groupmems.test b/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/groupmems.test
rename to tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config.txt b/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config.txt
rename to tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config.txt
diff --git a/tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/group b/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/group
rename to tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/gshadow b/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/gshadow
rename to tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/passwd b/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/passwd
rename to tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/shadow b/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/shadow
rename to tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/group b/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/group
rename to tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/group
diff --git a/tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/gshadow b/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/gshadow
rename to tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/groupmems.test b/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/groupmems.test
rename to tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config.txt b/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config.txt
rename to tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config.txt
diff --git a/tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/group b/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/group
rename to tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/gshadow b/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/gshadow
rename to tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/passwd b/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/passwd
rename to tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/shadow b/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/shadow
rename to tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/group b/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/group
rename to tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/group
diff --git a/tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/gshadow b/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/gshadow
rename to tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/groupmems.test b/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/groupmems.test
rename to tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config.txt b/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config.txt
rename to tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config.txt
diff --git a/tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/group b/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/group
rename to tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/gshadow b/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/gshadow
rename to tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/passwd b/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/passwd
rename to tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/shadow b/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/shadow
rename to tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/group b/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/group
rename to tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/group
diff --git a/tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/gshadow b/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/gshadow
rename to tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/groupmems.test b/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/groupmems.test
rename to tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config.txt b/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config.txt
rename to tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config.txt
diff --git a/tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/group b/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/group
rename to tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/gshadow b/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/gshadow
rename to tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/passwd b/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/passwd
rename to tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/shadow b/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/shadow
rename to tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/group b/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/group
rename to tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/group
diff --git a/tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/gshadow b/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/gshadow
rename to tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/groupmems.test b/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/groupmems.test
rename to tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/config.txt b/tests/grouptools/groupmems/09_groupmems_root_purge_user/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/config.txt
rename to tests/grouptools/groupmems/09_groupmems_root_purge_user/config.txt
diff --git a/tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/group b/tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/group
rename to tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/gshadow b/tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/gshadow
rename to tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/passwd b/tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/passwd
rename to tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/shadow b/tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/shadow
rename to tests/grouptools/groupmems/09_groupmems_root_purge_user/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/group b/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/group
rename to tests/grouptools/groupmems/09_groupmems_root_purge_user/data/group
diff --git a/tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/gshadow b/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/gshadow
rename to tests/grouptools/groupmems/09_groupmems_root_purge_user/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/groupmems.test b/tests/grouptools/groupmems/09_groupmems_root_purge_user/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/09_groupmems_root_purge_user/groupmems.test
rename to tests/grouptools/groupmems/09_groupmems_root_purge_user/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config.txt b/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config.txt
rename to tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config.txt
diff --git a/tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/group b/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/group
rename to tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/gshadow b/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/gshadow
rename to tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/passwd b/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/passwd
rename to tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/shadow b/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/shadow
rename to tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/group b/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/group
rename to tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/group
diff --git a/tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/gshadow b/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/gshadow
rename to tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/groupmems.test b/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/groupmems.test
rename to tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config.txt b/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config.txt
rename to tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config.txt
diff --git a/tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/group b/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/group
rename to tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/gshadow b/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/gshadow
rename to tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/passwd b/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/passwd
rename to tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/shadow b/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/shadow
rename to tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/group b/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/group
rename to tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/group
diff --git a/tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/gshadow b/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/gshadow
rename to tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/groupmems.test b/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/groupmems.test
rename to tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/12_groupmems_user_add_user/config.txt b/tests/grouptools/groupmems/12_groupmems_user_add_user/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/12_groupmems_user_add_user/config.txt
rename to tests/grouptools/groupmems/12_groupmems_user_add_user/config.txt
diff --git a/tests/tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/group b/tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/group
rename to tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/gshadow b/tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/gshadow
rename to tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/passwd b/tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/passwd
rename to tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/shadow b/tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/shadow
rename to tests/grouptools/groupmems/12_groupmems_user_add_user/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/12_groupmems_user_add_user/data/group b/tests/grouptools/groupmems/12_groupmems_user_add_user/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/12_groupmems_user_add_user/data/group
rename to tests/grouptools/groupmems/12_groupmems_user_add_user/data/group
diff --git a/tests/tests/grouptools/groupmems/12_groupmems_user_add_user/data/gshadow b/tests/grouptools/groupmems/12_groupmems_user_add_user/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/12_groupmems_user_add_user/data/gshadow
rename to tests/grouptools/groupmems/12_groupmems_user_add_user/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/12_groupmems_user_add_user/groupmems.test b/tests/grouptools/groupmems/12_groupmems_user_add_user/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/12_groupmems_user_add_user/groupmems.test
rename to tests/grouptools/groupmems/12_groupmems_user_add_user/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/12_groupmems_user_add_user/run_groupmems.exp b/tests/grouptools/groupmems/12_groupmems_user_add_user/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/12_groupmems_user_add_user/run_groupmems.exp
rename to tests/grouptools/groupmems/12_groupmems_user_add_user/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/13_groupmems_user_del_user/config.txt b/tests/grouptools/groupmems/13_groupmems_user_del_user/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/13_groupmems_user_del_user/config.txt
rename to tests/grouptools/groupmems/13_groupmems_user_del_user/config.txt
diff --git a/tests/tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/group b/tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/group
rename to tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/gshadow b/tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/gshadow
rename to tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/passwd b/tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/passwd
rename to tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/shadow b/tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/shadow
rename to tests/grouptools/groupmems/13_groupmems_user_del_user/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/13_groupmems_user_del_user/data/group b/tests/grouptools/groupmems/13_groupmems_user_del_user/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/13_groupmems_user_del_user/data/group
rename to tests/grouptools/groupmems/13_groupmems_user_del_user/data/group
diff --git a/tests/tests/grouptools/groupmems/13_groupmems_user_del_user/data/gshadow b/tests/grouptools/groupmems/13_groupmems_user_del_user/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/13_groupmems_user_del_user/data/gshadow
rename to tests/grouptools/groupmems/13_groupmems_user_del_user/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/13_groupmems_user_del_user/groupmems.test b/tests/grouptools/groupmems/13_groupmems_user_del_user/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/13_groupmems_user_del_user/groupmems.test
rename to tests/grouptools/groupmems/13_groupmems_user_del_user/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/13_groupmems_user_del_user/run_groupmems.exp b/tests/grouptools/groupmems/13_groupmems_user_del_user/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/13_groupmems_user_del_user/run_groupmems.exp
rename to tests/grouptools/groupmems/13_groupmems_user_del_user/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config.txt b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config.txt
rename to tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config.txt
diff --git a/tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/group b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/group
rename to tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/gshadow b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/gshadow
rename to tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/passwd b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/passwd
rename to tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/shadow b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/shadow
rename to tests/grouptools/groupmems/14_groupmems_user_del_user_admin/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/group b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/group
rename to tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/group
diff --git a/tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/gshadow b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/gshadow
rename to tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/groupmems.test b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/groupmems.test
rename to tests/grouptools/groupmems/14_groupmems_user_del_user_admin/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/run_groupmems.exp b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/run_groupmems.exp
rename to tests/grouptools/groupmems/14_groupmems_user_del_user_admin/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config.txt b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config.txt
rename to tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config.txt
diff --git a/tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/group b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/group
rename to tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/gshadow b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/gshadow
rename to tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/passwd b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/passwd
rename to tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/shadow b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/shadow
rename to tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/group b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/group
rename to tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/group
diff --git a/tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/gshadow b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/gshadow
rename to tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/groupmems.test b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/groupmems.test
rename to tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/run_groupmems.exp b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/run_groupmems.exp
rename to tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config.txt b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config.txt
rename to tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config.txt
diff --git a/tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/group b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/group
rename to tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/gshadow b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/gshadow
rename to tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/passwd b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/passwd
rename to tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/shadow b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/shadow
rename to tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/group b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/group
rename to tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/group
diff --git a/tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/gshadow b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/gshadow
rename to tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/groupmems.test b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/groupmems.test
rename to tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/run_groupmems.exp b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/run_groupmems.exp
rename to tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config.txt b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config.txt
rename to tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config.txt
diff --git a/tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/group b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/group
rename to tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/gshadow b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/gshadow
rename to tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/passwd b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/passwd
rename to tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/shadow b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/shadow
rename to tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/group b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/group
rename to tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/group
diff --git a/tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/gshadow b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/gshadow
rename to tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/groupmems.test b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/groupmems.test
rename to tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/run_groupmems.exp b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/run_groupmems.exp
rename to tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config.txt b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config.txt
rename to tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config.txt
diff --git a/tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/group b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/group
rename to tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/gshadow b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/gshadow
rename to tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/passwd b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/passwd
rename to tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/shadow b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/shadow
rename to tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/group b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/group
rename to tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/group
diff --git a/tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/gshadow b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/gshadow
rename to tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/groupmems.test b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/groupmems.test
rename to tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/run_groupmems.exp b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/run_groupmems.exp
rename to tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config.txt b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config.txt
rename to tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config.txt
diff --git a/tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/group b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/group
rename to tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/gshadow b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/gshadow
rename to tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/passwd b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/passwd
rename to tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/shadow b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/shadow
rename to tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/group b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/group
rename to tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/group
diff --git a/tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/gshadow b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/gshadow
rename to tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/groupmems.test b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/groupmems.test
rename to tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/run_groupmems.exp b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/run_groupmems.exp
rename to tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/config.txt b/tests/grouptools/groupmems/20_groupmems_user_purge_user/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/config.txt
rename to tests/grouptools/groupmems/20_groupmems_user_purge_user/config.txt
diff --git a/tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/group b/tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/group
rename to tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/gshadow b/tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/gshadow
rename to tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/passwd b/tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/passwd
rename to tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/shadow b/tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/shadow
rename to tests/grouptools/groupmems/20_groupmems_user_purge_user/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/group b/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/group
rename to tests/grouptools/groupmems/20_groupmems_user_purge_user/data/group
diff --git a/tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/gshadow b/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/gshadow
rename to tests/grouptools/groupmems/20_groupmems_user_purge_user/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/groupmems.test b/tests/grouptools/groupmems/20_groupmems_user_purge_user/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/groupmems.test
rename to tests/grouptools/groupmems/20_groupmems_user_purge_user/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/run_groupmems.exp b/tests/grouptools/groupmems/20_groupmems_user_purge_user/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/20_groupmems_user_purge_user/run_groupmems.exp
rename to tests/grouptools/groupmems/20_groupmems_user_purge_user/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config.txt b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config.txt
rename to tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config.txt
diff --git a/tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/group b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/group
rename to tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/gshadow b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/gshadow
rename to tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/passwd b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/passwd
rename to tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/shadow b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/shadow
rename to tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/group b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/group
rename to tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/group
diff --git a/tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/gshadow b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/gshadow
rename to tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/groupmems.test b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/groupmems.test
rename to tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/run_groupmems.exp b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/run_groupmems.exp
rename to tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config.txt b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config.txt
rename to tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config.txt
diff --git a/tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/group b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/group
rename to tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/gshadow b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/gshadow
rename to tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/passwd b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/passwd
rename to tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/shadow b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/shadow
rename to tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/group b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/group
rename to tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/group
diff --git a/tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/gshadow b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/gshadow
rename to tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/groupmems.test b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/groupmems.test
rename to tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/run_groupmems.exp b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/run_groupmems.exp
rename to tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config.txt b/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config.txt
rename to tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config.txt
diff --git a/tests/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/group b/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/group
rename to tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/gshadow b/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/gshadow
rename to tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/passwd b/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/passwd
rename to tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/shadow b/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/shadow
rename to tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/groupmems.test b/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/groupmems.test
rename to tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/run_groupmems.exp b/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/run_groupmems.exp
rename to tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config.txt b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config.txt
rename to tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config.txt
diff --git a/tests/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/group b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/group
rename to tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/gshadow b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/gshadow
rename to tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/passwd b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/passwd
rename to tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/shadow b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/shadow
rename to tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/groupmems.test b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/groupmems.test
rename to tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/run_groupmems.exp b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/run_groupmems.exp
rename to tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config.txt b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config.txt
rename to tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config.txt
diff --git a/tests/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/group b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/group
rename to tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/gshadow b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/gshadow
rename to tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/passwd b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/passwd
rename to tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/shadow b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/shadow
rename to tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/groupmems.test b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/groupmems.test
rename to tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/run_groupmems.exp b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/run_groupmems.exp
rename to tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config.txt b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config.txt
rename to tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config.txt
diff --git a/tests/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/group b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/group
rename to tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/gshadow b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/gshadow
rename to tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/passwd b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/passwd
rename to tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/shadow b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/shadow
rename to tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/groupmems.test b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/groupmems.test
rename to tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/run_groupmems.exp b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/run_groupmems.exp
rename to tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config.txt b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config.txt
rename to tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config.txt
diff --git a/tests/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/group b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/group
rename to tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/gshadow b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/gshadow
rename to tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/passwd b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/passwd
rename to tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/shadow b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/shadow
rename to tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/groupmems.test b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/groupmems.test
rename to tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/run_groupmems.exp b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/run_groupmems.exp
rename to tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config.txt b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config.txt
rename to tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config.txt
diff --git a/tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/group b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/group
rename to tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/gshadow b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/gshadow
rename to tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/passwd b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/passwd
rename to tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/shadow b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/shadow
rename to tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/group b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/group
rename to tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/group
diff --git a/tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/groupmems.test b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/groupmems.test
rename to tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/run_groupmems.exp b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/run_groupmems.exp
rename to tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config.txt b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config.txt
rename to tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config.txt
diff --git a/tests/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/group b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/group
rename to tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/gshadow b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/gshadow
rename to tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/passwd b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/passwd
rename to tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/shadow b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/shadow
rename to tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/groupmems.test b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/groupmems.test
rename to tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/run_groupmems.exp b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/run_groupmems.exp
rename to tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config.txt b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config.txt
rename to tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config.txt
diff --git a/tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/group b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/group
rename to tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/gshadow b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/gshadow
rename to tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/passwd b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/passwd
rename to tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/shadow b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/shadow
rename to tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/group b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/group
rename to tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/group
diff --git a/tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/gshadow b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/gshadow
rename to tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/groupmems.test b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/groupmems.test
rename to tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/run_groupmems.exp b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/run_groupmems.exp
rename to tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config.txt b/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config.txt
rename to tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/group b/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/group
rename to tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/gshadow b/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/passwd b/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/shadow b/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/group b/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/group
rename to tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/groupmems.test b/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/groupmems.test
rename to tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/run_groupmems.exp b/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/run_groupmems.exp
rename to tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config.txt b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config.txt
rename to tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config.txt
diff --git a/tests/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/group b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/group
rename to tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/gshadow b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/gshadow
rename to tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/passwd b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/passwd
rename to tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/shadow b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/shadow
rename to tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/groupmems.test b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/groupmems.test
rename to tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/run_groupmems.exp b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/run_groupmems.exp
rename to tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config.txt b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config.txt
rename to tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config.txt
diff --git a/tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/group b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/group
rename to tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/gshadow b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/gshadow
rename to tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/passwd b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/passwd
rename to tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/shadow b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/shadow
rename to tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/group b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/group
rename to tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/group
diff --git a/tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/groupmems.test b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/groupmems.test
rename to tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/run_groupmems.exp b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/run_groupmems.exp
rename to tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config.txt b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config.txt
rename to tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config.txt
diff --git a/tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/group b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/group
rename to tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/gshadow b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/gshadow
rename to tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/passwd b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/passwd
rename to tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/shadow b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/shadow
rename to tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/group b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/group
rename to tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/group
diff --git a/tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/gshadow b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/gshadow
rename to tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/groupmems.test b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/groupmems.test
rename to tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/run_groupmems.exp b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/run_groupmems.exp
rename to tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config.txt b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config.txt
rename to tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config.txt
diff --git a/tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/group b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/group
rename to tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/gshadow b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/gshadow
rename to tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/passwd b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/passwd
rename to tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/shadow b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/shadow
rename to tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/group b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/group
rename to tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/group
diff --git a/tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/gshadow b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/gshadow
rename to tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/groupmems.test b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/groupmems.test
rename to tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/run_groupmems.exp b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/run_groupmems.exp
rename to tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config.txt b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config.txt
rename to tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/group b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/group
rename to tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/gshadow b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/passwd b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/shadow b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/group b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/group
rename to tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/groupmems.test b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/groupmems.test
rename to tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/run_groupmems.exp b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/run_groupmems.exp
rename to tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config.txt b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config.txt
rename to tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config.txt
diff --git a/tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/group b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/group
rename to tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/gshadow b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/gshadow
rename to tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/passwd b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/passwd
rename to tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/shadow b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/shadow
rename to tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/gshadow b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/gshadow
rename to tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/groupmems.test b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/groupmems.test
rename to tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/run_groupmems.exp b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/run_groupmems.exp
rename to tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config.txt b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config.txt
rename to tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config.txt
diff --git a/tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/group b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/group
rename to tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/gshadow b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/gshadow
rename to tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/passwd b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/passwd
rename to tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/shadow b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/shadow
rename to tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/group b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/group
rename to tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/group
diff --git a/tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/gshadow b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/gshadow
rename to tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/groupmems.test b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/groupmems.test
rename to tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/run_groupmems.exp b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/run_groupmems.exp
rename to tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config.txt b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config.txt
rename to tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/group b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/group
rename to tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/gshadow b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/passwd b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/passwd
rename to tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/shadow b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/shadow
rename to tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/group b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/group
rename to tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/groupmems.test b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/groupmems.test
rename to tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/run_groupmems.exp b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/run_groupmems.exp
rename to tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config.txt b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config.txt
rename to tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config.txt
diff --git a/tests/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/group b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/group
rename to tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/gshadow b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/gshadow
rename to tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/passwd b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/passwd
rename to tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/shadow b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/shadow
rename to tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/groupmems.test b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/groupmems.test
rename to tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/run_groupmems.exp b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/run_groupmems.exp
rename to tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config.txt b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config.txt
rename to tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config.txt
diff --git a/tests/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/group b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/group
rename to tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/gshadow b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/gshadow
rename to tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/passwd b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/passwd
rename to tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/shadow b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/shadow
rename to tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/groupmems.test b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/groupmems.test
rename to tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/run_groupmems.exp b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/run_groupmems.exp
rename to tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/42_groupmems_user_list_users/config.txt b/tests/grouptools/groupmems/42_groupmems_user_list_users/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/42_groupmems_user_list_users/config.txt
rename to tests/grouptools/groupmems/42_groupmems_user_list_users/config.txt
diff --git a/tests/tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/group b/tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/group
rename to tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/gshadow b/tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/gshadow
rename to tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/passwd b/tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/passwd
rename to tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/shadow b/tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/shadow
rename to tests/grouptools/groupmems/42_groupmems_user_list_users/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/42_groupmems_user_list_users/groupmems.test b/tests/grouptools/groupmems/42_groupmems_user_list_users/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/42_groupmems_user_list_users/groupmems.test
rename to tests/grouptools/groupmems/42_groupmems_user_list_users/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/42_groupmems_user_list_users/run_groupmems.exp b/tests/grouptools/groupmems/42_groupmems_user_list_users/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/42_groupmems_user_list_users/run_groupmems.exp
rename to tests/grouptools/groupmems/42_groupmems_user_list_users/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config.txt b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config.txt
rename to tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config.txt
diff --git a/tests/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/group b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/group
rename to tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/gshadow b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/gshadow
rename to tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/passwd b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/passwd
rename to tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/shadow b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/shadow
rename to tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/groupmems.test b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/groupmems.test
rename to tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/run_groupmems.exp b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/run_groupmems.exp
rename to tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config.txt b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config.txt
rename to tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config.txt
diff --git a/tests/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/group b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/group
rename to tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/gshadow b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/gshadow
rename to tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/passwd b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/passwd
rename to tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/shadow b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/shadow
rename to tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/groupmems.test b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/groupmems.test
rename to tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/run_groupmems.exp b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/run_groupmems.exp
rename to tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config.txt b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config.txt
rename to tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config.txt
diff --git a/tests/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/group b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/group
rename to tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/gshadow b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/gshadow
rename to tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/passwd b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/passwd
rename to tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/shadow b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/shadow
rename to tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/groupmems.test b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/groupmems.test
rename to tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/run_groupmems.exp b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/run_groupmems.exp
rename to tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config.txt b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config.txt
rename to tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config.txt
diff --git a/tests/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/group b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/group
rename to tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/gshadow b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/gshadow
rename to tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/passwd b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/passwd
rename to tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/shadow b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/shadow
rename to tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/groupmems.test b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/groupmems.test
rename to tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/run_groupmems.exp b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/run_groupmems.exp
rename to tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config.txt b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config.txt
rename to tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config.txt
diff --git a/tests/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/group b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/group
rename to tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/gshadow b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/gshadow
rename to tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/passwd b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/passwd
rename to tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/shadow b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/shadow
rename to tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/groupmems.test b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/groupmems.test
rename to tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/run_groupmems.exp b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/run_groupmems.exp
rename to tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config.txt b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config.txt
rename to tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config.txt
diff --git a/tests/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/group b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/group
rename to tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/gshadow b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/gshadow
rename to tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/passwd b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/passwd
rename to tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/shadow b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/shadow
rename to tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/groupmems.test b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/groupmems.test
rename to tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/run_groupmems.exp b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/run_groupmems.exp
rename to tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config.txt b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config.txt
rename to tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config.txt
diff --git a/tests/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/group b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/group
rename to tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/gshadow b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/gshadow
rename to tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/passwd b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/passwd
rename to tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/shadow b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/shadow
rename to tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/groupmems.test b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/groupmems.test
rename to tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/run_groupmems.exp b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/run_groupmems.exp
rename to tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config.txt b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config.txt
rename to tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config.txt
diff --git a/tests/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/group b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/group
rename to tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/gshadow b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/gshadow
rename to tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/passwd b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/passwd
rename to tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/shadow b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/shadow
rename to tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/groupmems.test b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/groupmems.test
rename to tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/run_groupmems.exp b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/run_groupmems.exp
rename to tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config.txt b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config.txt
rename to tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config.txt
diff --git a/tests/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/group b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/group
rename to tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/gshadow b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/gshadow
rename to tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/passwd b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/passwd
rename to tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/shadow b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/shadow
rename to tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/groupmems.test b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/groupmems.test
rename to tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/run_groupmems.exp b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/run_groupmems.exp
rename to tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config.txt b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config.txt
rename to tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config.txt
diff --git a/tests/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/group b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/group
rename to tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/gshadow b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/gshadow
rename to tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/passwd b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/passwd
rename to tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/shadow b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/shadow
rename to tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/groupmems.test b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/groupmems.test
rename to tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/run_groupmems.exp b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/run_groupmems.exp
rename to tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/53_groupmems_usage/config.txt b/tests/grouptools/groupmems/53_groupmems_usage/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/53_groupmems_usage/config.txt
rename to tests/grouptools/groupmems/53_groupmems_usage/config.txt
diff --git a/tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/group b/tests/grouptools/groupmems/53_groupmems_usage/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/group
rename to tests/grouptools/groupmems/53_groupmems_usage/config/etc/group
diff --git a/tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/gshadow b/tests/grouptools/groupmems/53_groupmems_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/gshadow
rename to tests/grouptools/groupmems/53_groupmems_usage/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/passwd b/tests/grouptools/groupmems/53_groupmems_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/passwd
rename to tests/grouptools/groupmems/53_groupmems_usage/config/etc/passwd
diff --git a/tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/shadow b/tests/grouptools/groupmems/53_groupmems_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/shadow
rename to tests/grouptools/groupmems/53_groupmems_usage/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/53_groupmems_usage/data/usage.out b/tests/grouptools/groupmems/53_groupmems_usage/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/groupmems/53_groupmems_usage/data/usage.out
rename to tests/grouptools/groupmems/53_groupmems_usage/data/usage.out
diff --git a/tests/tests/grouptools/groupmems/53_groupmems_usage/groupmems.test b/tests/grouptools/groupmems/53_groupmems_usage/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/53_groupmems_usage/groupmems.test
rename to tests/grouptools/groupmems/53_groupmems_usage/groupmems.test
diff --git a/tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config.txt b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config.txt
rename to tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config.txt
diff --git a/tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/group b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/group
rename to tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/group
diff --git a/tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/gshadow b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/config/etc/gshadow
rename to tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/login.defs b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/config/etc/login.defs
rename to tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmems/53_groupmems_usage/config/etc/passwd b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/53_groupmems_usage/config/etc/passwd
rename to tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/53_groupmems_usage/config/etc/shadow b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/53_groupmems_usage/config/etc/shadow
rename to tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/data/groupmems.err b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/data/groupmems.err
similarity index 100%
rename from tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/data/groupmems.err
rename to tests/grouptools/groupmems/54_groupmems_usage_invalid_option/data/groupmems.err
diff --git a/tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/groupmems.test b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/groupmems.test
rename to tests/grouptools/groupmems/54_groupmems_usage_invalid_option/groupmems.test
diff --git a/tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config.txt b/tests/grouptools/groupmems/55_groupmems_usage-a-d/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/17_usermod_-v_rename_subuid_failure/config.txt
rename to tests/grouptools/groupmems/55_groupmems_usage-a-d/config.txt
diff --git a/tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/group b/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/group
rename to tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/group
diff --git a/tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/gshadow b/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/gshadow
rename to tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/login.defs b/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/login.defs
rename to tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/passwd b/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/passwd
rename to tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/shadow b/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/shadow
rename to tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/data/groupmems.err b/tests/grouptools/groupmems/55_groupmems_usage-a-d/data/groupmems.err
similarity index 100%
rename from tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/data/groupmems.err
rename to tests/grouptools/groupmems/55_groupmems_usage-a-d/data/groupmems.err
diff --git a/tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/groupmems.test b/tests/grouptools/groupmems/55_groupmems_usage-a-d/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/groupmems.test
rename to tests/grouptools/groupmems/55_groupmems_usage-a-d/groupmems.test
diff --git a/tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config.txt b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config.txt
similarity index 100%
rename from tests/tests/failures/usermod/18_usermod_-w_rename_subgid_failure/config.txt
rename to tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config.txt
diff --git a/tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/group b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/group
rename to tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/group
diff --git a/tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/gshadow b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/gshadow
rename to tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/login.defs b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/login.defs
rename to tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/passwd b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/passwd
rename to tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/shadow b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/shadow
rename to tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/data/groupmems.err b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/data/groupmems.err
similarity index 100%
rename from tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/data/groupmems.err
rename to tests/grouptools/groupmems/56_groupmems_usage_extra_arg/data/groupmems.err
diff --git a/tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/groupmems.test b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/groupmems.test
rename to tests/grouptools/groupmems/56_groupmems_usage_extra_arg/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/57_groupmems_authentication/config.txt b/tests/grouptools/groupmems/57_groupmems_authentication/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/57_groupmems_authentication/config.txt
rename to tests/grouptools/groupmems/57_groupmems_authentication/config.txt
diff --git a/tests/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/group b/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/group
rename to tests/grouptools/groupmems/57_groupmems_authentication/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/gshadow b/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/gshadow
rename to tests/grouptools/groupmems/57_groupmems_authentication/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/pam.d/common-account b/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/pam.d/common-account
similarity index 100%
rename from tests/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/pam.d/common-account
rename to tests/grouptools/groupmems/57_groupmems_authentication/config/etc/pam.d/common-account
diff --git a/tests/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/pam.d/common-auth b/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/pam.d/common-auth
similarity index 100%
rename from tests/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/pam.d/common-auth
rename to tests/grouptools/groupmems/57_groupmems_authentication/config/etc/pam.d/common-auth
diff --git a/tests/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/pam.d/groupmems b/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/pam.d/groupmems
similarity index 100%
rename from tests/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/pam.d/groupmems
rename to tests/grouptools/groupmems/57_groupmems_authentication/config/etc/pam.d/groupmems
diff --git a/tests/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/passwd b/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/passwd
rename to tests/grouptools/groupmems/57_groupmems_authentication/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/shadow b/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/57_groupmems_authentication/config/etc/shadow
rename to tests/grouptools/groupmems/57_groupmems_authentication/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/57_groupmems_authentication/data/group b/tests/grouptools/groupmems/57_groupmems_authentication/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/57_groupmems_authentication/data/group
rename to tests/grouptools/groupmems/57_groupmems_authentication/data/group
diff --git a/tests/tests/grouptools/groupmems/57_groupmems_authentication/data/gshadow b/tests/grouptools/groupmems/57_groupmems_authentication/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/57_groupmems_authentication/data/gshadow
rename to tests/grouptools/groupmems/57_groupmems_authentication/data/gshadow
diff --git a/tests/tests/grouptools/groupmems/57_groupmems_authentication/groupmems.test b/tests/grouptools/groupmems/57_groupmems_authentication/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/57_groupmems_authentication/groupmems.test
rename to tests/grouptools/groupmems/57_groupmems_authentication/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/57_groupmems_authentication/run_groupmems.exp b/tests/grouptools/groupmems/57_groupmems_authentication/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/57_groupmems_authentication/run_groupmems.exp
rename to tests/grouptools/groupmems/57_groupmems_authentication/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config.txt b/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config.txt
rename to tests/grouptools/groupmems/58_groupmems_authentication_failure1/config.txt
diff --git a/tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/group b/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/group
rename to tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/gshadow b/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/gshadow
rename to tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/pam.d/common-account b/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/pam.d/common-account
similarity index 100%
rename from tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/pam.d/common-account
rename to tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/pam.d/common-account
diff --git a/tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/pam.d/common-auth b/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/pam.d/common-auth
similarity index 100%
rename from tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/pam.d/common-auth
rename to tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/pam.d/common-auth
diff --git a/tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/pam.d/groupmems b/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/pam.d/groupmems
similarity index 100%
rename from tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/pam.d/groupmems
rename to tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/pam.d/groupmems
diff --git a/tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/passwd b/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/passwd
rename to tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/shadow b/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/shadow
rename to tests/grouptools/groupmems/58_groupmems_authentication_failure1/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/groupmems.test b/tests/grouptools/groupmems/58_groupmems_authentication_failure1/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/groupmems.test
rename to tests/grouptools/groupmems/58_groupmems_authentication_failure1/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/run_groupmems.exp b/tests/grouptools/groupmems/58_groupmems_authentication_failure1/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/58_groupmems_authentication_failure1/run_groupmems.exp
rename to tests/grouptools/groupmems/58_groupmems_authentication_failure1/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config.txt b/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config.txt
rename to tests/grouptools/groupmems/59_groupmems_authentication_failure2/config.txt
diff --git a/tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/group b/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/group
rename to tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/gshadow b/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/gshadow
rename to tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/pam.d/common-account b/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/pam.d/common-account
similarity index 100%
rename from tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/pam.d/common-account
rename to tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/pam.d/common-account
diff --git a/tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/pam.d/common-auth b/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/pam.d/common-auth
similarity index 100%
rename from tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/pam.d/common-auth
rename to tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/pam.d/common-auth
diff --git a/tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/pam.d/groupmems b/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/pam.d/groupmems
similarity index 100%
rename from tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/pam.d/groupmems
rename to tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/pam.d/groupmems
diff --git a/tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/passwd b/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/passwd
rename to tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/shadow b/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/shadow
rename to tests/grouptools/groupmems/59_groupmems_authentication_failure2/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/groupmems.test b/tests/grouptools/groupmems/59_groupmems_authentication_failure2/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/groupmems.test
rename to tests/grouptools/groupmems/59_groupmems_authentication_failure2/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/run_groupmems.exp b/tests/grouptools/groupmems/59_groupmems_authentication_failure2/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/59_groupmems_authentication_failure2/run_groupmems.exp
rename to tests/grouptools/groupmems/59_groupmems_authentication_failure2/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config.txt b/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config.txt
rename to tests/grouptools/groupmems/60_groupmems_authentication_failure3/config.txt
diff --git a/tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/group b/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/group
rename to tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/gshadow b/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/gshadow
rename to tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/pam.d/groupmems b/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/pam.d/groupmems
similarity index 100%
rename from tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/pam.d/groupmems
rename to tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/pam.d/groupmems
diff --git a/tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/pam.d/other b/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/pam.d/other
similarity index 100%
rename from tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/pam.d/other
rename to tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/pam.d/other
diff --git a/tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/passwd b/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/passwd
rename to tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/shadow b/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/shadow
rename to tests/grouptools/groupmems/60_groupmems_authentication_failure3/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/groupmems.test b/tests/grouptools/groupmems/60_groupmems_authentication_failure3/groupmems.test
similarity index 100%
rename from tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/groupmems.test
rename to tests/grouptools/groupmems/60_groupmems_authentication_failure3/groupmems.test
diff --git a/tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/run_groupmems.exp b/tests/grouptools/groupmems/60_groupmems_authentication_failure3/run_groupmems.exp
similarity index 100%
rename from tests/tests/grouptools/groupmems/60_groupmems_authentication_failure3/run_groupmems.exp
rename to tests/grouptools/groupmems/60_groupmems_authentication_failure3/run_groupmems.exp
diff --git a/tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config.txt b/tests/grouptools/groupmod/01_groupmod_change_gid/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config.txt
rename to tests/grouptools/groupmod/01_groupmod_change_gid/config.txt
diff --git a/tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/default/useradd b/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/default/useradd
rename to tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/group b/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/group
rename to tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/gshadow b/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/gshadow
rename to tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/login.defs b/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/login.defs
rename to tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/passwd b/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/passwd
rename to tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/shadow b/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/shadow
rename to tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/01_groupmod_change_gid/data/group b/tests/grouptools/groupmod/01_groupmod_change_gid/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/01_groupmod_change_gid/data/group
rename to tests/grouptools/groupmod/01_groupmod_change_gid/data/group
diff --git a/tests/tests/grouptools/groupmod/01_groupmod_change_gid/groupmod.test b/tests/grouptools/groupmod/01_groupmod_change_gid/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/01_groupmod_change_gid/groupmod.test
rename to tests/grouptools/groupmod/01_groupmod_change_gid/groupmod.test
diff --git a/tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config.txt b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config.txt
rename to tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config.txt
diff --git a/tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/default/useradd b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/default/useradd
rename to tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/group b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/group
rename to tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/gshadow b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/gshadow
rename to tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/login.defs b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/login.defs
rename to tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/passwd b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/passwd
rename to tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/shadow b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/config/etc/shadow
rename to tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/group b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/group
rename to tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/group
diff --git a/tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/passwd b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/passwd
rename to tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/passwd
diff --git a/tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/groupmod.test b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/groupmod.test
rename to tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/groupmod.test
diff --git a/tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config.txt b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config.txt
rename to tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config.txt
diff --git a/tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/default/useradd b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/default/useradd
rename to tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/group b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/group
rename to tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/53_groupmems_usage/config/etc/gshadow b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/53_groupmems_usage/config/etc/gshadow
rename to tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/login.defs b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/login.defs
rename to tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/passwd b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/passwd
rename to tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/shadow b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/shadow
rename to tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/group b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/group
rename to tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/group
diff --git a/tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/groupmod.test b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/groupmod.test
rename to tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/01_groupmod_change_gid/config.txt b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/01_groupmod_change_gid/config.txt
rename to tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/default/useradd b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/group b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/group
rename to tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/gshadow b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/gshadow
rename to tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/login.defs b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/login.defs
rename to tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/passwd b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/passwd
rename to tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/shadow b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/shadow
rename to tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/group b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/group
rename to tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/groupmod.test b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/groupmod.test
rename to tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config.txt b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config.txt
rename to tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config.txt
diff --git a/tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/default/useradd b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/default/useradd
rename to tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/group b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/group
rename to tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/gshadow b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/gshadow
rename to tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/login.defs b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/login.defs
rename to tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/passwd b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/passwd
rename to tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/shadow b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/shadow
rename to tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/group b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/group
rename to tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/group
diff --git a/tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/groupmod.test b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/groupmod.test
rename to tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config.txt b/tests/grouptools/groupmod/06_groupmod_change_group_name/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config.txt
rename to tests/grouptools/groupmod/06_groupmod_change_group_name/config.txt
diff --git a/tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/default/useradd b/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/default/useradd
rename to tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/group b/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/group
rename to tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/gshadow b/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/gshadow
rename to tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/login.defs b/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/login.defs
rename to tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/passwd b/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/passwd
rename to tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/shadow b/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/shadow
rename to tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/06_groupmod_change_group_name/data/group b/tests/grouptools/groupmod/06_groupmod_change_group_name/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/06_groupmod_change_group_name/data/group
rename to tests/grouptools/groupmod/06_groupmod_change_group_name/data/group
diff --git a/tests/tests/grouptools/groupmod/06_groupmod_change_group_name/data/gshadow b/tests/grouptools/groupmod/06_groupmod_change_group_name/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/06_groupmod_change_group_name/data/gshadow
rename to tests/grouptools/groupmod/06_groupmod_change_group_name/data/gshadow
diff --git a/tests/tests/grouptools/groupmod/06_groupmod_change_group_name/groupmod.test b/tests/grouptools/groupmod/06_groupmod_change_group_name/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/06_groupmod_change_group_name/groupmod.test
rename to tests/grouptools/groupmod/06_groupmod_change_group_name/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config.txt b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config.txt
rename to tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config.txt
diff --git a/tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/default/useradd b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/default/useradd
rename to tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/group b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/group
rename to tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/gshadow b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/gshadow
rename to tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/login.defs b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/login.defs
rename to tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/passwd b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/passwd
rename to tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/shadow b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/shadow
rename to tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/group b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/group
rename to tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/group
diff --git a/tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/groupmod.test b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/groupmod.test
rename to tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config.txt b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config.txt
rename to tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/default/useradd b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/group b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/group
rename to tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/gshadow b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/gshadow
rename to tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/login.defs b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/config/etc/login.defs
rename to tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/passwd b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/passwd
rename to tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/shadow b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/shadow
rename to tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/group b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/group
rename to tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/groupmod.test b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/groupmod.test
rename to tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config.txt b/tests/grouptools/groupmod/09_groupmod_set_password/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config.txt
rename to tests/grouptools/groupmod/09_groupmod_set_password/config.txt
diff --git a/tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/default/useradd b/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/default/useradd
rename to tests/grouptools/groupmod/09_groupmod_set_password/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/group b/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/group
rename to tests/grouptools/groupmod/09_groupmod_set_password/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/gshadow b/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/groupmod/09_groupmod_set_password/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/login.defs b/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/login.defs
rename to tests/grouptools/groupmod/09_groupmod_set_password/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/passwd b/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/passwd
rename to tests/grouptools/groupmod/09_groupmod_set_password/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/shadow b/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/shadow
rename to tests/grouptools/groupmod/09_groupmod_set_password/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/09_groupmod_set_password/data/gshadow b/tests/grouptools/groupmod/09_groupmod_set_password/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/09_groupmod_set_password/data/gshadow
rename to tests/grouptools/groupmod/09_groupmod_set_password/data/gshadow
diff --git a/tests/tests/grouptools/groupmod/09_groupmod_set_password/groupmod.test b/tests/grouptools/groupmod/09_groupmod_set_password/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/09_groupmod_set_password/groupmod.test
rename to tests/grouptools/groupmod/09_groupmod_set_password/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config.txt b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config.txt
rename to tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config.txt
diff --git a/tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/default/useradd b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/default/useradd
rename to tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/group b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/group
rename to tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/gshadow b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/gshadow
rename to tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/login.defs b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/config/etc/login.defs
rename to tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/passwd b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/passwd
rename to tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/shadow b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/shadow
rename to tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/gshadow b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/gshadow
rename to tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/gshadow
diff --git a/tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/groupmod.test b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/groupmod.test
rename to tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config.txt b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config.txt
rename to tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config.txt
diff --git a/tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/default/useradd b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/default/useradd
rename to tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/group b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/group
rename to tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/gshadow b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/gshadow
rename to tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/login.defs b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/login.defs
rename to tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/passwd b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/passwd
rename to tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/shadow b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/shadow
rename to tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/group b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/group
rename to tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/group
diff --git a/tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/groupmod.test b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/groupmod.test
rename to tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/09_groupmod_set_password/config.txt b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/09_groupmod_set_password/config.txt
rename to tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config.txt
diff --git a/tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/default/useradd b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/default/useradd
rename to tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/group b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/group
rename to tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/gshadow b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/login.defs b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/login.defs
rename to tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/passwd b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/passwd
rename to tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/shadow b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/shadow
rename to tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/groupmod.err b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/groupmod.err
similarity index 100%
rename from tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/groupmod.err
rename to tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/groupmod.err
diff --git a/tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/groupmod.test b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/groupmod.test
rename to tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config.txt b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config.txt
rename to tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config.txt
diff --git a/tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/default/useradd b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/default/useradd
rename to tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/group b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/group
rename to tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/gshadow b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/gshadow
rename to tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/login.defs b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/login.defs
rename to tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/passwd b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/passwd
rename to tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/shadow b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/shadow
rename to tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/groupmod.err b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/groupmod.err
similarity index 100%
rename from tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/groupmod.err
rename to tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/groupmod.err
diff --git a/tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/groupmod.test b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/groupmod.test
rename to tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config.txt b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config.txt
rename to tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config.txt
diff --git a/tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/default/useradd b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/default/useradd
rename to tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/group b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/group
rename to tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/gshadow b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/gshadow
rename to tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/login.defs b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/login.defs
rename to tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/passwd b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/passwd
rename to tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/shadow b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/shadow
rename to tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/groupmod.err b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/groupmod.err
similarity index 100%
rename from tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/groupmod.err
rename to tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/groupmod.err
diff --git a/tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/groupmod.test b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/groupmod.test
rename to tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config.txt b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config.txt
rename to tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config.txt
diff --git a/tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/default/useradd b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/default/useradd
rename to tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/group b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/group
rename to tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/gshadow b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/gshadow
rename to tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/login.defs b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/login.defs
rename to tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/passwd b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/passwd
rename to tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/shadow b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/shadow
rename to tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/groupmod.err b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/groupmod.err
similarity index 100%
rename from tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/groupmod.err
rename to tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/groupmod.err
diff --git a/tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/groupmod.test b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/groupmod.test
rename to tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config.txt b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config.txt
rename to tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config.txt
diff --git a/tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/default/useradd b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/default/useradd
rename to tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/group b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/group
rename to tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/gshadow b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/gshadow
rename to tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/login.defs b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/config/etc/login.defs
rename to tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/passwd b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/passwd
rename to tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/shadow b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/shadow
rename to tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/groupmod.test b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/groupmod.test
rename to tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config.txt b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config.txt
rename to tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config.txt
diff --git a/tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/default/useradd b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/default/useradd
rename to tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/group b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/group
rename to tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/gshadow b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/config/etc/gshadow
rename to tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/login.defs b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/config/etc/login.defs
rename to tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/passwd b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/passwd
rename to tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/shadow b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/shadow
rename to tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/groupmod.err b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/groupmod.err
similarity index 100%
rename from tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/groupmod.err
rename to tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/groupmod.err
diff --git a/tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/groupmod.test b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/groupmod.test
rename to tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config.txt b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config.txt
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config.txt
diff --git a/tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/default/useradd b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/default/useradd
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/group b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/group
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/gshadow b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/config/etc/gshadow
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/login.defs b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/config/etc/login.defs
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/passwd b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/passwd
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/shadow b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/shadow
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/group b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/group
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/group
diff --git a/tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test
rename to tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config.txt b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config.txt
rename to tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config.txt
diff --git a/tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/default/useradd b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/default/useradd
rename to tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/group b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/group
rename to tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/gshadow b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/gshadow
rename to tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/login.defs b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/config/etc/login.defs
rename to tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/passwd b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/passwd
rename to tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/shadow b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/shadow
rename to tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/groupmod.err b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/groupmod.err
similarity index 100%
rename from tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/groupmod.err
rename to tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/groupmod.err
diff --git a/tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/groupmod.test b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/groupmod.test
rename to tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config.txt b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config.txt
rename to tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config.txt
diff --git a/tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/default/useradd b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/default/useradd
rename to tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/group b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/group
rename to tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/gshadow b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/gshadow
rename to tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/login.defs b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/config/etc/login.defs
rename to tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/passwd b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/passwd
rename to tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/shadow b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/shadow
rename to tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/data/groupmod.err b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/data/groupmod.err
similarity index 100%
rename from tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/data/groupmod.err
rename to tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/data/groupmod.err
diff --git a/tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/groupmod.test b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/groupmod.test
rename to tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config.txt b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config.txt
rename to tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config.txt
diff --git a/tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/default/useradd b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/default/useradd
rename to tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/group b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/group
rename to tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/gshadow b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/gshadow
rename to tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/login.defs b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/config/etc/login.defs
rename to tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/passwd b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/passwd
rename to tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/shadow b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/shadow
rename to tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/groupmod.err b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/groupmod.err
similarity index 100%
rename from tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/groupmod.err
rename to tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/groupmod.err
diff --git a/tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/groupmod.test b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/groupmod.test
rename to tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/group b/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/group
rename to tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/gshadow b/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/gshadow
rename to tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/login.defs b/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config/etc/login.defs
rename to tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/passwd b/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/passwd
rename to tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/shadow b/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/shadow
rename to tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/group b/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/group
rename to tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/group
diff --git a/tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/gshadow b/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/gshadow
rename to tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/gshadow
diff --git a/tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/groupmod.test b/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/groupmod.test
rename to tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/group b/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/group
rename to tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/gshadow b/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/gshadow
rename to tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/login.defs b/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config/etc/login.defs
rename to tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/passwd b/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/passwd
rename to tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/shadow b/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/shadow
rename to tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/group b/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/group
rename to tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/group
diff --git a/tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/gshadow b/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/gshadow
rename to tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/gshadow
diff --git a/tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/passwd b/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/passwd
rename to tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/passwd
diff --git a/tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/groupmod.test b/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/groupmod.test
rename to tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/group b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/group
rename to tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/gshadow b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/gshadow
rename to tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/login.defs b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config/etc/login.defs
rename to tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/passwd b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/passwd
rename to tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/shadow b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/shadow
rename to tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/groupmod.err b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/groupmod.err
similarity index 100%
rename from tests/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/groupmod.err
rename to tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/groupmod.err
diff --git a/tests/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/groupmod.test b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/groupmod.test
rename to tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/group b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/group
rename to tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/gshadow b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/gshadow
rename to tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/login.defs b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/config/etc/login.defs
rename to tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/passwd b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/passwd
rename to tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/shadow b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/shadow
rename to tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/groupmod.err b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/groupmod.err
similarity index 100%
rename from tests/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/groupmod.err
rename to tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/groupmod.err
diff --git a/tests/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/groupmod.test b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/groupmod.test
rename to tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/group b/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/group
rename to tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/gshadow b/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/gshadow
rename to tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/login.defs b/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/config/etc/login.defs
rename to tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/passwd b/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/passwd
rename to tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/shadow b/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/shadow
rename to tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/group b/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/group
rename to tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/group
diff --git a/tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/gshadow b/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/gshadow
rename to tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/gshadow
diff --git a/tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/groupmod.test b/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/groupmod.test
rename to tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config.txt b/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/config.txt
rename to tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config.txt
diff --git a/tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/default/useradd b/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/default/useradd
rename to tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/group b/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/group
rename to tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/gshadow b/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/gshadow
rename to tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/login.defs b/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/config/etc/login.defs
rename to tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/passwd b/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/passwd
rename to tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/shadow b/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/shadow
rename to tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/groupmod.err b/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/groupmod.err
similarity index 100%
rename from tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/groupmod.err
rename to tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/data/groupmod.err
diff --git a/tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/groupmod.test b/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/groupmod.test
rename to tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/28_groupmod_usage/config.txt b/tests/grouptools/groupmod/28_groupmod_usage/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/28_groupmod_usage/config.txt
rename to tests/grouptools/groupmod/28_groupmod_usage/config.txt
diff --git a/tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/default/useradd b/tests/grouptools/groupmod/28_groupmod_usage/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/default/useradd
rename to tests/grouptools/groupmod/28_groupmod_usage/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmems/53_groupmems_usage/config/etc/group b/tests/grouptools/groupmod/28_groupmod_usage/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmems/53_groupmems_usage/config/etc/group
rename to tests/grouptools/groupmod/28_groupmod_usage/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/gshadow b/tests/grouptools/groupmod/28_groupmod_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/config/etc/gshadow
rename to tests/grouptools/groupmod/28_groupmod_usage/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/passwd b/tests/grouptools/groupmod/28_groupmod_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/passwd
rename to tests/grouptools/groupmod/28_groupmod_usage/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/shadow b/tests/grouptools/groupmod/28_groupmod_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/shadow
rename to tests/grouptools/groupmod/28_groupmod_usage/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/28_groupmod_usage/data/usage.out b/tests/grouptools/groupmod/28_groupmod_usage/data/usage.out
similarity index 100%
rename from tests/tests/grouptools/groupmod/28_groupmod_usage/data/usage.out
rename to tests/grouptools/groupmod/28_groupmod_usage/data/usage.out
diff --git a/tests/tests/grouptools/groupmod/28_groupmod_usage/groupmod.test b/tests/grouptools/groupmod/28_groupmod_usage/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/28_groupmod_usage/groupmod.test
rename to tests/grouptools/groupmod/28_groupmod_usage/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config.txt b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/config.txt
rename to tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config.txt
diff --git a/tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/default/useradd b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/default/useradd
rename to tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/group b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/group
rename to tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/gshadow b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/gshadow
rename to tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/login.defs b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/config/etc/login.defs
rename to tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/passwd b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/passwd
rename to tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/shadow b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/shadow
rename to tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/group b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/group
rename to tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/group
diff --git a/tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/gshadow b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/gshadow
rename to tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/gshadow
diff --git a/tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/groupmod.test b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/groupmod.test
rename to tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config.txt b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/config.txt
rename to tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config.txt
diff --git a/tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/default/useradd b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/default/useradd
rename to tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/group b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/group
rename to tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/gshadow b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/gshadow
rename to tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/login.defs b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/config/etc/login.defs
rename to tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/passwd b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/passwd
rename to tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/shadow b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/shadow
rename to tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/groupmod.test b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/groupmod.test
rename to tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config.txt b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config.txt
rename to tests/grouptools/groupmod/31_groupmod_-g_same_gid/config.txt
diff --git a/tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/default/useradd b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/default/useradd
rename to tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/group b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/group
rename to tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/gshadow b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/gshadow
rename to tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/login.defs b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/config/etc/login.defs
rename to tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/passwd b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/passwd
rename to tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/shadow b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/shadow
rename to tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/groupmod.test b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/groupmod.test
rename to tests/grouptools/groupmod/31_groupmod_-g_same_gid/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config.txt b/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config.txt
rename to tests/grouptools/groupmod/32_groupmod_-o_without_-g/config.txt
diff --git a/tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/default/useradd b/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/default/useradd
rename to tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/group b/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/group
rename to tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/gshadow b/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/gshadow
rename to tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/passwd b/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/passwd
rename to tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/shadow b/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/shadow
rename to tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/data/groupmod.err b/tests/grouptools/groupmod/32_groupmod_-o_without_-g/data/groupmod.err
similarity index 100%
rename from tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/data/groupmod.err
rename to tests/grouptools/groupmod/32_groupmod_-o_without_-g/data/groupmod.err
diff --git a/tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/groupmod.test b/tests/grouptools/groupmod/32_groupmod_-o_without_-g/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/groupmod.test
rename to tests/grouptools/groupmod/32_groupmod_-o_without_-g/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config.txt b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config.txt
rename to tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config.txt
diff --git a/tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/default/useradd b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/default/useradd
rename to tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/group b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/group
rename to tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/gshadow b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/gshadow
rename to tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/login.defs b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/config/etc/login.defs
rename to tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/passwd b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/passwd
rename to tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/shadow b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/shadow
rename to tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/group b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/group
rename to tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/group
diff --git a/tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/groupmod.test b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/groupmod.test
rename to tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config.txt b/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config.txt
rename to tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config.txt
diff --git a/tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/default/useradd b/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/default/useradd
rename to tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/group b/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/group
rename to tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/gshadow b/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/gshadow
rename to tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/login.defs b/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/login.defs
rename to tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/passwd b/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/passwd
rename to tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/shadow b/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/shadow
rename to tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/data/group b/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/data/group
rename to tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/data/group
diff --git a/tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/data/gshadow b/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/data/gshadow
rename to tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/data/gshadow
diff --git a/tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/groupmod.test b/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/groupmod.test
rename to tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config.txt b/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config.txt
rename to tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config.txt
diff --git a/tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/default/useradd b/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/default/useradd
rename to tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/group b/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/group
rename to tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/gshadow b/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/gshadow
rename to tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/login.defs b/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/login.defs
rename to tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/passwd b/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/passwd
rename to tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/shadow b/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/shadow
rename to tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/data/group b/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/data/group
rename to tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/data/group
diff --git a/tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/groupmod.test b/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/groupmod.test
rename to tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config.txt b/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config.txt
rename to tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config.txt
diff --git a/tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/default/useradd b/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/default/useradd
rename to tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/default/useradd
diff --git a/tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/group b/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/config/etc/group
rename to tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/gshadow b/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/gshadow
rename to tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/login.defs b/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/login.defs
rename to tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/passwd b/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/passwd
rename to tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/shadow b/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/shadow
rename to tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/data/gshadow b/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/data/gshadow
rename to tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/data/gshadow
diff --git a/tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/groupmod.test b/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/groupmod.test
rename to tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/groupmod.test
diff --git a/tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config.txt b/tests/grouptools/groupmod/37_groupmod_invalid_option/config.txt
similarity index 100%
rename from tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config.txt
rename to tests/grouptools/groupmod/37_groupmod_invalid_option/config.txt
diff --git a/tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/group b/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/group
rename to tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/gshadow b/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/gshadow
rename to tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/login.defs b/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/login.defs
rename to tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/login.defs
diff --git a/tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/passwd b/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/passwd
rename to tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/shadow b/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/shadow
rename to tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/data/groupmod.err b/tests/grouptools/groupmod/37_groupmod_invalid_option/data/groupmod.err
similarity index 100%
rename from tests/tests/grouptools/groupmod/37_groupmod_invalid_option/data/groupmod.err
rename to tests/grouptools/groupmod/37_groupmod_invalid_option/data/groupmod.err
diff --git a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/groupmod.test b/tests/grouptools/groupmod/37_groupmod_invalid_option/groupmod.test
similarity index 100%
rename from tests/tests/grouptools/groupmod/37_groupmod_invalid_option/groupmod.test
rename to tests/grouptools/groupmod/37_groupmod_invalid_option/groupmod.test
diff --git a/tests/tests/cptools/05_cppw_2_files/config.txt b/tests/libsubid/01_list_ranges/config.txt
similarity index 100%
rename from tests/tests/cptools/05_cppw_2_files/config.txt
rename to tests/libsubid/01_list_ranges/config.txt
diff --git a/tests/tests/libsubid/01_list_ranges/config/etc/subgid b/tests/libsubid/01_list_ranges/config/etc/subgid
similarity index 100%
rename from tests/tests/libsubid/01_list_ranges/config/etc/subgid
rename to tests/libsubid/01_list_ranges/config/etc/subgid
diff --git a/tests/tests/libsubid/01_list_ranges/config/etc/subuid b/tests/libsubid/01_list_ranges/config/etc/subuid
similarity index 100%
rename from tests/tests/libsubid/01_list_ranges/config/etc/subuid
rename to tests/libsubid/01_list_ranges/config/etc/subuid
diff --git a/tests/tests/libsubid/01_list_ranges/list_ranges.test b/tests/libsubid/01_list_ranges/list_ranges.test
similarity index 100%
rename from tests/tests/libsubid/01_list_ranges/list_ranges.test
rename to tests/libsubid/01_list_ranges/list_ranges.test
diff --git a/tests/tests/cptools/06_cppw_no_file/config.txt b/tests/libsubid/02_get_subid_owners/config.txt
similarity index 100%
rename from tests/tests/cptools/06_cppw_no_file/config.txt
rename to tests/libsubid/02_get_subid_owners/config.txt
diff --git a/tests/tests/libsubid/02_get_subid_owners/config/etc/passwd b/tests/libsubid/02_get_subid_owners/config/etc/passwd
similarity index 100%
rename from tests/tests/libsubid/02_get_subid_owners/config/etc/passwd
rename to tests/libsubid/02_get_subid_owners/config/etc/passwd
diff --git a/tests/tests/libsubid/02_get_subid_owners/config/etc/subgid b/tests/libsubid/02_get_subid_owners/config/etc/subgid
similarity index 100%
rename from tests/tests/libsubid/02_get_subid_owners/config/etc/subgid
rename to tests/libsubid/02_get_subid_owners/config/etc/subgid
diff --git a/tests/tests/libsubid/02_get_subid_owners/config/etc/subuid b/tests/libsubid/02_get_subid_owners/config/etc/subuid
similarity index 100%
rename from tests/tests/libsubid/02_get_subid_owners/config/etc/subuid
rename to tests/libsubid/02_get_subid_owners/config/etc/subuid
diff --git a/tests/tests/libsubid/02_get_subid_owners/get_subid_owners.test b/tests/libsubid/02_get_subid_owners/get_subid_owners.test
similarity index 100%
rename from tests/tests/libsubid/02_get_subid_owners/get_subid_owners.test
rename to tests/libsubid/02_get_subid_owners/get_subid_owners.test
diff --git a/tests/tests/libsubid/03_add_remove/add_remove_subids.test b/tests/libsubid/03_add_remove/add_remove_subids.test
similarity index 100%
rename from tests/tests/libsubid/03_add_remove/add_remove_subids.test
rename to tests/libsubid/03_add_remove/add_remove_subids.test
diff --git a/tests/tests/cptools/07_cppw_locked_passwd/config.txt b/tests/libsubid/03_add_remove/config.txt
similarity index 100%
rename from tests/tests/cptools/07_cppw_locked_passwd/config.txt
rename to tests/libsubid/03_add_remove/config.txt
diff --git a/tests/tests/libsubid/03_add_remove/config/etc/passwd b/tests/libsubid/03_add_remove/config/etc/passwd
similarity index 100%
rename from tests/tests/libsubid/03_add_remove/config/etc/passwd
rename to tests/libsubid/03_add_remove/config/etc/passwd
diff --git a/tests/tests/libsubid/03_add_remove/config/etc/subgid b/tests/libsubid/03_add_remove/config/etc/subgid
similarity index 100%
rename from tests/tests/libsubid/03_add_remove/config/etc/subgid
rename to tests/libsubid/03_add_remove/config/etc/subgid
diff --git a/tests/tests/libsubid/03_add_remove/config/etc/subuid b/tests/libsubid/03_add_remove/config/etc/subuid
similarity index 100%
rename from tests/tests/libsubid/03_add_remove/config/etc/subuid
rename to tests/libsubid/03_add_remove/config/etc/subuid
diff --git a/tests/libsubid/04_nss/Makefile b/tests/libsubid/04_nss/Makefile
new file mode 100644
index 00000000..3fbf989e
--- /dev/null
+++ b/tests/libsubid/04_nss/Makefile
@@ -0,0 +1,15 @@
+all: test_nss libsubid_zzz.so
+
+BUILD_BASE_DIR ?= $(shell git rev-parse --show-toplevel)
+basedir := $(BUILD_BASE_DIR)
+
+test_nss: test_nss.c $(basedir)/lib/nss.c
+	gcc -c -I$(basedir)/lib/ -I$(basedir) -o test_nss.o test_nss.c
+	gcc -o test_nss test_nss.o $(basedir)/lib/.libs/libshadow.a -ldl
+
+libsubid_zzz.so: libsubid_zzz.c
+	gcc -c -I$(basedir)/lib/ -I$(basedir) -I$(basedir)/libsubid libsubid_zzz.c
+	gcc -L$(basedir)/libsubid -shared -o libsubid_zzz.so libsubid_zzz.o $(basedir)/lib/.libs/libshadow.a -ldl
+
+clean:
+	rm -f *.o *.so test_nss
diff --git a/tests/tests/libsubid/04_nss/empty b/tests/libsubid/04_nss/empty
similarity index 100%
rename from tests/tests/libsubid/04_nss/empty
rename to tests/libsubid/04_nss/empty
diff --git a/tests/tests/libsubid/04_nss/libsubid_zzz.c b/tests/libsubid/04_nss/libsubid_zzz.c
similarity index 99%
rename from tests/tests/libsubid/04_nss/libsubid_zzz.c
rename to tests/libsubid/04_nss/libsubid_zzz.c
index 5ba3df95..d8141ba3 100644
--- a/tests/tests/libsubid/04_nss/libsubid_zzz.c
+++ b/tests/libsubid/04_nss/libsubid_zzz.c
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <subid.h>
 #include <string.h>
-#include "alloc.h"
+#include "alloc/malloc.h"
 
 enum subid_status shadow_subid_has_any_range(const char *owner, enum subid_type t, bool *result)
 {
diff --git a/tests/tests/libsubid/04_nss/nsswitch1.conf b/tests/libsubid/04_nss/nsswitch1.conf
similarity index 100%
rename from tests/tests/libsubid/04_nss/nsswitch1.conf
rename to tests/libsubid/04_nss/nsswitch1.conf
diff --git a/tests/tests/libsubid/04_nss/nsswitch2.conf b/tests/libsubid/04_nss/nsswitch2.conf
similarity index 100%
rename from tests/tests/libsubid/04_nss/nsswitch2.conf
rename to tests/libsubid/04_nss/nsswitch2.conf
diff --git a/tests/tests/libsubid/04_nss/nsswitch3.conf b/tests/libsubid/04_nss/nsswitch3.conf
similarity index 100%
rename from tests/tests/libsubid/04_nss/nsswitch3.conf
rename to tests/libsubid/04_nss/nsswitch3.conf
diff --git a/tests/tests/libsubid/04_nss/subidnss.test b/tests/libsubid/04_nss/subidnss.test
similarity index 74%
rename from tests/tests/libsubid/04_nss/subidnss.test
rename to tests/libsubid/04_nss/subidnss.test
index 3d40dc8c..400171fa 100755
--- a/tests/tests/libsubid/04_nss/subidnss.test
+++ b/tests/libsubid/04_nss/subidnss.test
@@ -9,7 +9,7 @@ cd $(dirname $0)
 
 make
 
-export LD_LIBRARY_PATH=.:../../../lib/.libs:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=.:${build_path}/lib/.libs:$LD_LIBRARY_PATH
 
 ./test_nss 1
 ./test_nss 2
diff --git a/tests/tests/libsubid/04_nss/test_nss.c b/tests/libsubid/04_nss/test_nss.c
similarity index 100%
rename from tests/tests/libsubid/04_nss/test_nss.c
rename to tests/libsubid/04_nss/test_nss.c
diff --git a/tests/tests/libsubid/04_nss/test_range b/tests/libsubid/04_nss/test_range
similarity index 68%
rename from tests/tests/libsubid/04_nss/test_range
rename to tests/libsubid/04_nss/test_range
index ee25080f..45a791c7 100755
--- a/tests/tests/libsubid/04_nss/test_range
+++ b/tests/libsubid/04_nss/test_range
@@ -11,23 +11,23 @@ cleanup1() {
     umount /etc/nsswitch.conf
 }
 trap cleanup1 EXIT HUP INT TERM
-../../../src/check_subid_range user1 u 100000 65535
+${build_path}/src/check_subid_range user1 u 100000 65535
 if [ $? -ne 0 ]; then
     exit 1
 fi
-../../../src/check_subid_range user2 u 100000 65535
+${build_path}/src/check_subid_range user2 u 100000 65535
 if [ $? -eq 0 ]; then
     exit 1
 fi
-../../../src/check_subid_range unknown u 100000 65535
+${build_path}/src/check_subid_range unknown u 100000 65535
 if [ $? -eq 0 ]; then
     exit 1
 fi
-../../../src/check_subid_range error u 100000 65535
+${build_path}/src/check_subid_range error u 100000 65535
 if [ $? -eq 0 ]; then
     exit 1
 fi
-../../../src/check_subid_range user1 u 1000 65535
+${build_path}/src/check_subid_range user1 u 1000 65535
 if [ $? -eq 0 ]; then
     exit 1
 fi
@@ -43,7 +43,7 @@ cleanup2() {
     umount /etc/nsswitch.conf
 }
 trap cleanup2 EXIT HUP INT TERM
-../../../src/check_subid_range user1 u 100000 65535
+${build_path}/src/check_subid_range user1 u 100000 65535
 if [ $? -eq 0 ]; then
     exit 1
 fi
diff --git a/tests/tests/log/faillog/01_faillog_no_faillog/config.txt b/tests/log/faillog/01_faillog_no_faillog/config.txt
similarity index 100%
rename from tests/tests/log/faillog/01_faillog_no_faillog/config.txt
rename to tests/log/faillog/01_faillog_no_faillog/config.txt
diff --git a/tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/group b/tests/log/faillog/01_faillog_no_faillog/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/group
rename to tests/log/faillog/01_faillog_no_faillog/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/gshadow b/tests/log/faillog/01_faillog_no_faillog/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/gshadow
rename to tests/log/faillog/01_faillog_no_faillog/config/etc/gshadow
diff --git a/tests/tests/log/faillog/01_faillog_no_faillog/config/etc/passwd b/tests/log/faillog/01_faillog_no_faillog/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/01_faillog_no_faillog/config/etc/passwd
rename to tests/log/faillog/01_faillog_no_faillog/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/shadow b/tests/log/faillog/01_faillog_no_faillog/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/config/etc/shadow
rename to tests/log/faillog/01_faillog_no_faillog/config/etc/shadow
diff --git a/tests/tests/log/faillog/01_faillog_no_faillog/data/faillog.err b/tests/log/faillog/01_faillog_no_faillog/data/faillog.err
similarity index 100%
rename from tests/tests/log/faillog/01_faillog_no_faillog/data/faillog.err
rename to tests/log/faillog/01_faillog_no_faillog/data/faillog.err
diff --git a/tests/tests/log/faillog/01_faillog_no_faillog/faillog.test b/tests/log/faillog/01_faillog_no_faillog/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/01_faillog_no_faillog/faillog.test
rename to tests/log/faillog/01_faillog_no_faillog/faillog.test
diff --git a/tests/tests/log/faillog/02_faillog_usage/config.txt b/tests/log/faillog/02_faillog_usage/config.txt
similarity index 100%
rename from tests/tests/log/faillog/02_faillog_usage/config.txt
rename to tests/log/faillog/02_faillog_usage/config.txt
diff --git a/tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/group b/tests/log/faillog/02_faillog_usage/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/group
rename to tests/log/faillog/02_faillog_usage/config/etc/group
diff --git a/tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/gshadow b/tests/log/faillog/02_faillog_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/gshadow
rename to tests/log/faillog/02_faillog_usage/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/passwd b/tests/log/faillog/02_faillog_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/passwd
rename to tests/log/faillog/02_faillog_usage/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/shadow b/tests/log/faillog/02_faillog_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/shadow
rename to tests/log/faillog/02_faillog_usage/config/etc/shadow
diff --git a/tests/tests/log/faillog/02_faillog_usage/data/usage.out b/tests/log/faillog/02_faillog_usage/data/usage.out
similarity index 100%
rename from tests/tests/log/faillog/02_faillog_usage/data/usage.out
rename to tests/log/faillog/02_faillog_usage/data/usage.out
diff --git a/tests/tests/log/faillog/02_faillog_usage/faillog.test b/tests/log/faillog/02_faillog_usage/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/02_faillog_usage/faillog.test
rename to tests/log/faillog/02_faillog_usage/faillog.test
diff --git a/tests/tests/log/faillog/03_faillog_format/config.txt b/tests/log/faillog/03_faillog_format/config.txt
similarity index 100%
rename from tests/tests/log/faillog/03_faillog_format/config.txt
rename to tests/log/faillog/03_faillog_format/config.txt
diff --git a/tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/group b/tests/log/faillog/03_faillog_format/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/group
rename to tests/log/faillog/03_faillog_format/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/gshadow b/tests/log/faillog/03_faillog_format/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/config/etc/gshadow
rename to tests/log/faillog/03_faillog_format/config/etc/gshadow
diff --git a/tests/tests/log/faillog/03_faillog_format/config/etc/pam.d/login b/tests/log/faillog/03_faillog_format/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/03_faillog_format/config/etc/pam.d/login
rename to tests/log/faillog/03_faillog_format/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/03_faillog_format/config/etc/passwd b/tests/log/faillog/03_faillog_format/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/03_faillog_format/config/etc/passwd
rename to tests/log/faillog/03_faillog_format/config/etc/passwd
diff --git a/tests/tests/log/faillog/03_faillog_format/config/etc/shadow b/tests/log/faillog/03_faillog_format/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/03_faillog_format/config/etc/shadow
rename to tests/log/faillog/03_faillog_format/config/etc/shadow
diff --git a/tests/tests/log/faillog/03_faillog_format/data/faillog.out b/tests/log/faillog/03_faillog_format/data/faillog.out
similarity index 100%
rename from tests/tests/log/faillog/03_faillog_format/data/faillog.out
rename to tests/log/faillog/03_faillog_format/data/faillog.out
diff --git a/tests/tests/log/faillog/03_faillog_format/data/lastlog.out b/tests/log/faillog/03_faillog_format/data/lastlog.out
similarity index 100%
rename from tests/tests/log/faillog/03_faillog_format/data/lastlog.out
rename to tests/log/faillog/03_faillog_format/data/lastlog.out
diff --git a/tests/tests/log/faillog/03_faillog_format/faillog.test b/tests/log/faillog/03_faillog_format/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/03_faillog_format/faillog.test
rename to tests/log/faillog/03_faillog_format/faillog.test
diff --git a/tests/tests/log/faillog/03_faillog_format/login.exp b/tests/log/faillog/03_faillog_format/login.exp
similarity index 100%
rename from tests/tests/log/faillog/03_faillog_format/login.exp
rename to tests/log/faillog/03_faillog_format/login.exp
diff --git a/tests/tests/log/faillog/04_faillog_multiple/config.txt b/tests/log/faillog/04_faillog_multiple/config.txt
similarity index 100%
rename from tests/tests/log/faillog/04_faillog_multiple/config.txt
rename to tests/log/faillog/04_faillog_multiple/config.txt
diff --git a/tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/group b/tests/log/faillog/04_faillog_multiple/config/etc/group
similarity index 100%
rename from tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/group
rename to tests/log/faillog/04_faillog_multiple/config/etc/group
diff --git a/tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/gshadow b/tests/log/faillog/04_faillog_multiple/config/etc/gshadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/gshadow
rename to tests/log/faillog/04_faillog_multiple/config/etc/gshadow
diff --git a/tests/tests/log/faillog/04_faillog_multiple/config/etc/pam.d/login b/tests/log/faillog/04_faillog_multiple/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/04_faillog_multiple/config/etc/pam.d/login
rename to tests/log/faillog/04_faillog_multiple/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/04_faillog_multiple/config/etc/passwd b/tests/log/faillog/04_faillog_multiple/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/04_faillog_multiple/config/etc/passwd
rename to tests/log/faillog/04_faillog_multiple/config/etc/passwd
diff --git a/tests/tests/log/faillog/04_faillog_multiple/config/etc/shadow b/tests/log/faillog/04_faillog_multiple/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/04_faillog_multiple/config/etc/shadow
rename to tests/log/faillog/04_faillog_multiple/config/etc/shadow
diff --git a/tests/tests/log/faillog/04_faillog_multiple/data/faillog.list b/tests/log/faillog/04_faillog_multiple/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/04_faillog_multiple/data/faillog.list
rename to tests/log/faillog/04_faillog_multiple/data/faillog.list
diff --git a/tests/tests/log/faillog/04_faillog_multiple/faillog.test b/tests/log/faillog/04_faillog_multiple/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/04_faillog_multiple/faillog.test
rename to tests/log/faillog/04_faillog_multiple/faillog.test
diff --git a/tests/tests/log/faillog/04_faillog_multiple/login.exp b/tests/log/faillog/04_faillog_multiple/login.exp
similarity index 100%
rename from tests/tests/log/faillog/04_faillog_multiple/login.exp
rename to tests/log/faillog/04_faillog_multiple/login.exp
diff --git a/tests/tests/log/faillog/05_faillog-u_ID/config.txt b/tests/log/faillog/05_faillog-u_ID/config.txt
similarity index 100%
rename from tests/tests/log/faillog/05_faillog-u_ID/config.txt
rename to tests/log/faillog/05_faillog-u_ID/config.txt
diff --git a/tests/tests/log/faillog/01_faillog_no_faillog/config/etc/group b/tests/log/faillog/05_faillog-u_ID/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/01_faillog_no_faillog/config/etc/group
rename to tests/log/faillog/05_faillog-u_ID/config/etc/group
diff --git a/tests/tests/log/faillog/01_faillog_no_faillog/config/etc/gshadow b/tests/log/faillog/05_faillog-u_ID/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/01_faillog_no_faillog/config/etc/gshadow
rename to tests/log/faillog/05_faillog-u_ID/config/etc/gshadow
diff --git a/tests/tests/log/faillog/05_faillog-u_ID/config/etc/passwd b/tests/log/faillog/05_faillog-u_ID/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/05_faillog-u_ID/config/etc/passwd
rename to tests/log/faillog/05_faillog-u_ID/config/etc/passwd
diff --git a/tests/tests/log/faillog/05_faillog-u_ID/config/etc/shadow b/tests/log/faillog/05_faillog-u_ID/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/05_faillog-u_ID/config/etc/shadow
rename to tests/log/faillog/05_faillog-u_ID/config/etc/shadow
diff --git a/tests/tests/log/faillog/05_faillog-u_ID/data/faillog.list b/tests/log/faillog/05_faillog-u_ID/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/05_faillog-u_ID/data/faillog.list
rename to tests/log/faillog/05_faillog-u_ID/data/faillog.list
diff --git a/tests/tests/log/faillog/05_faillog-u_ID/faillog.test b/tests/log/faillog/05_faillog-u_ID/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/05_faillog-u_ID/faillog.test
rename to tests/log/faillog/05_faillog-u_ID/faillog.test
diff --git a/tests/tests/log/faillog/06_faillog-u_name/config.txt b/tests/log/faillog/06_faillog-u_name/config.txt
similarity index 100%
rename from tests/tests/log/faillog/06_faillog-u_name/config.txt
rename to tests/log/faillog/06_faillog-u_name/config.txt
diff --git a/tests/tests/log/faillog/03_faillog_format/config/etc/group b/tests/log/faillog/06_faillog-u_name/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/03_faillog_format/config/etc/group
rename to tests/log/faillog/06_faillog-u_name/config/etc/group
diff --git a/tests/tests/log/faillog/03_faillog_format/config/etc/gshadow b/tests/log/faillog/06_faillog-u_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/03_faillog_format/config/etc/gshadow
rename to tests/log/faillog/06_faillog-u_name/config/etc/gshadow
diff --git a/tests/tests/log/faillog/06_faillog-u_name/config/etc/passwd b/tests/log/faillog/06_faillog-u_name/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/06_faillog-u_name/config/etc/passwd
rename to tests/log/faillog/06_faillog-u_name/config/etc/passwd
diff --git a/tests/tests/log/faillog/06_faillog-u_name/config/etc/shadow b/tests/log/faillog/06_faillog-u_name/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/06_faillog-u_name/config/etc/shadow
rename to tests/log/faillog/06_faillog-u_name/config/etc/shadow
diff --git a/tests/tests/log/faillog/06_faillog-u_name/data/faillog.list b/tests/log/faillog/06_faillog-u_name/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/06_faillog-u_name/data/faillog.list
rename to tests/log/faillog/06_faillog-u_name/data/faillog.list
diff --git a/tests/tests/log/faillog/06_faillog-u_name/faillog.test b/tests/log/faillog/06_faillog-u_name/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/06_faillog-u_name/faillog.test
rename to tests/log/faillog/06_faillog-u_name/faillog.test
diff --git a/tests/tests/log/faillog/07_faillog-u_ID_invalid/config.txt b/tests/log/faillog/07_faillog-u_ID_invalid/config.txt
similarity index 100%
rename from tests/tests/log/faillog/07_faillog-u_ID_invalid/config.txt
rename to tests/log/faillog/07_faillog-u_ID_invalid/config.txt
diff --git a/tests/tests/log/faillog/04_faillog_multiple/config/etc/group b/tests/log/faillog/07_faillog-u_ID_invalid/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/04_faillog_multiple/config/etc/group
rename to tests/log/faillog/07_faillog-u_ID_invalid/config/etc/group
diff --git a/tests/tests/log/faillog/04_faillog_multiple/config/etc/gshadow b/tests/log/faillog/07_faillog-u_ID_invalid/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/04_faillog_multiple/config/etc/gshadow
rename to tests/log/faillog/07_faillog-u_ID_invalid/config/etc/gshadow
diff --git a/tests/tests/log/faillog/07_faillog-u_ID_invalid/config/etc/passwd b/tests/log/faillog/07_faillog-u_ID_invalid/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/07_faillog-u_ID_invalid/config/etc/passwd
rename to tests/log/faillog/07_faillog-u_ID_invalid/config/etc/passwd
diff --git a/tests/tests/log/faillog/07_faillog-u_ID_invalid/config/etc/shadow b/tests/log/faillog/07_faillog-u_ID_invalid/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/07_faillog-u_ID_invalid/config/etc/shadow
rename to tests/log/faillog/07_faillog-u_ID_invalid/config/etc/shadow
diff --git a/tests/tests/log/faillog/07_faillog-u_ID_invalid/data/faillog.list b/tests/log/faillog/07_faillog-u_ID_invalid/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/07_faillog-u_ID_invalid/data/faillog.list
rename to tests/log/faillog/07_faillog-u_ID_invalid/data/faillog.list
diff --git a/tests/tests/log/faillog/07_faillog-u_ID_invalid/faillog.test b/tests/log/faillog/07_faillog-u_ID_invalid/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/07_faillog-u_ID_invalid/faillog.test
rename to tests/log/faillog/07_faillog-u_ID_invalid/faillog.test
diff --git a/tests/tests/log/faillog/08_faillog-u_name_invalid/config.txt b/tests/log/faillog/08_faillog-u_name_invalid/config.txt
similarity index 100%
rename from tests/tests/log/faillog/08_faillog-u_name_invalid/config.txt
rename to tests/log/faillog/08_faillog-u_name_invalid/config.txt
diff --git a/tests/tests/log/faillog/05_faillog-u_ID/config/etc/group b/tests/log/faillog/08_faillog-u_name_invalid/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/05_faillog-u_ID/config/etc/group
rename to tests/log/faillog/08_faillog-u_name_invalid/config/etc/group
diff --git a/tests/tests/log/faillog/05_faillog-u_ID/config/etc/gshadow b/tests/log/faillog/08_faillog-u_name_invalid/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/05_faillog-u_ID/config/etc/gshadow
rename to tests/log/faillog/08_faillog-u_name_invalid/config/etc/gshadow
diff --git a/tests/tests/log/faillog/08_faillog-u_name_invalid/config/etc/passwd b/tests/log/faillog/08_faillog-u_name_invalid/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/08_faillog-u_name_invalid/config/etc/passwd
rename to tests/log/faillog/08_faillog-u_name_invalid/config/etc/passwd
diff --git a/tests/tests/log/faillog/08_faillog-u_name_invalid/config/etc/shadow b/tests/log/faillog/08_faillog-u_name_invalid/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/08_faillog-u_name_invalid/config/etc/shadow
rename to tests/log/faillog/08_faillog-u_name_invalid/config/etc/shadow
diff --git a/tests/tests/log/faillog/08_faillog-u_name_invalid/data/faillog.err b/tests/log/faillog/08_faillog-u_name_invalid/data/faillog.err
similarity index 100%
rename from tests/tests/log/faillog/08_faillog-u_name_invalid/data/faillog.err
rename to tests/log/faillog/08_faillog-u_name_invalid/data/faillog.err
diff --git a/tests/tests/log/faillog/08_faillog-u_name_invalid/faillog.test b/tests/log/faillog/08_faillog-u_name_invalid/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/08_faillog-u_name_invalid/faillog.test
rename to tests/log/faillog/08_faillog-u_name_invalid/faillog.test
diff --git a/tests/tests/log/faillog/09_faillog-u_range/config.txt b/tests/log/faillog/09_faillog-u_range/config.txt
similarity index 100%
rename from tests/tests/log/faillog/09_faillog-u_range/config.txt
rename to tests/log/faillog/09_faillog-u_range/config.txt
diff --git a/tests/tests/log/faillog/06_faillog-u_name/config/etc/group b/tests/log/faillog/09_faillog-u_range/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/06_faillog-u_name/config/etc/group
rename to tests/log/faillog/09_faillog-u_range/config/etc/group
diff --git a/tests/tests/log/faillog/06_faillog-u_name/config/etc/gshadow b/tests/log/faillog/09_faillog-u_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/06_faillog-u_name/config/etc/gshadow
rename to tests/log/faillog/09_faillog-u_range/config/etc/gshadow
diff --git a/tests/tests/log/faillog/09_faillog-u_range/config/etc/pam.d/login b/tests/log/faillog/09_faillog-u_range/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/09_faillog-u_range/config/etc/pam.d/login
rename to tests/log/faillog/09_faillog-u_range/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/09_faillog-u_range/config/etc/passwd b/tests/log/faillog/09_faillog-u_range/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/09_faillog-u_range/config/etc/passwd
rename to tests/log/faillog/09_faillog-u_range/config/etc/passwd
diff --git a/tests/tests/log/faillog/09_faillog-u_range/config/etc/shadow b/tests/log/faillog/09_faillog-u_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/09_faillog-u_range/config/etc/shadow
rename to tests/log/faillog/09_faillog-u_range/config/etc/shadow
diff --git a/tests/tests/log/faillog/09_faillog-u_range/data/faillog.list b/tests/log/faillog/09_faillog-u_range/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/09_faillog-u_range/data/faillog.list
rename to tests/log/faillog/09_faillog-u_range/data/faillog.list
diff --git a/tests/tests/log/faillog/09_faillog-u_range/faillog.test b/tests/log/faillog/09_faillog-u_range/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/09_faillog-u_range/faillog.test
rename to tests/log/faillog/09_faillog-u_range/faillog.test
diff --git a/tests/tests/log/faillog/09_faillog-u_range/login.exp b/tests/log/faillog/09_faillog-u_range/login.exp
similarity index 100%
rename from tests/tests/log/faillog/09_faillog-u_range/login.exp
rename to tests/log/faillog/09_faillog-u_range/login.exp
diff --git a/tests/tests/log/faillog/10_faillog-u_open_range/config.txt b/tests/log/faillog/10_faillog-u_open_range/config.txt
similarity index 100%
rename from tests/tests/log/faillog/10_faillog-u_open_range/config.txt
rename to tests/log/faillog/10_faillog-u_open_range/config.txt
diff --git a/tests/tests/log/faillog/07_faillog-u_ID_invalid/config/etc/group b/tests/log/faillog/10_faillog-u_open_range/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/07_faillog-u_ID_invalid/config/etc/group
rename to tests/log/faillog/10_faillog-u_open_range/config/etc/group
diff --git a/tests/tests/log/faillog/07_faillog-u_ID_invalid/config/etc/gshadow b/tests/log/faillog/10_faillog-u_open_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/07_faillog-u_ID_invalid/config/etc/gshadow
rename to tests/log/faillog/10_faillog-u_open_range/config/etc/gshadow
diff --git a/tests/tests/log/faillog/10_faillog-u_open_range/config/etc/passwd b/tests/log/faillog/10_faillog-u_open_range/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/10_faillog-u_open_range/config/etc/passwd
rename to tests/log/faillog/10_faillog-u_open_range/config/etc/passwd
diff --git a/tests/tests/log/faillog/10_faillog-u_open_range/config/etc/shadow b/tests/log/faillog/10_faillog-u_open_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/10_faillog-u_open_range/config/etc/shadow
rename to tests/log/faillog/10_faillog-u_open_range/config/etc/shadow
diff --git a/tests/tests/log/faillog/10_faillog-u_open_range/data/faillog.list b/tests/log/faillog/10_faillog-u_open_range/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/10_faillog-u_open_range/data/faillog.list
rename to tests/log/faillog/10_faillog-u_open_range/data/faillog.list
diff --git a/tests/tests/log/faillog/10_faillog-u_open_range/faillog.test b/tests/log/faillog/10_faillog-u_open_range/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/10_faillog-u_open_range/faillog.test
rename to tests/log/faillog/10_faillog-u_open_range/faillog.test
diff --git a/tests/tests/log/faillog/11_faillog-u_range_open/config.txt b/tests/log/faillog/11_faillog-u_range_open/config.txt
similarity index 100%
rename from tests/tests/log/faillog/11_faillog-u_range_open/config.txt
rename to tests/log/faillog/11_faillog-u_range_open/config.txt
diff --git a/tests/tests/log/faillog/08_faillog-u_name_invalid/config/etc/group b/tests/log/faillog/11_faillog-u_range_open/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/08_faillog-u_name_invalid/config/etc/group
rename to tests/log/faillog/11_faillog-u_range_open/config/etc/group
diff --git a/tests/tests/log/faillog/08_faillog-u_name_invalid/config/etc/gshadow b/tests/log/faillog/11_faillog-u_range_open/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/08_faillog-u_name_invalid/config/etc/gshadow
rename to tests/log/faillog/11_faillog-u_range_open/config/etc/gshadow
diff --git a/tests/tests/log/faillog/11_faillog-u_range_open/config/etc/passwd b/tests/log/faillog/11_faillog-u_range_open/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/11_faillog-u_range_open/config/etc/passwd
rename to tests/log/faillog/11_faillog-u_range_open/config/etc/passwd
diff --git a/tests/tests/log/faillog/11_faillog-u_range_open/config/etc/shadow b/tests/log/faillog/11_faillog-u_range_open/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/11_faillog-u_range_open/config/etc/shadow
rename to tests/log/faillog/11_faillog-u_range_open/config/etc/shadow
diff --git a/tests/tests/log/faillog/11_faillog-u_range_open/data/faillog.list b/tests/log/faillog/11_faillog-u_range_open/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/11_faillog-u_range_open/data/faillog.list
rename to tests/log/faillog/11_faillog-u_range_open/data/faillog.list
diff --git a/tests/tests/log/faillog/11_faillog-u_range_open/faillog.test b/tests/log/faillog/11_faillog-u_range_open/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/11_faillog-u_range_open/faillog.test
rename to tests/log/faillog/11_faillog-u_range_open/faillog.test
diff --git a/tests/tests/log/faillog/12_faillog-u_range_invalid1/config.txt b/tests/log/faillog/12_faillog-u_range_invalid1/config.txt
similarity index 100%
rename from tests/tests/log/faillog/12_faillog-u_range_invalid1/config.txt
rename to tests/log/faillog/12_faillog-u_range_invalid1/config.txt
diff --git a/tests/tests/log/faillog/09_faillog-u_range/config/etc/group b/tests/log/faillog/12_faillog-u_range_invalid1/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/09_faillog-u_range/config/etc/group
rename to tests/log/faillog/12_faillog-u_range_invalid1/config/etc/group
diff --git a/tests/tests/log/faillog/09_faillog-u_range/config/etc/gshadow b/tests/log/faillog/12_faillog-u_range_invalid1/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/09_faillog-u_range/config/etc/gshadow
rename to tests/log/faillog/12_faillog-u_range_invalid1/config/etc/gshadow
diff --git a/tests/tests/log/faillog/12_faillog-u_range_invalid1/config/etc/passwd b/tests/log/faillog/12_faillog-u_range_invalid1/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/12_faillog-u_range_invalid1/config/etc/passwd
rename to tests/log/faillog/12_faillog-u_range_invalid1/config/etc/passwd
diff --git a/tests/tests/log/faillog/12_faillog-u_range_invalid1/config/etc/shadow b/tests/log/faillog/12_faillog-u_range_invalid1/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/12_faillog-u_range_invalid1/config/etc/shadow
rename to tests/log/faillog/12_faillog-u_range_invalid1/config/etc/shadow
diff --git a/tests/tests/log/faillog/12_faillog-u_range_invalid1/data/faillog.err b/tests/log/faillog/12_faillog-u_range_invalid1/data/faillog.err
similarity index 100%
rename from tests/tests/log/faillog/12_faillog-u_range_invalid1/data/faillog.err
rename to tests/log/faillog/12_faillog-u_range_invalid1/data/faillog.err
diff --git a/tests/tests/log/faillog/12_faillog-u_range_invalid1/faillog.test b/tests/log/faillog/12_faillog-u_range_invalid1/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/12_faillog-u_range_invalid1/faillog.test
rename to tests/log/faillog/12_faillog-u_range_invalid1/faillog.test
diff --git a/tests/tests/log/faillog/13_faillog-u_range_invalid2/config.txt b/tests/log/faillog/13_faillog-u_range_invalid2/config.txt
similarity index 100%
rename from tests/tests/log/faillog/13_faillog-u_range_invalid2/config.txt
rename to tests/log/faillog/13_faillog-u_range_invalid2/config.txt
diff --git a/tests/tests/log/faillog/10_faillog-u_open_range/config/etc/group b/tests/log/faillog/13_faillog-u_range_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/10_faillog-u_open_range/config/etc/group
rename to tests/log/faillog/13_faillog-u_range_invalid2/config/etc/group
diff --git a/tests/tests/log/faillog/10_faillog-u_open_range/config/etc/gshadow b/tests/log/faillog/13_faillog-u_range_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/10_faillog-u_open_range/config/etc/gshadow
rename to tests/log/faillog/13_faillog-u_range_invalid2/config/etc/gshadow
diff --git a/tests/tests/log/faillog/13_faillog-u_range_invalid2/config/etc/passwd b/tests/log/faillog/13_faillog-u_range_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/13_faillog-u_range_invalid2/config/etc/passwd
rename to tests/log/faillog/13_faillog-u_range_invalid2/config/etc/passwd
diff --git a/tests/tests/log/faillog/13_faillog-u_range_invalid2/config/etc/shadow b/tests/log/faillog/13_faillog-u_range_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/13_faillog-u_range_invalid2/config/etc/shadow
rename to tests/log/faillog/13_faillog-u_range_invalid2/config/etc/shadow
diff --git a/tests/tests/log/faillog/13_faillog-u_range_invalid2/data/faillog.err b/tests/log/faillog/13_faillog-u_range_invalid2/data/faillog.err
similarity index 100%
rename from tests/tests/log/faillog/13_faillog-u_range_invalid2/data/faillog.err
rename to tests/log/faillog/13_faillog-u_range_invalid2/data/faillog.err
diff --git a/tests/tests/log/faillog/13_faillog-u_range_invalid2/faillog.test b/tests/log/faillog/13_faillog-u_range_invalid2/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/13_faillog-u_range_invalid2/faillog.test
rename to tests/log/faillog/13_faillog-u_range_invalid2/faillog.test
diff --git a/tests/tests/log/faillog/14_faillog-u_range_invalid3/config.txt b/tests/log/faillog/14_faillog-u_range_invalid3/config.txt
similarity index 100%
rename from tests/tests/log/faillog/14_faillog-u_range_invalid3/config.txt
rename to tests/log/faillog/14_faillog-u_range_invalid3/config.txt
diff --git a/tests/tests/log/faillog/11_faillog-u_range_open/config/etc/group b/tests/log/faillog/14_faillog-u_range_invalid3/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/11_faillog-u_range_open/config/etc/group
rename to tests/log/faillog/14_faillog-u_range_invalid3/config/etc/group
diff --git a/tests/tests/log/faillog/11_faillog-u_range_open/config/etc/gshadow b/tests/log/faillog/14_faillog-u_range_invalid3/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/11_faillog-u_range_open/config/etc/gshadow
rename to tests/log/faillog/14_faillog-u_range_invalid3/config/etc/gshadow
diff --git a/tests/tests/log/faillog/14_faillog-u_range_invalid3/config/etc/passwd b/tests/log/faillog/14_faillog-u_range_invalid3/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/14_faillog-u_range_invalid3/config/etc/passwd
rename to tests/log/faillog/14_faillog-u_range_invalid3/config/etc/passwd
diff --git a/tests/tests/log/faillog/14_faillog-u_range_invalid3/config/etc/shadow b/tests/log/faillog/14_faillog-u_range_invalid3/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/14_faillog-u_range_invalid3/config/etc/shadow
rename to tests/log/faillog/14_faillog-u_range_invalid3/config/etc/shadow
diff --git a/tests/tests/log/faillog/14_faillog-u_range_invalid3/data/faillog.err b/tests/log/faillog/14_faillog-u_range_invalid3/data/faillog.err
similarity index 100%
rename from tests/tests/log/faillog/14_faillog-u_range_invalid3/data/faillog.err
rename to tests/log/faillog/14_faillog-u_range_invalid3/data/faillog.err
diff --git a/tests/tests/log/faillog/14_faillog-u_range_invalid3/faillog.test b/tests/log/faillog/14_faillog-u_range_invalid3/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/14_faillog-u_range_invalid3/faillog.test
rename to tests/log/faillog/14_faillog-u_range_invalid3/faillog.test
diff --git a/tests/tests/log/faillog/15_faillog_bad_option/config.txt b/tests/log/faillog/15_faillog_bad_option/config.txt
similarity index 100%
rename from tests/tests/log/faillog/15_faillog_bad_option/config.txt
rename to tests/log/faillog/15_faillog_bad_option/config.txt
diff --git a/tests/tests/log/faillog/02_faillog_usage/config/etc/group b/tests/log/faillog/15_faillog_bad_option/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/02_faillog_usage/config/etc/group
rename to tests/log/faillog/15_faillog_bad_option/config/etc/group
diff --git a/tests/tests/log/faillog/02_faillog_usage/config/etc/gshadow b/tests/log/faillog/15_faillog_bad_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/02_faillog_usage/config/etc/gshadow
rename to tests/log/faillog/15_faillog_bad_option/config/etc/gshadow
diff --git a/tests/tests/log/faillog/02_faillog_usage/config/etc/passwd b/tests/log/faillog/15_faillog_bad_option/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/02_faillog_usage/config/etc/passwd
rename to tests/log/faillog/15_faillog_bad_option/config/etc/passwd
diff --git a/tests/tests/log/faillog/02_faillog_usage/config/etc/shadow b/tests/log/faillog/15_faillog_bad_option/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/02_faillog_usage/config/etc/shadow
rename to tests/log/faillog/15_faillog_bad_option/config/etc/shadow
diff --git a/tests/tests/log/faillog/15_faillog_bad_option/data/usage.out b/tests/log/faillog/15_faillog_bad_option/data/usage.out
similarity index 100%
rename from tests/tests/log/faillog/15_faillog_bad_option/data/usage.out
rename to tests/log/faillog/15_faillog_bad_option/data/usage.out
diff --git a/tests/tests/log/faillog/15_faillog_bad_option/faillog.test b/tests/log/faillog/15_faillog_bad_option/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/15_faillog_bad_option/faillog.test
rename to tests/log/faillog/15_faillog_bad_option/faillog.test
diff --git a/tests/tests/log/faillog/16_faillog_extra_arg/config.txt b/tests/log/faillog/16_faillog_extra_arg/config.txt
similarity index 100%
rename from tests/tests/log/faillog/16_faillog_extra_arg/config.txt
rename to tests/log/faillog/16_faillog_extra_arg/config.txt
diff --git a/tests/tests/log/faillog/15_faillog_bad_option/config/etc/group b/tests/log/faillog/16_faillog_extra_arg/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/15_faillog_bad_option/config/etc/group
rename to tests/log/faillog/16_faillog_extra_arg/config/etc/group
diff --git a/tests/tests/log/faillog/15_faillog_bad_option/config/etc/gshadow b/tests/log/faillog/16_faillog_extra_arg/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/15_faillog_bad_option/config/etc/gshadow
rename to tests/log/faillog/16_faillog_extra_arg/config/etc/gshadow
diff --git a/tests/tests/log/faillog/15_faillog_bad_option/config/etc/passwd b/tests/log/faillog/16_faillog_extra_arg/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/15_faillog_bad_option/config/etc/passwd
rename to tests/log/faillog/16_faillog_extra_arg/config/etc/passwd
diff --git a/tests/tests/log/faillog/15_faillog_bad_option/config/etc/shadow b/tests/log/faillog/16_faillog_extra_arg/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/15_faillog_bad_option/config/etc/shadow
rename to tests/log/faillog/16_faillog_extra_arg/config/etc/shadow
diff --git a/tests/tests/log/faillog/16_faillog_extra_arg/data/usage.out b/tests/log/faillog/16_faillog_extra_arg/data/usage.out
similarity index 100%
rename from tests/tests/log/faillog/16_faillog_extra_arg/data/usage.out
rename to tests/log/faillog/16_faillog_extra_arg/data/usage.out
diff --git a/tests/tests/log/faillog/16_faillog_extra_arg/faillog.test b/tests/log/faillog/16_faillog_extra_arg/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/16_faillog_extra_arg/faillog.test
rename to tests/log/faillog/16_faillog_extra_arg/faillog.test
diff --git a/tests/tests/log/faillog/17_faillog-t/config.txt b/tests/log/faillog/17_faillog-t/config.txt
similarity index 100%
rename from tests/tests/log/faillog/17_faillog-t/config.txt
rename to tests/log/faillog/17_faillog-t/config.txt
diff --git a/tests/tests/log/faillog/12_faillog-u_range_invalid1/config/etc/group b/tests/log/faillog/17_faillog-t/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/12_faillog-u_range_invalid1/config/etc/group
rename to tests/log/faillog/17_faillog-t/config/etc/group
diff --git a/tests/tests/log/faillog/12_faillog-u_range_invalid1/config/etc/gshadow b/tests/log/faillog/17_faillog-t/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/12_faillog-u_range_invalid1/config/etc/gshadow
rename to tests/log/faillog/17_faillog-t/config/etc/gshadow
diff --git a/tests/tests/log/faillog/17_faillog-t/config/etc/pam.d/login b/tests/log/faillog/17_faillog-t/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/17_faillog-t/config/etc/pam.d/login
rename to tests/log/faillog/17_faillog-t/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/17_faillog-t/config/etc/passwd b/tests/log/faillog/17_faillog-t/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/17_faillog-t/config/etc/passwd
rename to tests/log/faillog/17_faillog-t/config/etc/passwd
diff --git a/tests/tests/log/faillog/17_faillog-t/config/etc/shadow b/tests/log/faillog/17_faillog-t/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/17_faillog-t/config/etc/shadow
rename to tests/log/faillog/17_faillog-t/config/etc/shadow
diff --git a/tests/tests/log/faillog/17_faillog-t/data/faillog.list b/tests/log/faillog/17_faillog-t/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/17_faillog-t/data/faillog.list
rename to tests/log/faillog/17_faillog-t/data/faillog.list
diff --git a/tests/tests/log/faillog/17_faillog-t/faillog.test b/tests/log/faillog/17_faillog-t/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/17_faillog-t/faillog.test
rename to tests/log/faillog/17_faillog-t/faillog.test
diff --git a/tests/tests/log/faillog/17_faillog-t/login.exp b/tests/log/faillog/17_faillog-t/login.exp
similarity index 100%
rename from tests/tests/log/faillog/17_faillog-t/login.exp
rename to tests/log/faillog/17_faillog-t/login.exp
diff --git a/tests/tests/log/faillog/18_faillog-t_invalid/config.txt b/tests/log/faillog/18_faillog-t_invalid/config.txt
similarity index 100%
rename from tests/tests/log/faillog/18_faillog-t_invalid/config.txt
rename to tests/log/faillog/18_faillog-t_invalid/config.txt
diff --git a/tests/tests/log/faillog/13_faillog-u_range_invalid2/config/etc/group b/tests/log/faillog/18_faillog-t_invalid/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/13_faillog-u_range_invalid2/config/etc/group
rename to tests/log/faillog/18_faillog-t_invalid/config/etc/group
diff --git a/tests/tests/log/faillog/13_faillog-u_range_invalid2/config/etc/gshadow b/tests/log/faillog/18_faillog-t_invalid/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/13_faillog-u_range_invalid2/config/etc/gshadow
rename to tests/log/faillog/18_faillog-t_invalid/config/etc/gshadow
diff --git a/tests/tests/log/faillog/18_faillog-t_invalid/config/etc/passwd b/tests/log/faillog/18_faillog-t_invalid/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/18_faillog-t_invalid/config/etc/passwd
rename to tests/log/faillog/18_faillog-t_invalid/config/etc/passwd
diff --git a/tests/tests/log/faillog/18_faillog-t_invalid/config/etc/shadow b/tests/log/faillog/18_faillog-t_invalid/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/18_faillog-t_invalid/config/etc/shadow
rename to tests/log/faillog/18_faillog-t_invalid/config/etc/shadow
diff --git a/tests/tests/log/faillog/18_faillog-t_invalid/data/faillog.err b/tests/log/faillog/18_faillog-t_invalid/data/faillog.err
similarity index 100%
rename from tests/tests/log/faillog/18_faillog-t_invalid/data/faillog.err
rename to tests/log/faillog/18_faillog-t_invalid/data/faillog.err
diff --git a/tests/tests/log/faillog/18_faillog-t_invalid/faillog.test b/tests/log/faillog/18_faillog-t_invalid/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/18_faillog-t_invalid/faillog.test
rename to tests/log/faillog/18_faillog-t_invalid/faillog.test
diff --git a/tests/tests/log/faillog/19_faillog_multiple_same_user/config.txt b/tests/log/faillog/19_faillog_multiple_same_user/config.txt
similarity index 100%
rename from tests/tests/log/faillog/19_faillog_multiple_same_user/config.txt
rename to tests/log/faillog/19_faillog_multiple_same_user/config.txt
diff --git a/tests/tests/log/faillog/14_faillog-u_range_invalid3/config/etc/group b/tests/log/faillog/19_faillog_multiple_same_user/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/14_faillog-u_range_invalid3/config/etc/group
rename to tests/log/faillog/19_faillog_multiple_same_user/config/etc/group
diff --git a/tests/tests/log/faillog/14_faillog-u_range_invalid3/config/etc/gshadow b/tests/log/faillog/19_faillog_multiple_same_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/14_faillog-u_range_invalid3/config/etc/gshadow
rename to tests/log/faillog/19_faillog_multiple_same_user/config/etc/gshadow
diff --git a/tests/tests/log/faillog/19_faillog_multiple_same_user/config/etc/pam.d/login b/tests/log/faillog/19_faillog_multiple_same_user/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/19_faillog_multiple_same_user/config/etc/pam.d/login
rename to tests/log/faillog/19_faillog_multiple_same_user/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/19_faillog_multiple_same_user/config/etc/passwd b/tests/log/faillog/19_faillog_multiple_same_user/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/19_faillog_multiple_same_user/config/etc/passwd
rename to tests/log/faillog/19_faillog_multiple_same_user/config/etc/passwd
diff --git a/tests/tests/log/faillog/19_faillog_multiple_same_user/config/etc/shadow b/tests/log/faillog/19_faillog_multiple_same_user/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/19_faillog_multiple_same_user/config/etc/shadow
rename to tests/log/faillog/19_faillog_multiple_same_user/config/etc/shadow
diff --git a/tests/tests/log/faillog/19_faillog_multiple_same_user/data/faillog.list b/tests/log/faillog/19_faillog_multiple_same_user/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/19_faillog_multiple_same_user/data/faillog.list
rename to tests/log/faillog/19_faillog_multiple_same_user/data/faillog.list
diff --git a/tests/tests/log/faillog/19_faillog_multiple_same_user/faillog.test b/tests/log/faillog/19_faillog_multiple_same_user/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/19_faillog_multiple_same_user/faillog.test
rename to tests/log/faillog/19_faillog_multiple_same_user/faillog.test
diff --git a/tests/tests/log/faillog/19_faillog_multiple_same_user/login.exp b/tests/log/faillog/19_faillog_multiple_same_user/login.exp
similarity index 100%
rename from tests/tests/log/faillog/19_faillog_multiple_same_user/login.exp
rename to tests/log/faillog/19_faillog_multiple_same_user/login.exp
diff --git a/tests/tests/log/faillog/20_faillog-r-u/config.txt b/tests/log/faillog/20_faillog-r-u/config.txt
similarity index 100%
rename from tests/tests/log/faillog/20_faillog-r-u/config.txt
rename to tests/log/faillog/20_faillog-r-u/config.txt
diff --git a/tests/tests/log/faillog/17_faillog-t/config/etc/group b/tests/log/faillog/20_faillog-r-u/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/17_faillog-t/config/etc/group
rename to tests/log/faillog/20_faillog-r-u/config/etc/group
diff --git a/tests/tests/log/faillog/17_faillog-t/config/etc/gshadow b/tests/log/faillog/20_faillog-r-u/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/17_faillog-t/config/etc/gshadow
rename to tests/log/faillog/20_faillog-r-u/config/etc/gshadow
diff --git a/tests/tests/log/faillog/20_faillog-r-u/config/etc/pam.d/login b/tests/log/faillog/20_faillog-r-u/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/20_faillog-r-u/config/etc/pam.d/login
rename to tests/log/faillog/20_faillog-r-u/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/20_faillog-r-u/config/etc/passwd b/tests/log/faillog/20_faillog-r-u/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/20_faillog-r-u/config/etc/passwd
rename to tests/log/faillog/20_faillog-r-u/config/etc/passwd
diff --git a/tests/tests/log/faillog/20_faillog-r-u/config/etc/shadow b/tests/log/faillog/20_faillog-r-u/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/20_faillog-r-u/config/etc/shadow
rename to tests/log/faillog/20_faillog-r-u/config/etc/shadow
diff --git a/tests/tests/log/faillog/20_faillog-r-u/data/faillog.list b/tests/log/faillog/20_faillog-r-u/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/20_faillog-r-u/data/faillog.list
rename to tests/log/faillog/20_faillog-r-u/data/faillog.list
diff --git a/tests/tests/log/faillog/20_faillog-r-u/faillog.test b/tests/log/faillog/20_faillog-r-u/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/20_faillog-r-u/faillog.test
rename to tests/log/faillog/20_faillog-r-u/faillog.test
diff --git a/tests/tests/log/faillog/20_faillog-r-u/login.exp b/tests/log/faillog/20_faillog-r-u/login.exp
similarity index 100%
rename from tests/tests/log/faillog/20_faillog-r-u/login.exp
rename to tests/log/faillog/20_faillog-r-u/login.exp
diff --git a/tests/tests/log/faillog/21_faillog-r-u_range/config.txt b/tests/log/faillog/21_faillog-r-u_range/config.txt
similarity index 100%
rename from tests/tests/log/faillog/21_faillog-r-u_range/config.txt
rename to tests/log/faillog/21_faillog-r-u_range/config.txt
diff --git a/tests/tests/log/faillog/18_faillog-t_invalid/config/etc/group b/tests/log/faillog/21_faillog-r-u_range/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/18_faillog-t_invalid/config/etc/group
rename to tests/log/faillog/21_faillog-r-u_range/config/etc/group
diff --git a/tests/tests/log/faillog/18_faillog-t_invalid/config/etc/gshadow b/tests/log/faillog/21_faillog-r-u_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/18_faillog-t_invalid/config/etc/gshadow
rename to tests/log/faillog/21_faillog-r-u_range/config/etc/gshadow
diff --git a/tests/tests/log/faillog/21_faillog-r-u_range/config/etc/pam.d/login b/tests/log/faillog/21_faillog-r-u_range/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/21_faillog-r-u_range/config/etc/pam.d/login
rename to tests/log/faillog/21_faillog-r-u_range/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/21_faillog-r-u_range/config/etc/passwd b/tests/log/faillog/21_faillog-r-u_range/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/21_faillog-r-u_range/config/etc/passwd
rename to tests/log/faillog/21_faillog-r-u_range/config/etc/passwd
diff --git a/tests/tests/log/faillog/21_faillog-r-u_range/config/etc/shadow b/tests/log/faillog/21_faillog-r-u_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/21_faillog-r-u_range/config/etc/shadow
rename to tests/log/faillog/21_faillog-r-u_range/config/etc/shadow
diff --git a/tests/tests/log/faillog/21_faillog-r-u_range/data/faillog.list b/tests/log/faillog/21_faillog-r-u_range/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/21_faillog-r-u_range/data/faillog.list
rename to tests/log/faillog/21_faillog-r-u_range/data/faillog.list
diff --git a/tests/tests/log/faillog/21_faillog-r-u_range/faillog.test b/tests/log/faillog/21_faillog-r-u_range/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/21_faillog-r-u_range/faillog.test
rename to tests/log/faillog/21_faillog-r-u_range/faillog.test
diff --git a/tests/tests/log/faillog/21_faillog-r-u_range/login.exp b/tests/log/faillog/21_faillog-r-u_range/login.exp
similarity index 100%
rename from tests/tests/log/faillog/21_faillog-r-u_range/login.exp
rename to tests/log/faillog/21_faillog-r-u_range/login.exp
diff --git a/tests/tests/log/faillog/22_faillog_removed_user/config.txt b/tests/log/faillog/22_faillog_removed_user/config.txt
similarity index 100%
rename from tests/tests/log/faillog/22_faillog_removed_user/config.txt
rename to tests/log/faillog/22_faillog_removed_user/config.txt
diff --git a/tests/tests/log/faillog/19_faillog_multiple_same_user/config/etc/group b/tests/log/faillog/22_faillog_removed_user/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/19_faillog_multiple_same_user/config/etc/group
rename to tests/log/faillog/22_faillog_removed_user/config/etc/group
diff --git a/tests/tests/log/faillog/19_faillog_multiple_same_user/config/etc/gshadow b/tests/log/faillog/22_faillog_removed_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/19_faillog_multiple_same_user/config/etc/gshadow
rename to tests/log/faillog/22_faillog_removed_user/config/etc/gshadow
diff --git a/tests/tests/log/faillog/22_faillog_removed_user/config/etc/pam.d/login b/tests/log/faillog/22_faillog_removed_user/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/22_faillog_removed_user/config/etc/pam.d/login
rename to tests/log/faillog/22_faillog_removed_user/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/22_faillog_removed_user/config/etc/passwd b/tests/log/faillog/22_faillog_removed_user/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/22_faillog_removed_user/config/etc/passwd
rename to tests/log/faillog/22_faillog_removed_user/config/etc/passwd
diff --git a/tests/tests/log/faillog/22_faillog_removed_user/config/etc/shadow b/tests/log/faillog/22_faillog_removed_user/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/22_faillog_removed_user/config/etc/shadow
rename to tests/log/faillog/22_faillog_removed_user/config/etc/shadow
diff --git a/tests/tests/log/faillog/22_faillog_removed_user/data/faillog.list b/tests/log/faillog/22_faillog_removed_user/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/22_faillog_removed_user/data/faillog.list
rename to tests/log/faillog/22_faillog_removed_user/data/faillog.list
diff --git a/tests/tests/log/faillog/22_faillog_removed_user/faillog.test b/tests/log/faillog/22_faillog_removed_user/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/22_faillog_removed_user/faillog.test
rename to tests/log/faillog/22_faillog_removed_user/faillog.test
diff --git a/tests/tests/log/faillog/22_faillog_removed_user/login.exp b/tests/log/faillog/22_faillog_removed_user/login.exp
similarity index 100%
rename from tests/tests/log/faillog/22_faillog_removed_user/login.exp
rename to tests/log/faillog/22_faillog_removed_user/login.exp
diff --git a/tests/tests/log/faillog/23_faillog-a_removed_user/config.txt b/tests/log/faillog/23_faillog-a_removed_user/config.txt
similarity index 100%
rename from tests/tests/log/faillog/23_faillog-a_removed_user/config.txt
rename to tests/log/faillog/23_faillog-a_removed_user/config.txt
diff --git a/tests/tests/log/faillog/20_faillog-r-u/config/etc/group b/tests/log/faillog/23_faillog-a_removed_user/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/20_faillog-r-u/config/etc/group
rename to tests/log/faillog/23_faillog-a_removed_user/config/etc/group
diff --git a/tests/tests/log/faillog/20_faillog-r-u/config/etc/gshadow b/tests/log/faillog/23_faillog-a_removed_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/20_faillog-r-u/config/etc/gshadow
rename to tests/log/faillog/23_faillog-a_removed_user/config/etc/gshadow
diff --git a/tests/tests/log/faillog/23_faillog-a_removed_user/config/etc/pam.d/login b/tests/log/faillog/23_faillog-a_removed_user/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/23_faillog-a_removed_user/config/etc/pam.d/login
rename to tests/log/faillog/23_faillog-a_removed_user/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/23_faillog-a_removed_user/config/etc/passwd b/tests/log/faillog/23_faillog-a_removed_user/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/23_faillog-a_removed_user/config/etc/passwd
rename to tests/log/faillog/23_faillog-a_removed_user/config/etc/passwd
diff --git a/tests/tests/log/faillog/23_faillog-a_removed_user/config/etc/shadow b/tests/log/faillog/23_faillog-a_removed_user/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/23_faillog-a_removed_user/config/etc/shadow
rename to tests/log/faillog/23_faillog-a_removed_user/config/etc/shadow
diff --git a/tests/tests/log/faillog/23_faillog-a_removed_user/data/faillog.list b/tests/log/faillog/23_faillog-a_removed_user/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/23_faillog-a_removed_user/data/faillog.list
rename to tests/log/faillog/23_faillog-a_removed_user/data/faillog.list
diff --git a/tests/tests/log/faillog/23_faillog-a_removed_user/faillog.test b/tests/log/faillog/23_faillog-a_removed_user/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/23_faillog-a_removed_user/faillog.test
rename to tests/log/faillog/23_faillog-a_removed_user/faillog.test
diff --git a/tests/tests/log/faillog/23_faillog-a_removed_user/login.exp b/tests/log/faillog/23_faillog-a_removed_user/login.exp
similarity index 100%
rename from tests/tests/log/faillog/23_faillog-a_removed_user/login.exp
rename to tests/log/faillog/23_faillog-a_removed_user/login.exp
diff --git a/tests/tests/log/faillog/24_faillog-u_removed_user/config.txt b/tests/log/faillog/24_faillog-u_removed_user/config.txt
similarity index 100%
rename from tests/tests/log/faillog/24_faillog-u_removed_user/config.txt
rename to tests/log/faillog/24_faillog-u_removed_user/config.txt
diff --git a/tests/tests/log/faillog/21_faillog-r-u_range/config/etc/group b/tests/log/faillog/24_faillog-u_removed_user/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/21_faillog-r-u_range/config/etc/group
rename to tests/log/faillog/24_faillog-u_removed_user/config/etc/group
diff --git a/tests/tests/log/faillog/21_faillog-r-u_range/config/etc/gshadow b/tests/log/faillog/24_faillog-u_removed_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/21_faillog-r-u_range/config/etc/gshadow
rename to tests/log/faillog/24_faillog-u_removed_user/config/etc/gshadow
diff --git a/tests/tests/log/faillog/24_faillog-u_removed_user/config/etc/pam.d/login b/tests/log/faillog/24_faillog-u_removed_user/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/24_faillog-u_removed_user/config/etc/pam.d/login
rename to tests/log/faillog/24_faillog-u_removed_user/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/24_faillog-u_removed_user/config/etc/passwd b/tests/log/faillog/24_faillog-u_removed_user/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/24_faillog-u_removed_user/config/etc/passwd
rename to tests/log/faillog/24_faillog-u_removed_user/config/etc/passwd
diff --git a/tests/tests/log/faillog/24_faillog-u_removed_user/config/etc/shadow b/tests/log/faillog/24_faillog-u_removed_user/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/24_faillog-u_removed_user/config/etc/shadow
rename to tests/log/faillog/24_faillog-u_removed_user/config/etc/shadow
diff --git a/tests/tests/log/faillog/24_faillog-u_removed_user/data/faillog.list b/tests/log/faillog/24_faillog-u_removed_user/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/24_faillog-u_removed_user/data/faillog.list
rename to tests/log/faillog/24_faillog-u_removed_user/data/faillog.list
diff --git a/tests/tests/log/faillog/24_faillog-u_removed_user/faillog.test b/tests/log/faillog/24_faillog-u_removed_user/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/24_faillog-u_removed_user/faillog.test
rename to tests/log/faillog/24_faillog-u_removed_user/faillog.test
diff --git a/tests/tests/log/faillog/24_faillog-u_removed_user/login.exp b/tests/log/faillog/24_faillog-u_removed_user/login.exp
similarity index 100%
rename from tests/tests/log/faillog/24_faillog-u_removed_user/login.exp
rename to tests/log/faillog/24_faillog-u_removed_user/login.exp
diff --git a/tests/tests/log/faillog/25_faillog-r-u_removed_user/config.txt b/tests/log/faillog/25_faillog-r-u_removed_user/config.txt
similarity index 100%
rename from tests/tests/log/faillog/25_faillog-r-u_removed_user/config.txt
rename to tests/log/faillog/25_faillog-r-u_removed_user/config.txt
diff --git a/tests/tests/log/faillog/22_faillog_removed_user/config/etc/group b/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/22_faillog_removed_user/config/etc/group
rename to tests/log/faillog/25_faillog-r-u_removed_user/config/etc/group
diff --git a/tests/tests/log/faillog/22_faillog_removed_user/config/etc/gshadow b/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/22_faillog_removed_user/config/etc/gshadow
rename to tests/log/faillog/25_faillog-r-u_removed_user/config/etc/gshadow
diff --git a/tests/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/pam.d/login b/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/pam.d/login
rename to tests/log/faillog/25_faillog-r-u_removed_user/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/passwd b/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/passwd
rename to tests/log/faillog/25_faillog-r-u_removed_user/config/etc/passwd
diff --git a/tests/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/shadow b/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/shadow
rename to tests/log/faillog/25_faillog-r-u_removed_user/config/etc/shadow
diff --git a/tests/tests/log/faillog/25_faillog-r-u_removed_user/data/faillog.list b/tests/log/faillog/25_faillog-r-u_removed_user/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/25_faillog-r-u_removed_user/data/faillog.list
rename to tests/log/faillog/25_faillog-r-u_removed_user/data/faillog.list
diff --git a/tests/tests/log/faillog/25_faillog-r-u_removed_user/faillog.test b/tests/log/faillog/25_faillog-r-u_removed_user/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/25_faillog-r-u_removed_user/faillog.test
rename to tests/log/faillog/25_faillog-r-u_removed_user/faillog.test
diff --git a/tests/tests/log/faillog/25_faillog-r-u_removed_user/login.exp b/tests/log/faillog/25_faillog-r-u_removed_user/login.exp
similarity index 100%
rename from tests/tests/log/faillog/25_faillog-r-u_removed_user/login.exp
rename to tests/log/faillog/25_faillog-r-u_removed_user/login.exp
diff --git a/tests/tests/log/faillog/26_faillog-r-u_range_removed_user/config.txt b/tests/log/faillog/26_faillog-r-u_range_removed_user/config.txt
similarity index 100%
rename from tests/tests/log/faillog/26_faillog-r-u_range_removed_user/config.txt
rename to tests/log/faillog/26_faillog-r-u_range_removed_user/config.txt
diff --git a/tests/tests/log/faillog/23_faillog-a_removed_user/config/etc/group b/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/23_faillog-a_removed_user/config/etc/group
rename to tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/group
diff --git a/tests/tests/log/faillog/23_faillog-a_removed_user/config/etc/gshadow b/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/23_faillog-a_removed_user/config/etc/gshadow
rename to tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/gshadow
diff --git a/tests/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/pam.d/login b/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/pam.d/login
rename to tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/passwd b/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/passwd
rename to tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/passwd
diff --git a/tests/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/shadow b/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/shadow
rename to tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/shadow
diff --git a/tests/tests/log/faillog/26_faillog-r-u_range_removed_user/data/faillog.list b/tests/log/faillog/26_faillog-r-u_range_removed_user/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/26_faillog-r-u_range_removed_user/data/faillog.list
rename to tests/log/faillog/26_faillog-r-u_range_removed_user/data/faillog.list
diff --git a/tests/tests/log/faillog/26_faillog-r-u_range_removed_user/faillog.test b/tests/log/faillog/26_faillog-r-u_range_removed_user/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/26_faillog-r-u_range_removed_user/faillog.test
rename to tests/log/faillog/26_faillog-r-u_range_removed_user/faillog.test
diff --git a/tests/tests/log/faillog/26_faillog-r-u_range_removed_user/login.exp b/tests/log/faillog/26_faillog-r-u_range_removed_user/login.exp
similarity index 100%
rename from tests/tests/log/faillog/26_faillog-r-u_range_removed_user/login.exp
rename to tests/log/faillog/26_faillog-r-u_range_removed_user/login.exp
diff --git a/tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config.txt b/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config.txt
similarity index 100%
rename from tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config.txt
rename to tests/log/faillog/27_faillog-r-a-u_range_removed_user/config.txt
diff --git a/tests/tests/log/faillog/24_faillog-u_removed_user/config/etc/group b/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/24_faillog-u_removed_user/config/etc/group
rename to tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/group
diff --git a/tests/tests/log/faillog/24_faillog-u_removed_user/config/etc/gshadow b/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/24_faillog-u_removed_user/config/etc/gshadow
rename to tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/gshadow
diff --git a/tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/pam.d/login b/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/pam.d/login
rename to tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/passwd b/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/passwd
rename to tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/passwd
diff --git a/tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/shadow b/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/shadow
rename to tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/shadow
diff --git a/tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/data/faillog.list b/tests/log/faillog/27_faillog-r-a-u_range_removed_user/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/data/faillog.list
rename to tests/log/faillog/27_faillog-r-a-u_range_removed_user/data/faillog.list
diff --git a/tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/faillog.test b/tests/log/faillog/27_faillog-r-a-u_range_removed_user/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/faillog.test
rename to tests/log/faillog/27_faillog-r-a-u_range_removed_user/faillog.test
diff --git a/tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/login.exp b/tests/log/faillog/27_faillog-r-a-u_range_removed_user/login.exp
similarity index 100%
rename from tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/login.exp
rename to tests/log/faillog/27_faillog-r-a-u_range_removed_user/login.exp
diff --git a/tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config.txt b/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config.txt
similarity index 100%
rename from tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config.txt
rename to tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config.txt
diff --git a/tests/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/group b/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/group
rename to tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/group
diff --git a/tests/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/gshadow b/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/25_faillog-r-u_removed_user/config/etc/gshadow
rename to tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/gshadow
diff --git a/tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/pam.d/login b/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/pam.d/login
rename to tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/passwd b/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/passwd
rename to tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/passwd
diff --git a/tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/shadow b/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/shadow
rename to tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/shadow
diff --git a/tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/data/faillog.list b/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/data/faillog.list
rename to tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/data/faillog.list
diff --git a/tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/faillog.test b/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/faillog.test
rename to tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/faillog.test
diff --git a/tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/login.exp b/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/login.exp
similarity index 100%
rename from tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/login.exp
rename to tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/login.exp
diff --git a/tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config.txt b/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config.txt
similarity index 100%
rename from tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config.txt
rename to tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config.txt
diff --git a/tests/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/group b/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/group
rename to tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/group
diff --git a/tests/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/gshadow b/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/26_faillog-r-u_range_removed_user/config/etc/gshadow
rename to tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/gshadow
diff --git a/tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/pam.d/login b/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/pam.d/login
rename to tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/passwd b/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/passwd
rename to tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/passwd
diff --git a/tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/shadow b/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/shadow
rename to tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/shadow
diff --git a/tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/data/faillog.list b/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/data/faillog.list
rename to tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/data/faillog.list
diff --git a/tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/faillog.test b/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/faillog.test
rename to tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/faillog.test
diff --git a/tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/login.exp b/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/login.exp
similarity index 100%
rename from tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/login.exp
rename to tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/login.exp
diff --git a/tests/tests/log/faillog/30_faillog-r/config.txt b/tests/log/faillog/30_faillog-r/config.txt
similarity index 100%
rename from tests/tests/log/faillog/30_faillog-r/config.txt
rename to tests/log/faillog/30_faillog-r/config.txt
diff --git a/tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/group b/tests/log/faillog/30_faillog-r/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/group
rename to tests/log/faillog/30_faillog-r/config/etc/group
diff --git a/tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/gshadow b/tests/log/faillog/30_faillog-r/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/27_faillog-r-a-u_range_removed_user/config/etc/gshadow
rename to tests/log/faillog/30_faillog-r/config/etc/gshadow
diff --git a/tests/tests/log/faillog/30_faillog-r/config/etc/pam.d/login b/tests/log/faillog/30_faillog-r/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/30_faillog-r/config/etc/pam.d/login
rename to tests/log/faillog/30_faillog-r/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/30_faillog-r/config/etc/passwd b/tests/log/faillog/30_faillog-r/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/30_faillog-r/config/etc/passwd
rename to tests/log/faillog/30_faillog-r/config/etc/passwd
diff --git a/tests/tests/log/faillog/30_faillog-r/config/etc/shadow b/tests/log/faillog/30_faillog-r/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/30_faillog-r/config/etc/shadow
rename to tests/log/faillog/30_faillog-r/config/etc/shadow
diff --git a/tests/tests/log/faillog/30_faillog-r/data/faillog.list b/tests/log/faillog/30_faillog-r/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/30_faillog-r/data/faillog.list
rename to tests/log/faillog/30_faillog-r/data/faillog.list
diff --git a/tests/tests/log/faillog/30_faillog-r/faillog.test b/tests/log/faillog/30_faillog-r/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/30_faillog-r/faillog.test
rename to tests/log/faillog/30_faillog-r/faillog.test
diff --git a/tests/tests/log/faillog/30_faillog-r/login.exp b/tests/log/faillog/30_faillog-r/login.exp
similarity index 100%
rename from tests/tests/log/faillog/30_faillog-r/login.exp
rename to tests/log/faillog/30_faillog-r/login.exp
diff --git a/tests/tests/log/faillog/31_faillog-r-u_open_range/config.txt b/tests/log/faillog/31_faillog-r-u_open_range/config.txt
similarity index 100%
rename from tests/tests/log/faillog/31_faillog-r-u_open_range/config.txt
rename to tests/log/faillog/31_faillog-r-u_open_range/config.txt
diff --git a/tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/group b/tests/log/faillog/31_faillog-r-u_open_range/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/group
rename to tests/log/faillog/31_faillog-r-u_open_range/config/etc/group
diff --git a/tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/gshadow b/tests/log/faillog/31_faillog-r-u_open_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/28_faillog-r-a-u_open_range_removed_user/config/etc/gshadow
rename to tests/log/faillog/31_faillog-r-u_open_range/config/etc/gshadow
diff --git a/tests/tests/log/faillog/31_faillog-r-u_open_range/config/etc/pam.d/login b/tests/log/faillog/31_faillog-r-u_open_range/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/31_faillog-r-u_open_range/config/etc/pam.d/login
rename to tests/log/faillog/31_faillog-r-u_open_range/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/31_faillog-r-u_open_range/config/etc/passwd b/tests/log/faillog/31_faillog-r-u_open_range/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/31_faillog-r-u_open_range/config/etc/passwd
rename to tests/log/faillog/31_faillog-r-u_open_range/config/etc/passwd
diff --git a/tests/tests/log/faillog/31_faillog-r-u_open_range/config/etc/shadow b/tests/log/faillog/31_faillog-r-u_open_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/31_faillog-r-u_open_range/config/etc/shadow
rename to tests/log/faillog/31_faillog-r-u_open_range/config/etc/shadow
diff --git a/tests/tests/log/faillog/31_faillog-r-u_open_range/data/faillog.list b/tests/log/faillog/31_faillog-r-u_open_range/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/31_faillog-r-u_open_range/data/faillog.list
rename to tests/log/faillog/31_faillog-r-u_open_range/data/faillog.list
diff --git a/tests/tests/log/faillog/31_faillog-r-u_open_range/faillog.test b/tests/log/faillog/31_faillog-r-u_open_range/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/31_faillog-r-u_open_range/faillog.test
rename to tests/log/faillog/31_faillog-r-u_open_range/faillog.test
diff --git a/tests/tests/log/faillog/31_faillog-r-u_open_range/login.exp b/tests/log/faillog/31_faillog-r-u_open_range/login.exp
similarity index 100%
rename from tests/tests/log/faillog/31_faillog-r-u_open_range/login.exp
rename to tests/log/faillog/31_faillog-r-u_open_range/login.exp
diff --git a/tests/tests/log/faillog/32_faillog-l/config.txt b/tests/log/faillog/32_faillog-l/config.txt
similarity index 100%
rename from tests/tests/log/faillog/32_faillog-l/config.txt
rename to tests/log/faillog/32_faillog-l/config.txt
diff --git a/tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/group b/tests/log/faillog/32_faillog-l/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/group
rename to tests/log/faillog/32_faillog-l/config/etc/group
diff --git a/tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/gshadow b/tests/log/faillog/32_faillog-l/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/29_faillog-r-a-u_range_open_removed_user/config/etc/gshadow
rename to tests/log/faillog/32_faillog-l/config/etc/gshadow
diff --git a/tests/tests/log/faillog/32_faillog-l/config/etc/pam.d/login b/tests/log/faillog/32_faillog-l/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/32_faillog-l/config/etc/pam.d/login
rename to tests/log/faillog/32_faillog-l/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/32_faillog-l/config/etc/passwd b/tests/log/faillog/32_faillog-l/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/32_faillog-l/config/etc/passwd
rename to tests/log/faillog/32_faillog-l/config/etc/passwd
diff --git a/tests/tests/log/faillog/32_faillog-l/config/etc/shadow b/tests/log/faillog/32_faillog-l/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/32_faillog-l/config/etc/shadow
rename to tests/log/faillog/32_faillog-l/config/etc/shadow
diff --git a/tests/tests/log/faillog/32_faillog-l/data/faillog.list b/tests/log/faillog/32_faillog-l/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/32_faillog-l/data/faillog.list
rename to tests/log/faillog/32_faillog-l/data/faillog.list
diff --git a/tests/tests/log/faillog/32_faillog-l/faillog.test b/tests/log/faillog/32_faillog-l/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/32_faillog-l/faillog.test
rename to tests/log/faillog/32_faillog-l/faillog.test
diff --git a/tests/tests/log/faillog/32_faillog-l/login.exp b/tests/log/faillog/32_faillog-l/login.exp
similarity index 100%
rename from tests/tests/log/faillog/32_faillog-l/login.exp
rename to tests/log/faillog/32_faillog-l/login.exp
diff --git a/tests/tests/log/faillog/33_faillog-l-u_user/config.txt b/tests/log/faillog/33_faillog-l-u_user/config.txt
similarity index 100%
rename from tests/tests/log/faillog/33_faillog-l-u_user/config.txt
rename to tests/log/faillog/33_faillog-l-u_user/config.txt
diff --git a/tests/tests/log/faillog/30_faillog-r/config/etc/group b/tests/log/faillog/33_faillog-l-u_user/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/30_faillog-r/config/etc/group
rename to tests/log/faillog/33_faillog-l-u_user/config/etc/group
diff --git a/tests/tests/log/faillog/30_faillog-r/config/etc/gshadow b/tests/log/faillog/33_faillog-l-u_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/30_faillog-r/config/etc/gshadow
rename to tests/log/faillog/33_faillog-l-u_user/config/etc/gshadow
diff --git a/tests/tests/log/faillog/33_faillog-l-u_user/config/etc/pam.d/login b/tests/log/faillog/33_faillog-l-u_user/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/33_faillog-l-u_user/config/etc/pam.d/login
rename to tests/log/faillog/33_faillog-l-u_user/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/33_faillog-l-u_user/config/etc/passwd b/tests/log/faillog/33_faillog-l-u_user/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/33_faillog-l-u_user/config/etc/passwd
rename to tests/log/faillog/33_faillog-l-u_user/config/etc/passwd
diff --git a/tests/tests/log/faillog/33_faillog-l-u_user/config/etc/shadow b/tests/log/faillog/33_faillog-l-u_user/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/33_faillog-l-u_user/config/etc/shadow
rename to tests/log/faillog/33_faillog-l-u_user/config/etc/shadow
diff --git a/tests/tests/log/faillog/33_faillog-l-u_user/data/faillog.list b/tests/log/faillog/33_faillog-l-u_user/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/33_faillog-l-u_user/data/faillog.list
rename to tests/log/faillog/33_faillog-l-u_user/data/faillog.list
diff --git a/tests/tests/log/faillog/33_faillog-l-u_user/faillog.test b/tests/log/faillog/33_faillog-l-u_user/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/33_faillog-l-u_user/faillog.test
rename to tests/log/faillog/33_faillog-l-u_user/faillog.test
diff --git a/tests/tests/log/faillog/33_faillog-l-u_user/login.exp b/tests/log/faillog/33_faillog-l-u_user/login.exp
similarity index 100%
rename from tests/tests/log/faillog/33_faillog-l-u_user/login.exp
rename to tests/log/faillog/33_faillog-l-u_user/login.exp
diff --git a/tests/tests/log/faillog/34_faillog-l-u_range/config.txt b/tests/log/faillog/34_faillog-l-u_range/config.txt
similarity index 100%
rename from tests/tests/log/faillog/34_faillog-l-u_range/config.txt
rename to tests/log/faillog/34_faillog-l-u_range/config.txt
diff --git a/tests/tests/log/faillog/31_faillog-r-u_open_range/config/etc/group b/tests/log/faillog/34_faillog-l-u_range/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/31_faillog-r-u_open_range/config/etc/group
rename to tests/log/faillog/34_faillog-l-u_range/config/etc/group
diff --git a/tests/tests/log/faillog/31_faillog-r-u_open_range/config/etc/gshadow b/tests/log/faillog/34_faillog-l-u_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/31_faillog-r-u_open_range/config/etc/gshadow
rename to tests/log/faillog/34_faillog-l-u_range/config/etc/gshadow
diff --git a/tests/tests/log/faillog/34_faillog-l-u_range/config/etc/pam.d/login b/tests/log/faillog/34_faillog-l-u_range/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/34_faillog-l-u_range/config/etc/pam.d/login
rename to tests/log/faillog/34_faillog-l-u_range/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/34_faillog-l-u_range/config/etc/passwd b/tests/log/faillog/34_faillog-l-u_range/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/34_faillog-l-u_range/config/etc/passwd
rename to tests/log/faillog/34_faillog-l-u_range/config/etc/passwd
diff --git a/tests/tests/log/faillog/34_faillog-l-u_range/config/etc/shadow b/tests/log/faillog/34_faillog-l-u_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/34_faillog-l-u_range/config/etc/shadow
rename to tests/log/faillog/34_faillog-l-u_range/config/etc/shadow
diff --git a/tests/tests/log/faillog/34_faillog-l-u_range/data/faillog.list b/tests/log/faillog/34_faillog-l-u_range/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/34_faillog-l-u_range/data/faillog.list
rename to tests/log/faillog/34_faillog-l-u_range/data/faillog.list
diff --git a/tests/tests/log/faillog/34_faillog-l-u_range/faillog.test b/tests/log/faillog/34_faillog-l-u_range/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/34_faillog-l-u_range/faillog.test
rename to tests/log/faillog/34_faillog-l-u_range/faillog.test
diff --git a/tests/tests/log/faillog/34_faillog-l-u_range/login.exp b/tests/log/faillog/34_faillog-l-u_range/login.exp
similarity index 100%
rename from tests/tests/log/faillog/34_faillog-l-u_range/login.exp
rename to tests/log/faillog/34_faillog-l-u_range/login.exp
diff --git a/tests/tests/log/faillog/35_faillog-l-u_open_range/config.txt b/tests/log/faillog/35_faillog-l-u_open_range/config.txt
similarity index 100%
rename from tests/tests/log/faillog/35_faillog-l-u_open_range/config.txt
rename to tests/log/faillog/35_faillog-l-u_open_range/config.txt
diff --git a/tests/tests/log/faillog/32_faillog-l/config/etc/group b/tests/log/faillog/35_faillog-l-u_open_range/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/32_faillog-l/config/etc/group
rename to tests/log/faillog/35_faillog-l-u_open_range/config/etc/group
diff --git a/tests/tests/log/faillog/32_faillog-l/config/etc/gshadow b/tests/log/faillog/35_faillog-l-u_open_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/32_faillog-l/config/etc/gshadow
rename to tests/log/faillog/35_faillog-l-u_open_range/config/etc/gshadow
diff --git a/tests/tests/log/faillog/35_faillog-l-u_open_range/config/etc/pam.d/login b/tests/log/faillog/35_faillog-l-u_open_range/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/35_faillog-l-u_open_range/config/etc/pam.d/login
rename to tests/log/faillog/35_faillog-l-u_open_range/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/35_faillog-l-u_open_range/config/etc/passwd b/tests/log/faillog/35_faillog-l-u_open_range/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/35_faillog-l-u_open_range/config/etc/passwd
rename to tests/log/faillog/35_faillog-l-u_open_range/config/etc/passwd
diff --git a/tests/tests/log/faillog/35_faillog-l-u_open_range/config/etc/shadow b/tests/log/faillog/35_faillog-l-u_open_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/35_faillog-l-u_open_range/config/etc/shadow
rename to tests/log/faillog/35_faillog-l-u_open_range/config/etc/shadow
diff --git a/tests/tests/log/faillog/35_faillog-l-u_open_range/data/faillog.list b/tests/log/faillog/35_faillog-l-u_open_range/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/35_faillog-l-u_open_range/data/faillog.list
rename to tests/log/faillog/35_faillog-l-u_open_range/data/faillog.list
diff --git a/tests/tests/log/faillog/35_faillog-l-u_open_range/faillog.test b/tests/log/faillog/35_faillog-l-u_open_range/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/35_faillog-l-u_open_range/faillog.test
rename to tests/log/faillog/35_faillog-l-u_open_range/faillog.test
diff --git a/tests/tests/log/faillog/35_faillog-l-u_open_range/login.exp b/tests/log/faillog/35_faillog-l-u_open_range/login.exp
similarity index 100%
rename from tests/tests/log/faillog/35_faillog-l-u_open_range/login.exp
rename to tests/log/faillog/35_faillog-l-u_open_range/login.exp
diff --git a/tests/tests/log/faillog/36_faillog-l-u_range_open/config.txt b/tests/log/faillog/36_faillog-l-u_range_open/config.txt
similarity index 100%
rename from tests/tests/log/faillog/36_faillog-l-u_range_open/config.txt
rename to tests/log/faillog/36_faillog-l-u_range_open/config.txt
diff --git a/tests/tests/log/faillog/33_faillog-l-u_user/config/etc/group b/tests/log/faillog/36_faillog-l-u_range_open/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/33_faillog-l-u_user/config/etc/group
rename to tests/log/faillog/36_faillog-l-u_range_open/config/etc/group
diff --git a/tests/tests/log/faillog/33_faillog-l-u_user/config/etc/gshadow b/tests/log/faillog/36_faillog-l-u_range_open/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/33_faillog-l-u_user/config/etc/gshadow
rename to tests/log/faillog/36_faillog-l-u_range_open/config/etc/gshadow
diff --git a/tests/tests/log/faillog/36_faillog-l-u_range_open/config/etc/pam.d/login b/tests/log/faillog/36_faillog-l-u_range_open/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/36_faillog-l-u_range_open/config/etc/pam.d/login
rename to tests/log/faillog/36_faillog-l-u_range_open/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/36_faillog-l-u_range_open/config/etc/passwd b/tests/log/faillog/36_faillog-l-u_range_open/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/36_faillog-l-u_range_open/config/etc/passwd
rename to tests/log/faillog/36_faillog-l-u_range_open/config/etc/passwd
diff --git a/tests/tests/log/faillog/36_faillog-l-u_range_open/config/etc/shadow b/tests/log/faillog/36_faillog-l-u_range_open/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/36_faillog-l-u_range_open/config/etc/shadow
rename to tests/log/faillog/36_faillog-l-u_range_open/config/etc/shadow
diff --git a/tests/tests/log/faillog/36_faillog-l-u_range_open/data/faillog.list b/tests/log/faillog/36_faillog-l-u_range_open/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/36_faillog-l-u_range_open/data/faillog.list
rename to tests/log/faillog/36_faillog-l-u_range_open/data/faillog.list
diff --git a/tests/tests/log/faillog/36_faillog-l-u_range_open/faillog.test b/tests/log/faillog/36_faillog-l-u_range_open/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/36_faillog-l-u_range_open/faillog.test
rename to tests/log/faillog/36_faillog-l-u_range_open/faillog.test
diff --git a/tests/tests/log/faillog/36_faillog-l-u_range_open/login.exp b/tests/log/faillog/36_faillog-l-u_range_open/login.exp
similarity index 100%
rename from tests/tests/log/faillog/36_faillog-l-u_range_open/login.exp
rename to tests/log/faillog/36_faillog-l-u_range_open/login.exp
diff --git a/tests/tests/log/faillog/37_faillog-l-a-u_user/config.txt b/tests/log/faillog/37_faillog-l-a-u_user/config.txt
similarity index 100%
rename from tests/tests/log/faillog/37_faillog-l-a-u_user/config.txt
rename to tests/log/faillog/37_faillog-l-a-u_user/config.txt
diff --git a/tests/tests/log/faillog/34_faillog-l-u_range/config/etc/group b/tests/log/faillog/37_faillog-l-a-u_user/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/34_faillog-l-u_range/config/etc/group
rename to tests/log/faillog/37_faillog-l-a-u_user/config/etc/group
diff --git a/tests/tests/log/faillog/34_faillog-l-u_range/config/etc/gshadow b/tests/log/faillog/37_faillog-l-a-u_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/34_faillog-l-u_range/config/etc/gshadow
rename to tests/log/faillog/37_faillog-l-a-u_user/config/etc/gshadow
diff --git a/tests/tests/log/faillog/37_faillog-l-a-u_user/config/etc/pam.d/login b/tests/log/faillog/37_faillog-l-a-u_user/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/37_faillog-l-a-u_user/config/etc/pam.d/login
rename to tests/log/faillog/37_faillog-l-a-u_user/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/37_faillog-l-a-u_user/config/etc/passwd b/tests/log/faillog/37_faillog-l-a-u_user/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/37_faillog-l-a-u_user/config/etc/passwd
rename to tests/log/faillog/37_faillog-l-a-u_user/config/etc/passwd
diff --git a/tests/tests/log/faillog/37_faillog-l-a-u_user/config/etc/shadow b/tests/log/faillog/37_faillog-l-a-u_user/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/37_faillog-l-a-u_user/config/etc/shadow
rename to tests/log/faillog/37_faillog-l-a-u_user/config/etc/shadow
diff --git a/tests/tests/log/faillog/37_faillog-l-a-u_user/data/faillog.list b/tests/log/faillog/37_faillog-l-a-u_user/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/37_faillog-l-a-u_user/data/faillog.list
rename to tests/log/faillog/37_faillog-l-a-u_user/data/faillog.list
diff --git a/tests/tests/log/faillog/37_faillog-l-a-u_user/faillog.test b/tests/log/faillog/37_faillog-l-a-u_user/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/37_faillog-l-a-u_user/faillog.test
rename to tests/log/faillog/37_faillog-l-a-u_user/faillog.test
diff --git a/tests/tests/log/faillog/37_faillog-l-a-u_user/login.exp b/tests/log/faillog/37_faillog-l-a-u_user/login.exp
similarity index 100%
rename from tests/tests/log/faillog/37_faillog-l-a-u_user/login.exp
rename to tests/log/faillog/37_faillog-l-a-u_user/login.exp
diff --git a/tests/tests/log/faillog/38_faillog-l-a-u_range/config.txt b/tests/log/faillog/38_faillog-l-a-u_range/config.txt
similarity index 100%
rename from tests/tests/log/faillog/38_faillog-l-a-u_range/config.txt
rename to tests/log/faillog/38_faillog-l-a-u_range/config.txt
diff --git a/tests/tests/log/faillog/35_faillog-l-u_open_range/config/etc/group b/tests/log/faillog/38_faillog-l-a-u_range/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/35_faillog-l-u_open_range/config/etc/group
rename to tests/log/faillog/38_faillog-l-a-u_range/config/etc/group
diff --git a/tests/tests/log/faillog/35_faillog-l-u_open_range/config/etc/gshadow b/tests/log/faillog/38_faillog-l-a-u_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/35_faillog-l-u_open_range/config/etc/gshadow
rename to tests/log/faillog/38_faillog-l-a-u_range/config/etc/gshadow
diff --git a/tests/tests/log/faillog/38_faillog-l-a-u_range/config/etc/pam.d/login b/tests/log/faillog/38_faillog-l-a-u_range/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/38_faillog-l-a-u_range/config/etc/pam.d/login
rename to tests/log/faillog/38_faillog-l-a-u_range/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/38_faillog-l-a-u_range/config/etc/passwd b/tests/log/faillog/38_faillog-l-a-u_range/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/38_faillog-l-a-u_range/config/etc/passwd
rename to tests/log/faillog/38_faillog-l-a-u_range/config/etc/passwd
diff --git a/tests/tests/log/faillog/38_faillog-l-a-u_range/config/etc/shadow b/tests/log/faillog/38_faillog-l-a-u_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/38_faillog-l-a-u_range/config/etc/shadow
rename to tests/log/faillog/38_faillog-l-a-u_range/config/etc/shadow
diff --git a/tests/tests/log/faillog/38_faillog-l-a-u_range/data/faillog.list b/tests/log/faillog/38_faillog-l-a-u_range/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/38_faillog-l-a-u_range/data/faillog.list
rename to tests/log/faillog/38_faillog-l-a-u_range/data/faillog.list
diff --git a/tests/tests/log/faillog/38_faillog-l-a-u_range/faillog.test b/tests/log/faillog/38_faillog-l-a-u_range/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/38_faillog-l-a-u_range/faillog.test
rename to tests/log/faillog/38_faillog-l-a-u_range/faillog.test
diff --git a/tests/tests/log/faillog/38_faillog-l-a-u_range/login.exp b/tests/log/faillog/38_faillog-l-a-u_range/login.exp
similarity index 100%
rename from tests/tests/log/faillog/38_faillog-l-a-u_range/login.exp
rename to tests/log/faillog/38_faillog-l-a-u_range/login.exp
diff --git a/tests/tests/log/faillog/39_faillog-l-a-u_open_range/config.txt b/tests/log/faillog/39_faillog-l-a-u_open_range/config.txt
similarity index 100%
rename from tests/tests/log/faillog/39_faillog-l-a-u_open_range/config.txt
rename to tests/log/faillog/39_faillog-l-a-u_open_range/config.txt
diff --git a/tests/tests/log/faillog/36_faillog-l-u_range_open/config/etc/group b/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/36_faillog-l-u_range_open/config/etc/group
rename to tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/group
diff --git a/tests/tests/log/faillog/36_faillog-l-u_range_open/config/etc/gshadow b/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/36_faillog-l-u_range_open/config/etc/gshadow
rename to tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/gshadow
diff --git a/tests/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/pam.d/login b/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/pam.d/login
rename to tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/passwd b/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/passwd
rename to tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/passwd
diff --git a/tests/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/shadow b/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/shadow
rename to tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/shadow
diff --git a/tests/tests/log/faillog/39_faillog-l-a-u_open_range/data/faillog.list b/tests/log/faillog/39_faillog-l-a-u_open_range/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/39_faillog-l-a-u_open_range/data/faillog.list
rename to tests/log/faillog/39_faillog-l-a-u_open_range/data/faillog.list
diff --git a/tests/tests/log/faillog/39_faillog-l-a-u_open_range/faillog.test b/tests/log/faillog/39_faillog-l-a-u_open_range/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/39_faillog-l-a-u_open_range/faillog.test
rename to tests/log/faillog/39_faillog-l-a-u_open_range/faillog.test
diff --git a/tests/tests/log/faillog/39_faillog-l-a-u_open_range/login.exp b/tests/log/faillog/39_faillog-l-a-u_open_range/login.exp
similarity index 100%
rename from tests/tests/log/faillog/39_faillog-l-a-u_open_range/login.exp
rename to tests/log/faillog/39_faillog-l-a-u_open_range/login.exp
diff --git a/tests/tests/log/faillog/40_faillog-l-a-u_range_open/config.txt b/tests/log/faillog/40_faillog-l-a-u_range_open/config.txt
similarity index 100%
rename from tests/tests/log/faillog/40_faillog-l-a-u_range_open/config.txt
rename to tests/log/faillog/40_faillog-l-a-u_range_open/config.txt
diff --git a/tests/tests/log/faillog/37_faillog-l-a-u_user/config/etc/group b/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/37_faillog-l-a-u_user/config/etc/group
rename to tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/group
diff --git a/tests/tests/log/faillog/37_faillog-l-a-u_user/config/etc/gshadow b/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/37_faillog-l-a-u_user/config/etc/gshadow
rename to tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/gshadow
diff --git a/tests/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/pam.d/login b/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/pam.d/login
rename to tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/passwd b/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/passwd
rename to tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/passwd
diff --git a/tests/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/shadow b/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/shadow
rename to tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/shadow
diff --git a/tests/tests/log/faillog/40_faillog-l-a-u_range_open/data/faillog.list b/tests/log/faillog/40_faillog-l-a-u_range_open/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/40_faillog-l-a-u_range_open/data/faillog.list
rename to tests/log/faillog/40_faillog-l-a-u_range_open/data/faillog.list
diff --git a/tests/tests/log/faillog/40_faillog-l-a-u_range_open/faillog.test b/tests/log/faillog/40_faillog-l-a-u_range_open/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/40_faillog-l-a-u_range_open/faillog.test
rename to tests/log/faillog/40_faillog-l-a-u_range_open/faillog.test
diff --git a/tests/tests/log/faillog/40_faillog-l-a-u_range_open/login.exp b/tests/log/faillog/40_faillog-l-a-u_range_open/login.exp
similarity index 100%
rename from tests/tests/log/faillog/40_faillog-l-a-u_range_open/login.exp
rename to tests/log/faillog/40_faillog-l-a-u_range_open/login.exp
diff --git a/tests/tests/log/faillog/41_faillog-l_invalid/config.txt b/tests/log/faillog/41_faillog-l_invalid/config.txt
similarity index 100%
rename from tests/tests/log/faillog/41_faillog-l_invalid/config.txt
rename to tests/log/faillog/41_faillog-l_invalid/config.txt
diff --git a/tests/tests/log/faillog/38_faillog-l-a-u_range/config/etc/group b/tests/log/faillog/41_faillog-l_invalid/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/38_faillog-l-a-u_range/config/etc/group
rename to tests/log/faillog/41_faillog-l_invalid/config/etc/group
diff --git a/tests/tests/log/faillog/38_faillog-l-a-u_range/config/etc/gshadow b/tests/log/faillog/41_faillog-l_invalid/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/38_faillog-l-a-u_range/config/etc/gshadow
rename to tests/log/faillog/41_faillog-l_invalid/config/etc/gshadow
diff --git a/tests/tests/log/faillog/41_faillog-l_invalid/config/etc/passwd b/tests/log/faillog/41_faillog-l_invalid/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/41_faillog-l_invalid/config/etc/passwd
rename to tests/log/faillog/41_faillog-l_invalid/config/etc/passwd
diff --git a/tests/tests/log/faillog/41_faillog-l_invalid/config/etc/shadow b/tests/log/faillog/41_faillog-l_invalid/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/41_faillog-l_invalid/config/etc/shadow
rename to tests/log/faillog/41_faillog-l_invalid/config/etc/shadow
diff --git a/tests/tests/log/faillog/41_faillog-l_invalid/data/faillog.err b/tests/log/faillog/41_faillog-l_invalid/data/faillog.err
similarity index 100%
rename from tests/tests/log/faillog/41_faillog-l_invalid/data/faillog.err
rename to tests/log/faillog/41_faillog-l_invalid/data/faillog.err
diff --git a/tests/tests/log/faillog/41_faillog-l_invalid/faillog.test b/tests/log/faillog/41_faillog-l_invalid/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/41_faillog-l_invalid/faillog.test
rename to tests/log/faillog/41_faillog-l_invalid/faillog.test
diff --git a/tests/tests/log/faillog/42_faillog-m/config.txt b/tests/log/faillog/42_faillog-m/config.txt
similarity index 100%
rename from tests/tests/log/faillog/42_faillog-m/config.txt
rename to tests/log/faillog/42_faillog-m/config.txt
diff --git a/tests/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/group b/tests/log/faillog/42_faillog-m/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/group
rename to tests/log/faillog/42_faillog-m/config/etc/group
diff --git a/tests/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/gshadow b/tests/log/faillog/42_faillog-m/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/39_faillog-l-a-u_open_range/config/etc/gshadow
rename to tests/log/faillog/42_faillog-m/config/etc/gshadow
diff --git a/tests/tests/log/faillog/42_faillog-m/config/etc/pam.d/login b/tests/log/faillog/42_faillog-m/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/42_faillog-m/config/etc/pam.d/login
rename to tests/log/faillog/42_faillog-m/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/42_faillog-m/config/etc/passwd b/tests/log/faillog/42_faillog-m/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/42_faillog-m/config/etc/passwd
rename to tests/log/faillog/42_faillog-m/config/etc/passwd
diff --git a/tests/tests/log/faillog/42_faillog-m/config/etc/shadow b/tests/log/faillog/42_faillog-m/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/42_faillog-m/config/etc/shadow
rename to tests/log/faillog/42_faillog-m/config/etc/shadow
diff --git a/tests/tests/log/faillog/42_faillog-m/data/faillog.list b/tests/log/faillog/42_faillog-m/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/42_faillog-m/data/faillog.list
rename to tests/log/faillog/42_faillog-m/data/faillog.list
diff --git a/tests/tests/log/faillog/42_faillog-m/faillog.test b/tests/log/faillog/42_faillog-m/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/42_faillog-m/faillog.test
rename to tests/log/faillog/42_faillog-m/faillog.test
diff --git a/tests/tests/log/faillog/42_faillog-m/login.exp b/tests/log/faillog/42_faillog-m/login.exp
similarity index 100%
rename from tests/tests/log/faillog/42_faillog-m/login.exp
rename to tests/log/faillog/42_faillog-m/login.exp
diff --git a/tests/tests/log/faillog/43_faillog-m-u_user/config.txt b/tests/log/faillog/43_faillog-m-u_user/config.txt
similarity index 100%
rename from tests/tests/log/faillog/43_faillog-m-u_user/config.txt
rename to tests/log/faillog/43_faillog-m-u_user/config.txt
diff --git a/tests/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/group b/tests/log/faillog/43_faillog-m-u_user/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/group
rename to tests/log/faillog/43_faillog-m-u_user/config/etc/group
diff --git a/tests/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/gshadow b/tests/log/faillog/43_faillog-m-u_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/40_faillog-l-a-u_range_open/config/etc/gshadow
rename to tests/log/faillog/43_faillog-m-u_user/config/etc/gshadow
diff --git a/tests/tests/log/faillog/43_faillog-m-u_user/config/etc/pam.d/login b/tests/log/faillog/43_faillog-m-u_user/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/43_faillog-m-u_user/config/etc/pam.d/login
rename to tests/log/faillog/43_faillog-m-u_user/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/43_faillog-m-u_user/config/etc/passwd b/tests/log/faillog/43_faillog-m-u_user/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/43_faillog-m-u_user/config/etc/passwd
rename to tests/log/faillog/43_faillog-m-u_user/config/etc/passwd
diff --git a/tests/tests/log/faillog/43_faillog-m-u_user/config/etc/shadow b/tests/log/faillog/43_faillog-m-u_user/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/43_faillog-m-u_user/config/etc/shadow
rename to tests/log/faillog/43_faillog-m-u_user/config/etc/shadow
diff --git a/tests/tests/log/faillog/43_faillog-m-u_user/data/faillog.list b/tests/log/faillog/43_faillog-m-u_user/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/43_faillog-m-u_user/data/faillog.list
rename to tests/log/faillog/43_faillog-m-u_user/data/faillog.list
diff --git a/tests/tests/log/faillog/43_faillog-m-u_user/faillog.test b/tests/log/faillog/43_faillog-m-u_user/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/43_faillog-m-u_user/faillog.test
rename to tests/log/faillog/43_faillog-m-u_user/faillog.test
diff --git a/tests/tests/log/faillog/43_faillog-m-u_user/login.exp b/tests/log/faillog/43_faillog-m-u_user/login.exp
similarity index 100%
rename from tests/tests/log/faillog/43_faillog-m-u_user/login.exp
rename to tests/log/faillog/43_faillog-m-u_user/login.exp
diff --git a/tests/tests/log/faillog/44_faillog-m-u_range/config.txt b/tests/log/faillog/44_faillog-m-u_range/config.txt
similarity index 100%
rename from tests/tests/log/faillog/44_faillog-m-u_range/config.txt
rename to tests/log/faillog/44_faillog-m-u_range/config.txt
diff --git a/tests/tests/log/faillog/41_faillog-l_invalid/config/etc/group b/tests/log/faillog/44_faillog-m-u_range/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/41_faillog-l_invalid/config/etc/group
rename to tests/log/faillog/44_faillog-m-u_range/config/etc/group
diff --git a/tests/tests/log/faillog/41_faillog-l_invalid/config/etc/gshadow b/tests/log/faillog/44_faillog-m-u_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/41_faillog-l_invalid/config/etc/gshadow
rename to tests/log/faillog/44_faillog-m-u_range/config/etc/gshadow
diff --git a/tests/tests/log/faillog/44_faillog-m-u_range/config/etc/pam.d/login b/tests/log/faillog/44_faillog-m-u_range/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/44_faillog-m-u_range/config/etc/pam.d/login
rename to tests/log/faillog/44_faillog-m-u_range/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/44_faillog-m-u_range/config/etc/passwd b/tests/log/faillog/44_faillog-m-u_range/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/44_faillog-m-u_range/config/etc/passwd
rename to tests/log/faillog/44_faillog-m-u_range/config/etc/passwd
diff --git a/tests/tests/log/faillog/44_faillog-m-u_range/config/etc/shadow b/tests/log/faillog/44_faillog-m-u_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/44_faillog-m-u_range/config/etc/shadow
rename to tests/log/faillog/44_faillog-m-u_range/config/etc/shadow
diff --git a/tests/tests/log/faillog/44_faillog-m-u_range/data/faillog.list b/tests/log/faillog/44_faillog-m-u_range/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/44_faillog-m-u_range/data/faillog.list
rename to tests/log/faillog/44_faillog-m-u_range/data/faillog.list
diff --git a/tests/tests/log/faillog/44_faillog-m-u_range/faillog.test b/tests/log/faillog/44_faillog-m-u_range/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/44_faillog-m-u_range/faillog.test
rename to tests/log/faillog/44_faillog-m-u_range/faillog.test
diff --git a/tests/tests/log/faillog/44_faillog-m-u_range/login.exp b/tests/log/faillog/44_faillog-m-u_range/login.exp
similarity index 100%
rename from tests/tests/log/faillog/44_faillog-m-u_range/login.exp
rename to tests/log/faillog/44_faillog-m-u_range/login.exp
diff --git a/tests/tests/log/faillog/45_faillog-m-u_open_range/config.txt b/tests/log/faillog/45_faillog-m-u_open_range/config.txt
similarity index 100%
rename from tests/tests/log/faillog/45_faillog-m-u_open_range/config.txt
rename to tests/log/faillog/45_faillog-m-u_open_range/config.txt
diff --git a/tests/tests/log/faillog/42_faillog-m/config/etc/group b/tests/log/faillog/45_faillog-m-u_open_range/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/42_faillog-m/config/etc/group
rename to tests/log/faillog/45_faillog-m-u_open_range/config/etc/group
diff --git a/tests/tests/log/faillog/42_faillog-m/config/etc/gshadow b/tests/log/faillog/45_faillog-m-u_open_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/42_faillog-m/config/etc/gshadow
rename to tests/log/faillog/45_faillog-m-u_open_range/config/etc/gshadow
diff --git a/tests/tests/log/faillog/45_faillog-m-u_open_range/config/etc/pam.d/login b/tests/log/faillog/45_faillog-m-u_open_range/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/45_faillog-m-u_open_range/config/etc/pam.d/login
rename to tests/log/faillog/45_faillog-m-u_open_range/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/45_faillog-m-u_open_range/config/etc/passwd b/tests/log/faillog/45_faillog-m-u_open_range/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/45_faillog-m-u_open_range/config/etc/passwd
rename to tests/log/faillog/45_faillog-m-u_open_range/config/etc/passwd
diff --git a/tests/tests/log/faillog/45_faillog-m-u_open_range/config/etc/shadow b/tests/log/faillog/45_faillog-m-u_open_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/45_faillog-m-u_open_range/config/etc/shadow
rename to tests/log/faillog/45_faillog-m-u_open_range/config/etc/shadow
diff --git a/tests/tests/log/faillog/45_faillog-m-u_open_range/data/faillog.list b/tests/log/faillog/45_faillog-m-u_open_range/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/45_faillog-m-u_open_range/data/faillog.list
rename to tests/log/faillog/45_faillog-m-u_open_range/data/faillog.list
diff --git a/tests/tests/log/faillog/45_faillog-m-u_open_range/faillog.test b/tests/log/faillog/45_faillog-m-u_open_range/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/45_faillog-m-u_open_range/faillog.test
rename to tests/log/faillog/45_faillog-m-u_open_range/faillog.test
diff --git a/tests/tests/log/faillog/45_faillog-m-u_open_range/login.exp b/tests/log/faillog/45_faillog-m-u_open_range/login.exp
similarity index 100%
rename from tests/tests/log/faillog/45_faillog-m-u_open_range/login.exp
rename to tests/log/faillog/45_faillog-m-u_open_range/login.exp
diff --git a/tests/tests/log/faillog/46_faillog-m-u_range_open/config.txt b/tests/log/faillog/46_faillog-m-u_range_open/config.txt
similarity index 100%
rename from tests/tests/log/faillog/46_faillog-m-u_range_open/config.txt
rename to tests/log/faillog/46_faillog-m-u_range_open/config.txt
diff --git a/tests/tests/log/faillog/43_faillog-m-u_user/config/etc/group b/tests/log/faillog/46_faillog-m-u_range_open/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/43_faillog-m-u_user/config/etc/group
rename to tests/log/faillog/46_faillog-m-u_range_open/config/etc/group
diff --git a/tests/tests/log/faillog/43_faillog-m-u_user/config/etc/gshadow b/tests/log/faillog/46_faillog-m-u_range_open/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/43_faillog-m-u_user/config/etc/gshadow
rename to tests/log/faillog/46_faillog-m-u_range_open/config/etc/gshadow
diff --git a/tests/tests/log/faillog/46_faillog-m-u_range_open/config/etc/pam.d/login b/tests/log/faillog/46_faillog-m-u_range_open/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/46_faillog-m-u_range_open/config/etc/pam.d/login
rename to tests/log/faillog/46_faillog-m-u_range_open/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/46_faillog-m-u_range_open/config/etc/passwd b/tests/log/faillog/46_faillog-m-u_range_open/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/46_faillog-m-u_range_open/config/etc/passwd
rename to tests/log/faillog/46_faillog-m-u_range_open/config/etc/passwd
diff --git a/tests/tests/log/faillog/46_faillog-m-u_range_open/config/etc/shadow b/tests/log/faillog/46_faillog-m-u_range_open/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/46_faillog-m-u_range_open/config/etc/shadow
rename to tests/log/faillog/46_faillog-m-u_range_open/config/etc/shadow
diff --git a/tests/tests/log/faillog/46_faillog-m-u_range_open/data/faillog.list b/tests/log/faillog/46_faillog-m-u_range_open/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/46_faillog-m-u_range_open/data/faillog.list
rename to tests/log/faillog/46_faillog-m-u_range_open/data/faillog.list
diff --git a/tests/tests/log/faillog/46_faillog-m-u_range_open/faillog.test b/tests/log/faillog/46_faillog-m-u_range_open/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/46_faillog-m-u_range_open/faillog.test
rename to tests/log/faillog/46_faillog-m-u_range_open/faillog.test
diff --git a/tests/tests/log/faillog/46_faillog-m-u_range_open/login.exp b/tests/log/faillog/46_faillog-m-u_range_open/login.exp
similarity index 100%
rename from tests/tests/log/faillog/46_faillog-m-u_range_open/login.exp
rename to tests/log/faillog/46_faillog-m-u_range_open/login.exp
diff --git a/tests/tests/log/faillog/47_faillog-m-a-u_user/config.txt b/tests/log/faillog/47_faillog-m-a-u_user/config.txt
similarity index 100%
rename from tests/tests/log/faillog/47_faillog-m-a-u_user/config.txt
rename to tests/log/faillog/47_faillog-m-a-u_user/config.txt
diff --git a/tests/tests/log/faillog/44_faillog-m-u_range/config/etc/group b/tests/log/faillog/47_faillog-m-a-u_user/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/44_faillog-m-u_range/config/etc/group
rename to tests/log/faillog/47_faillog-m-a-u_user/config/etc/group
diff --git a/tests/tests/log/faillog/44_faillog-m-u_range/config/etc/gshadow b/tests/log/faillog/47_faillog-m-a-u_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/44_faillog-m-u_range/config/etc/gshadow
rename to tests/log/faillog/47_faillog-m-a-u_user/config/etc/gshadow
diff --git a/tests/tests/log/faillog/47_faillog-m-a-u_user/config/etc/pam.d/login b/tests/log/faillog/47_faillog-m-a-u_user/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/47_faillog-m-a-u_user/config/etc/pam.d/login
rename to tests/log/faillog/47_faillog-m-a-u_user/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/47_faillog-m-a-u_user/config/etc/passwd b/tests/log/faillog/47_faillog-m-a-u_user/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/47_faillog-m-a-u_user/config/etc/passwd
rename to tests/log/faillog/47_faillog-m-a-u_user/config/etc/passwd
diff --git a/tests/tests/log/faillog/47_faillog-m-a-u_user/config/etc/shadow b/tests/log/faillog/47_faillog-m-a-u_user/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/47_faillog-m-a-u_user/config/etc/shadow
rename to tests/log/faillog/47_faillog-m-a-u_user/config/etc/shadow
diff --git a/tests/tests/log/faillog/47_faillog-m-a-u_user/data/faillog.list b/tests/log/faillog/47_faillog-m-a-u_user/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/47_faillog-m-a-u_user/data/faillog.list
rename to tests/log/faillog/47_faillog-m-a-u_user/data/faillog.list
diff --git a/tests/tests/log/faillog/47_faillog-m-a-u_user/faillog.test b/tests/log/faillog/47_faillog-m-a-u_user/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/47_faillog-m-a-u_user/faillog.test
rename to tests/log/faillog/47_faillog-m-a-u_user/faillog.test
diff --git a/tests/tests/log/faillog/47_faillog-m-a-u_user/login.exp b/tests/log/faillog/47_faillog-m-a-u_user/login.exp
similarity index 100%
rename from tests/tests/log/faillog/47_faillog-m-a-u_user/login.exp
rename to tests/log/faillog/47_faillog-m-a-u_user/login.exp
diff --git a/tests/tests/log/faillog/48_faillog-m-a-u_range/config.txt b/tests/log/faillog/48_faillog-m-a-u_range/config.txt
similarity index 100%
rename from tests/tests/log/faillog/48_faillog-m-a-u_range/config.txt
rename to tests/log/faillog/48_faillog-m-a-u_range/config.txt
diff --git a/tests/tests/log/faillog/45_faillog-m-u_open_range/config/etc/group b/tests/log/faillog/48_faillog-m-a-u_range/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/45_faillog-m-u_open_range/config/etc/group
rename to tests/log/faillog/48_faillog-m-a-u_range/config/etc/group
diff --git a/tests/tests/log/faillog/45_faillog-m-u_open_range/config/etc/gshadow b/tests/log/faillog/48_faillog-m-a-u_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/45_faillog-m-u_open_range/config/etc/gshadow
rename to tests/log/faillog/48_faillog-m-a-u_range/config/etc/gshadow
diff --git a/tests/tests/log/faillog/48_faillog-m-a-u_range/config/etc/pam.d/login b/tests/log/faillog/48_faillog-m-a-u_range/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/48_faillog-m-a-u_range/config/etc/pam.d/login
rename to tests/log/faillog/48_faillog-m-a-u_range/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/48_faillog-m-a-u_range/config/etc/passwd b/tests/log/faillog/48_faillog-m-a-u_range/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/48_faillog-m-a-u_range/config/etc/passwd
rename to tests/log/faillog/48_faillog-m-a-u_range/config/etc/passwd
diff --git a/tests/tests/log/faillog/48_faillog-m-a-u_range/config/etc/shadow b/tests/log/faillog/48_faillog-m-a-u_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/48_faillog-m-a-u_range/config/etc/shadow
rename to tests/log/faillog/48_faillog-m-a-u_range/config/etc/shadow
diff --git a/tests/tests/log/faillog/48_faillog-m-a-u_range/data/faillog.list b/tests/log/faillog/48_faillog-m-a-u_range/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/48_faillog-m-a-u_range/data/faillog.list
rename to tests/log/faillog/48_faillog-m-a-u_range/data/faillog.list
diff --git a/tests/tests/log/faillog/48_faillog-m-a-u_range/faillog.test b/tests/log/faillog/48_faillog-m-a-u_range/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/48_faillog-m-a-u_range/faillog.test
rename to tests/log/faillog/48_faillog-m-a-u_range/faillog.test
diff --git a/tests/tests/log/faillog/48_faillog-m-a-u_range/login.exp b/tests/log/faillog/48_faillog-m-a-u_range/login.exp
similarity index 100%
rename from tests/tests/log/faillog/48_faillog-m-a-u_range/login.exp
rename to tests/log/faillog/48_faillog-m-a-u_range/login.exp
diff --git a/tests/tests/log/faillog/49_faillog-m-a-u_open_range/config.txt b/tests/log/faillog/49_faillog-m-a-u_open_range/config.txt
similarity index 100%
rename from tests/tests/log/faillog/49_faillog-m-a-u_open_range/config.txt
rename to tests/log/faillog/49_faillog-m-a-u_open_range/config.txt
diff --git a/tests/tests/log/faillog/46_faillog-m-u_range_open/config/etc/group b/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/46_faillog-m-u_range_open/config/etc/group
rename to tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/group
diff --git a/tests/tests/log/faillog/46_faillog-m-u_range_open/config/etc/gshadow b/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/46_faillog-m-u_range_open/config/etc/gshadow
rename to tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/gshadow
diff --git a/tests/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/pam.d/login b/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/pam.d/login
rename to tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/passwd b/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/passwd
rename to tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/passwd
diff --git a/tests/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/shadow b/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/shadow
rename to tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/shadow
diff --git a/tests/tests/log/faillog/49_faillog-m-a-u_open_range/data/faillog.list b/tests/log/faillog/49_faillog-m-a-u_open_range/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/49_faillog-m-a-u_open_range/data/faillog.list
rename to tests/log/faillog/49_faillog-m-a-u_open_range/data/faillog.list
diff --git a/tests/tests/log/faillog/49_faillog-m-a-u_open_range/faillog.test b/tests/log/faillog/49_faillog-m-a-u_open_range/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/49_faillog-m-a-u_open_range/faillog.test
rename to tests/log/faillog/49_faillog-m-a-u_open_range/faillog.test
diff --git a/tests/tests/log/faillog/49_faillog-m-a-u_open_range/login.exp b/tests/log/faillog/49_faillog-m-a-u_open_range/login.exp
similarity index 100%
rename from tests/tests/log/faillog/49_faillog-m-a-u_open_range/login.exp
rename to tests/log/faillog/49_faillog-m-a-u_open_range/login.exp
diff --git a/tests/tests/log/faillog/50_faillog-m-a-u_range_open/config.txt b/tests/log/faillog/50_faillog-m-a-u_range_open/config.txt
similarity index 100%
rename from tests/tests/log/faillog/50_faillog-m-a-u_range_open/config.txt
rename to tests/log/faillog/50_faillog-m-a-u_range_open/config.txt
diff --git a/tests/tests/log/faillog/47_faillog-m-a-u_user/config/etc/group b/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/47_faillog-m-a-u_user/config/etc/group
rename to tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/group
diff --git a/tests/tests/log/faillog/47_faillog-m-a-u_user/config/etc/gshadow b/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/47_faillog-m-a-u_user/config/etc/gshadow
rename to tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/gshadow
diff --git a/tests/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/pam.d/login b/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/pam.d/login
rename to tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/passwd b/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/passwd
rename to tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/passwd
diff --git a/tests/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/shadow b/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/shadow
rename to tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/shadow
diff --git a/tests/tests/log/faillog/50_faillog-m-a-u_range_open/data/faillog.list b/tests/log/faillog/50_faillog-m-a-u_range_open/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/50_faillog-m-a-u_range_open/data/faillog.list
rename to tests/log/faillog/50_faillog-m-a-u_range_open/data/faillog.list
diff --git a/tests/tests/log/faillog/50_faillog-m-a-u_range_open/faillog.test b/tests/log/faillog/50_faillog-m-a-u_range_open/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/50_faillog-m-a-u_range_open/faillog.test
rename to tests/log/faillog/50_faillog-m-a-u_range_open/faillog.test
diff --git a/tests/tests/log/faillog/50_faillog-m-a-u_range_open/login.exp b/tests/log/faillog/50_faillog-m-a-u_range_open/login.exp
similarity index 100%
rename from tests/tests/log/faillog/50_faillog-m-a-u_range_open/login.exp
rename to tests/log/faillog/50_faillog-m-a-u_range_open/login.exp
diff --git a/tests/tests/log/faillog/51_faillog-m_invalid/config.txt b/tests/log/faillog/51_faillog-m_invalid/config.txt
similarity index 100%
rename from tests/tests/log/faillog/51_faillog-m_invalid/config.txt
rename to tests/log/faillog/51_faillog-m_invalid/config.txt
diff --git a/tests/tests/log/faillog/48_faillog-m-a-u_range/config/etc/group b/tests/log/faillog/51_faillog-m_invalid/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/48_faillog-m-a-u_range/config/etc/group
rename to tests/log/faillog/51_faillog-m_invalid/config/etc/group
diff --git a/tests/tests/log/faillog/48_faillog-m-a-u_range/config/etc/gshadow b/tests/log/faillog/51_faillog-m_invalid/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/48_faillog-m-a-u_range/config/etc/gshadow
rename to tests/log/faillog/51_faillog-m_invalid/config/etc/gshadow
diff --git a/tests/tests/log/faillog/51_faillog-m_invalid/config/etc/passwd b/tests/log/faillog/51_faillog-m_invalid/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/51_faillog-m_invalid/config/etc/passwd
rename to tests/log/faillog/51_faillog-m_invalid/config/etc/passwd
diff --git a/tests/tests/log/faillog/51_faillog-m_invalid/config/etc/shadow b/tests/log/faillog/51_faillog-m_invalid/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/51_faillog-m_invalid/config/etc/shadow
rename to tests/log/faillog/51_faillog-m_invalid/config/etc/shadow
diff --git a/tests/tests/log/faillog/51_faillog-m_invalid/data/faillog.err b/tests/log/faillog/51_faillog-m_invalid/data/faillog.err
similarity index 100%
rename from tests/tests/log/faillog/51_faillog-m_invalid/data/faillog.err
rename to tests/log/faillog/51_faillog-m_invalid/data/faillog.err
diff --git a/tests/tests/log/faillog/51_faillog-m_invalid/faillog.test b/tests/log/faillog/51_faillog-m_invalid/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/51_faillog-m_invalid/faillog.test
rename to tests/log/faillog/51_faillog-m_invalid/faillog.test
diff --git a/tests/tests/log/faillog/52_faillog-t-l_exclusive/config.txt b/tests/log/faillog/52_faillog-t-l_exclusive/config.txt
similarity index 100%
rename from tests/tests/log/faillog/52_faillog-t-l_exclusive/config.txt
rename to tests/log/faillog/52_faillog-t-l_exclusive/config.txt
diff --git a/tests/tests/log/faillog/16_faillog_extra_arg/config/etc/group b/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/16_faillog_extra_arg/config/etc/group
rename to tests/log/faillog/52_faillog-t-l_exclusive/config/etc/group
diff --git a/tests/tests/log/faillog/16_faillog_extra_arg/config/etc/gshadow b/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/16_faillog_extra_arg/config/etc/gshadow
rename to tests/log/faillog/52_faillog-t-l_exclusive/config/etc/gshadow
diff --git a/tests/tests/log/faillog/16_faillog_extra_arg/config/etc/passwd b/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/16_faillog_extra_arg/config/etc/passwd
rename to tests/log/faillog/52_faillog-t-l_exclusive/config/etc/passwd
diff --git a/tests/tests/log/faillog/16_faillog_extra_arg/config/etc/shadow b/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/16_faillog_extra_arg/config/etc/shadow
rename to tests/log/faillog/52_faillog-t-l_exclusive/config/etc/shadow
diff --git a/tests/tests/log/faillog/52_faillog-t-l_exclusive/data/usage.out b/tests/log/faillog/52_faillog-t-l_exclusive/data/usage.out
similarity index 100%
rename from tests/tests/log/faillog/52_faillog-t-l_exclusive/data/usage.out
rename to tests/log/faillog/52_faillog-t-l_exclusive/data/usage.out
diff --git a/tests/tests/log/faillog/52_faillog-t-l_exclusive/faillog.test b/tests/log/faillog/52_faillog-t-l_exclusive/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/52_faillog-t-l_exclusive/faillog.test
rename to tests/log/faillog/52_faillog-t-l_exclusive/faillog.test
diff --git a/tests/tests/log/faillog/53_faillog-t-m_exclusive/config.txt b/tests/log/faillog/53_faillog-t-m_exclusive/config.txt
similarity index 100%
rename from tests/tests/log/faillog/53_faillog-t-m_exclusive/config.txt
rename to tests/log/faillog/53_faillog-t-m_exclusive/config.txt
diff --git a/tests/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/group b/tests/log/faillog/53_faillog-t-m_exclusive/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/group
rename to tests/log/faillog/53_faillog-t-m_exclusive/config/etc/group
diff --git a/tests/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/gshadow b/tests/log/faillog/53_faillog-t-m_exclusive/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/gshadow
rename to tests/log/faillog/53_faillog-t-m_exclusive/config/etc/gshadow
diff --git a/tests/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/passwd b/tests/log/faillog/53_faillog-t-m_exclusive/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/passwd
rename to tests/log/faillog/53_faillog-t-m_exclusive/config/etc/passwd
diff --git a/tests/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/shadow b/tests/log/faillog/53_faillog-t-m_exclusive/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/shadow
rename to tests/log/faillog/53_faillog-t-m_exclusive/config/etc/shadow
diff --git a/tests/tests/log/faillog/53_faillog-t-m_exclusive/data/usage.out b/tests/log/faillog/53_faillog-t-m_exclusive/data/usage.out
similarity index 100%
rename from tests/tests/log/faillog/53_faillog-t-m_exclusive/data/usage.out
rename to tests/log/faillog/53_faillog-t-m_exclusive/data/usage.out
diff --git a/tests/tests/log/faillog/53_faillog-t-m_exclusive/faillog.test b/tests/log/faillog/53_faillog-t-m_exclusive/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/53_faillog-t-m_exclusive/faillog.test
rename to tests/log/faillog/53_faillog-t-m_exclusive/faillog.test
diff --git a/tests/tests/log/faillog/54_faillog-t-r_exclusive/config.txt b/tests/log/faillog/54_faillog-t-r_exclusive/config.txt
similarity index 100%
rename from tests/tests/log/faillog/54_faillog-t-r_exclusive/config.txt
rename to tests/log/faillog/54_faillog-t-r_exclusive/config.txt
diff --git a/tests/tests/log/faillog/53_faillog-t-m_exclusive/config/etc/group b/tests/log/faillog/54_faillog-t-r_exclusive/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/53_faillog-t-m_exclusive/config/etc/group
rename to tests/log/faillog/54_faillog-t-r_exclusive/config/etc/group
diff --git a/tests/tests/log/faillog/53_faillog-t-m_exclusive/config/etc/gshadow b/tests/log/faillog/54_faillog-t-r_exclusive/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/53_faillog-t-m_exclusive/config/etc/gshadow
rename to tests/log/faillog/54_faillog-t-r_exclusive/config/etc/gshadow
diff --git a/tests/tests/log/faillog/53_faillog-t-m_exclusive/config/etc/passwd b/tests/log/faillog/54_faillog-t-r_exclusive/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/53_faillog-t-m_exclusive/config/etc/passwd
rename to tests/log/faillog/54_faillog-t-r_exclusive/config/etc/passwd
diff --git a/tests/tests/log/faillog/53_faillog-t-m_exclusive/config/etc/shadow b/tests/log/faillog/54_faillog-t-r_exclusive/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/53_faillog-t-m_exclusive/config/etc/shadow
rename to tests/log/faillog/54_faillog-t-r_exclusive/config/etc/shadow
diff --git a/tests/tests/log/faillog/54_faillog-t-r_exclusive/data/usage.out b/tests/log/faillog/54_faillog-t-r_exclusive/data/usage.out
similarity index 100%
rename from tests/tests/log/faillog/54_faillog-t-r_exclusive/data/usage.out
rename to tests/log/faillog/54_faillog-t-r_exclusive/data/usage.out
diff --git a/tests/tests/log/faillog/54_faillog-t-r_exclusive/faillog.test b/tests/log/faillog/54_faillog-t-r_exclusive/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/54_faillog-t-r_exclusive/faillog.test
rename to tests/log/faillog/54_faillog-t-r_exclusive/faillog.test
diff --git a/tests/tests/log/faillog/55_faillog_no_changes/config.txt b/tests/log/faillog/55_faillog_no_changes/config.txt
similarity index 100%
rename from tests/tests/log/faillog/55_faillog_no_changes/config.txt
rename to tests/log/faillog/55_faillog_no_changes/config.txt
diff --git a/tests/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/group b/tests/log/faillog/55_faillog_no_changes/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/group
rename to tests/log/faillog/55_faillog_no_changes/config/etc/group
diff --git a/tests/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/gshadow b/tests/log/faillog/55_faillog_no_changes/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/49_faillog-m-a-u_open_range/config/etc/gshadow
rename to tests/log/faillog/55_faillog_no_changes/config/etc/gshadow
diff --git a/tests/tests/log/faillog/55_faillog_no_changes/config/etc/pam.d/login b/tests/log/faillog/55_faillog_no_changes/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/55_faillog_no_changes/config/etc/pam.d/login
rename to tests/log/faillog/55_faillog_no_changes/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/55_faillog_no_changes/config/etc/passwd b/tests/log/faillog/55_faillog_no_changes/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/55_faillog_no_changes/config/etc/passwd
rename to tests/log/faillog/55_faillog_no_changes/config/etc/passwd
diff --git a/tests/tests/log/faillog/55_faillog_no_changes/config/etc/shadow b/tests/log/faillog/55_faillog_no_changes/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/55_faillog_no_changes/config/etc/shadow
rename to tests/log/faillog/55_faillog_no_changes/config/etc/shadow
diff --git a/tests/tests/log/faillog/55_faillog_no_changes/data/faillog.stat b/tests/log/faillog/55_faillog_no_changes/data/faillog.stat
similarity index 100%
rename from tests/tests/log/faillog/55_faillog_no_changes/data/faillog.stat
rename to tests/log/faillog/55_faillog_no_changes/data/faillog.stat
diff --git a/tests/tests/log/faillog/55_faillog_no_changes/faillog.test b/tests/log/faillog/55_faillog_no_changes/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/55_faillog_no_changes/faillog.test
rename to tests/log/faillog/55_faillog_no_changes/faillog.test
diff --git a/tests/tests/log/faillog/55_faillog_no_changes/login.exp b/tests/log/faillog/55_faillog_no_changes/login.exp
similarity index 100%
rename from tests/tests/log/faillog/55_faillog_no_changes/login.exp
rename to tests/log/faillog/55_faillog_no_changes/login.exp
diff --git a/tests/tests/log/faillog/56_faillog-l-m_empty_file/config.txt b/tests/log/faillog/56_faillog-l-m_empty_file/config.txt
similarity index 100%
rename from tests/tests/log/faillog/56_faillog-l-m_empty_file/config.txt
rename to tests/log/faillog/56_faillog-l-m_empty_file/config.txt
diff --git a/tests/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/group b/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/group
rename to tests/log/faillog/56_faillog-l-m_empty_file/config/etc/group
diff --git a/tests/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/gshadow b/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/50_faillog-m-a-u_range_open/config/etc/gshadow
rename to tests/log/faillog/56_faillog-l-m_empty_file/config/etc/gshadow
diff --git a/tests/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/pam.d/login b/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/pam.d/login
rename to tests/log/faillog/56_faillog-l-m_empty_file/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/passwd b/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/passwd
rename to tests/log/faillog/56_faillog-l-m_empty_file/config/etc/passwd
diff --git a/tests/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/shadow b/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/shadow
rename to tests/log/faillog/56_faillog-l-m_empty_file/config/etc/shadow
diff --git a/tests/tests/log/faillog/56_faillog-l-m_empty_file/data/faillog.stat b/tests/log/faillog/56_faillog-l-m_empty_file/data/faillog.stat
similarity index 100%
rename from tests/tests/log/faillog/56_faillog-l-m_empty_file/data/faillog.stat
rename to tests/log/faillog/56_faillog-l-m_empty_file/data/faillog.stat
diff --git a/tests/tests/log/faillog/56_faillog-l-m_empty_file/faillog.test b/tests/log/faillog/56_faillog-l-m_empty_file/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/56_faillog-l-m_empty_file/faillog.test
rename to tests/log/faillog/56_faillog-l-m_empty_file/faillog.test
diff --git a/tests/tests/log/faillog/57_faillog-r_empty_file/config.txt b/tests/log/faillog/57_faillog-r_empty_file/config.txt
similarity index 100%
rename from tests/tests/log/faillog/57_faillog-r_empty_file/config.txt
rename to tests/log/faillog/57_faillog-r_empty_file/config.txt
diff --git a/tests/tests/log/faillog/51_faillog-m_invalid/config/etc/group b/tests/log/faillog/57_faillog-r_empty_file/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/51_faillog-m_invalid/config/etc/group
rename to tests/log/faillog/57_faillog-r_empty_file/config/etc/group
diff --git a/tests/tests/log/faillog/51_faillog-m_invalid/config/etc/gshadow b/tests/log/faillog/57_faillog-r_empty_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/51_faillog-m_invalid/config/etc/gshadow
rename to tests/log/faillog/57_faillog-r_empty_file/config/etc/gshadow
diff --git a/tests/tests/log/faillog/57_faillog-r_empty_file/config/etc/pam.d/login b/tests/log/faillog/57_faillog-r_empty_file/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/57_faillog-r_empty_file/config/etc/pam.d/login
rename to tests/log/faillog/57_faillog-r_empty_file/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/57_faillog-r_empty_file/config/etc/passwd b/tests/log/faillog/57_faillog-r_empty_file/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/57_faillog-r_empty_file/config/etc/passwd
rename to tests/log/faillog/57_faillog-r_empty_file/config/etc/passwd
diff --git a/tests/tests/log/faillog/57_faillog-r_empty_file/config/etc/shadow b/tests/log/faillog/57_faillog-r_empty_file/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/57_faillog-r_empty_file/config/etc/shadow
rename to tests/log/faillog/57_faillog-r_empty_file/config/etc/shadow
diff --git a/tests/tests/log/faillog/57_faillog-r_empty_file/data/faillog.stat b/tests/log/faillog/57_faillog-r_empty_file/data/faillog.stat
similarity index 100%
rename from tests/tests/log/faillog/57_faillog-r_empty_file/data/faillog.stat
rename to tests/log/faillog/57_faillog-r_empty_file/data/faillog.stat
diff --git a/tests/tests/log/faillog/57_faillog-r_empty_file/faillog.test b/tests/log/faillog/57_faillog-r_empty_file/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/57_faillog-r_empty_file/faillog.test
rename to tests/log/faillog/57_faillog-r_empty_file/faillog.test
diff --git a/tests/tests/log/faillog/58_faillog-l_no_failcount/config.txt b/tests/log/faillog/58_faillog-l_no_failcount/config.txt
similarity index 100%
rename from tests/tests/log/faillog/58_faillog-l_no_failcount/config.txt
rename to tests/log/faillog/58_faillog-l_no_failcount/config.txt
diff --git a/tests/tests/log/faillog/55_faillog_no_changes/config/etc/group b/tests/log/faillog/58_faillog-l_no_failcount/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/55_faillog_no_changes/config/etc/group
rename to tests/log/faillog/58_faillog-l_no_failcount/config/etc/group
diff --git a/tests/tests/log/faillog/55_faillog_no_changes/config/etc/gshadow b/tests/log/faillog/58_faillog-l_no_failcount/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/55_faillog_no_changes/config/etc/gshadow
rename to tests/log/faillog/58_faillog-l_no_failcount/config/etc/gshadow
diff --git a/tests/tests/log/faillog/58_faillog-l_no_failcount/config/etc/pam.d/login b/tests/log/faillog/58_faillog-l_no_failcount/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/log/faillog/58_faillog-l_no_failcount/config/etc/pam.d/login
rename to tests/log/faillog/58_faillog-l_no_failcount/config/etc/pam.d/login
diff --git a/tests/tests/log/faillog/58_faillog-l_no_failcount/config/etc/passwd b/tests/log/faillog/58_faillog-l_no_failcount/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/58_faillog-l_no_failcount/config/etc/passwd
rename to tests/log/faillog/58_faillog-l_no_failcount/config/etc/passwd
diff --git a/tests/tests/log/faillog/58_faillog-l_no_failcount/config/etc/shadow b/tests/log/faillog/58_faillog-l_no_failcount/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/58_faillog-l_no_failcount/config/etc/shadow
rename to tests/log/faillog/58_faillog-l_no_failcount/config/etc/shadow
diff --git a/tests/tests/log/faillog/58_faillog-l_no_failcount/data/faillog.list b/tests/log/faillog/58_faillog-l_no_failcount/data/faillog.list
similarity index 100%
rename from tests/tests/log/faillog/58_faillog-l_no_failcount/data/faillog.list
rename to tests/log/faillog/58_faillog-l_no_failcount/data/faillog.list
diff --git a/tests/tests/log/faillog/58_faillog-l_no_failcount/faillog.test b/tests/log/faillog/58_faillog-l_no_failcount/faillog.test
similarity index 100%
rename from tests/tests/log/faillog/58_faillog-l_no_failcount/faillog.test
rename to tests/log/faillog/58_faillog-l_no_failcount/faillog.test
diff --git a/tests/tests/log/faillog/58_faillog-l_no_failcount/login.exp b/tests/log/faillog/58_faillog-l_no_failcount/login.exp
similarity index 100%
rename from tests/tests/log/faillog/58_faillog-l_no_failcount/login.exp
rename to tests/log/faillog/58_faillog-l_no_failcount/login.exp
diff --git a/tests/tests/log/lastlog/01_lastlog_no_lastlog/config.txt b/tests/log/lastlog/01_lastlog_no_lastlog/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/01_lastlog_no_lastlog/config.txt
rename to tests/log/lastlog/01_lastlog_no_lastlog/config.txt
diff --git a/tests/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/group b/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/group
rename to tests/log/lastlog/01_lastlog_no_lastlog/config/etc/group
diff --git a/tests/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/gshadow b/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/56_faillog-l-m_empty_file/config/etc/gshadow
rename to tests/log/lastlog/01_lastlog_no_lastlog/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/passwd b/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/passwd
rename to tests/log/lastlog/01_lastlog_no_lastlog/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/shadow b/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/config/etc/shadow
rename to tests/log/lastlog/01_lastlog_no_lastlog/config/etc/shadow
diff --git a/tests/tests/log/lastlog/01_lastlog_no_lastlog/data/lastlog.err b/tests/log/lastlog/01_lastlog_no_lastlog/data/lastlog.err
similarity index 100%
rename from tests/tests/log/lastlog/01_lastlog_no_lastlog/data/lastlog.err
rename to tests/log/lastlog/01_lastlog_no_lastlog/data/lastlog.err
diff --git a/tests/tests/log/lastlog/01_lastlog_no_lastlog/lastlog.test b/tests/log/lastlog/01_lastlog_no_lastlog/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/01_lastlog_no_lastlog/lastlog.test
rename to tests/log/lastlog/01_lastlog_no_lastlog/lastlog.test
diff --git a/tests/tests/log/lastlog/02_lastlog_usage/config.txt b/tests/log/lastlog/02_lastlog_usage/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/02_lastlog_usage/config.txt
rename to tests/log/lastlog/02_lastlog_usage/config.txt
diff --git a/tests/tests/log/faillog/54_faillog-t-r_exclusive/config/etc/group b/tests/log/lastlog/02_lastlog_usage/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/54_faillog-t-r_exclusive/config/etc/group
rename to tests/log/lastlog/02_lastlog_usage/config/etc/group
diff --git a/tests/tests/log/faillog/54_faillog-t-r_exclusive/config/etc/gshadow b/tests/log/lastlog/02_lastlog_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/54_faillog-t-r_exclusive/config/etc/gshadow
rename to tests/log/lastlog/02_lastlog_usage/config/etc/gshadow
diff --git a/tests/tests/log/faillog/54_faillog-t-r_exclusive/config/etc/passwd b/tests/log/lastlog/02_lastlog_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/log/faillog/54_faillog-t-r_exclusive/config/etc/passwd
rename to tests/log/lastlog/02_lastlog_usage/config/etc/passwd
diff --git a/tests/tests/log/faillog/54_faillog-t-r_exclusive/config/etc/shadow b/tests/log/lastlog/02_lastlog_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/54_faillog-t-r_exclusive/config/etc/shadow
rename to tests/log/lastlog/02_lastlog_usage/config/etc/shadow
diff --git a/tests/tests/log/lastlog/02_lastlog_usage/data/usage.out b/tests/log/lastlog/02_lastlog_usage/data/usage.out
similarity index 100%
rename from tests/tests/log/lastlog/02_lastlog_usage/data/usage.out
rename to tests/log/lastlog/02_lastlog_usage/data/usage.out
diff --git a/tests/tests/log/lastlog/02_lastlog_usage/lastlog.test b/tests/log/lastlog/02_lastlog_usage/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/02_lastlog_usage/lastlog.test
rename to tests/log/lastlog/02_lastlog_usage/lastlog.test
diff --git a/tests/tests/log/lastlog/03_lastlog_format/config.txt b/tests/log/lastlog/03_lastlog_format/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/03_lastlog_format/config.txt
rename to tests/log/lastlog/03_lastlog_format/config.txt
diff --git a/tests/tests/log/faillog/57_faillog-r_empty_file/config/etc/group b/tests/log/lastlog/03_lastlog_format/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/57_faillog-r_empty_file/config/etc/group
rename to tests/log/lastlog/03_lastlog_format/config/etc/group
diff --git a/tests/tests/log/faillog/57_faillog-r_empty_file/config/etc/gshadow b/tests/log/lastlog/03_lastlog_format/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/57_faillog-r_empty_file/config/etc/gshadow
rename to tests/log/lastlog/03_lastlog_format/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/03_lastlog_format/config/etc/passwd b/tests/log/lastlog/03_lastlog_format/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/03_lastlog_format/config/etc/passwd
rename to tests/log/lastlog/03_lastlog_format/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/shadow b/tests/log/lastlog/03_lastlog_format/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/config/etc/shadow
rename to tests/log/lastlog/03_lastlog_format/config/etc/shadow
diff --git a/tests/tests/log/lastlog/03_lastlog_format/data/lastlog.out b/tests/log/lastlog/03_lastlog_format/data/lastlog.out
similarity index 100%
rename from tests/tests/log/lastlog/03_lastlog_format/data/lastlog.out
rename to tests/log/lastlog/03_lastlog_format/data/lastlog.out
diff --git a/tests/tests/log/lastlog/03_lastlog_format/lastlog.test b/tests/log/lastlog/03_lastlog_format/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/03_lastlog_format/lastlog.test
rename to tests/log/lastlog/03_lastlog_format/lastlog.test
diff --git a/tests/tests/log/lastlog/03_lastlog_format/login.exp b/tests/log/lastlog/03_lastlog_format/login.exp
similarity index 100%
rename from tests/tests/log/lastlog/03_lastlog_format/login.exp
rename to tests/log/lastlog/03_lastlog_format/login.exp
diff --git a/tests/tests/log/lastlog/04_lastlog_multiple/config.txt b/tests/log/lastlog/04_lastlog_multiple/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/04_lastlog_multiple/config.txt
rename to tests/log/lastlog/04_lastlog_multiple/config.txt
diff --git a/tests/tests/log/faillog/58_faillog-l_no_failcount/config/etc/group b/tests/log/lastlog/04_lastlog_multiple/config/etc/group
similarity index 100%
rename from tests/tests/log/faillog/58_faillog-l_no_failcount/config/etc/group
rename to tests/log/lastlog/04_lastlog_multiple/config/etc/group
diff --git a/tests/tests/log/faillog/58_faillog-l_no_failcount/config/etc/gshadow b/tests/log/lastlog/04_lastlog_multiple/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/faillog/58_faillog-l_no_failcount/config/etc/gshadow
rename to tests/log/lastlog/04_lastlog_multiple/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/04_lastlog_multiple/config/etc/passwd b/tests/log/lastlog/04_lastlog_multiple/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/04_lastlog_multiple/config/etc/passwd
rename to tests/log/lastlog/04_lastlog_multiple/config/etc/passwd
diff --git a/tests/tests/log/lastlog/04_lastlog_multiple/config/etc/shadow b/tests/log/lastlog/04_lastlog_multiple/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/04_lastlog_multiple/config/etc/shadow
rename to tests/log/lastlog/04_lastlog_multiple/config/etc/shadow
diff --git a/tests/tests/log/lastlog/04_lastlog_multiple/data/lastlog.list b/tests/log/lastlog/04_lastlog_multiple/data/lastlog.list
similarity index 100%
rename from tests/tests/log/lastlog/04_lastlog_multiple/data/lastlog.list
rename to tests/log/lastlog/04_lastlog_multiple/data/lastlog.list
diff --git a/tests/tests/log/lastlog/04_lastlog_multiple/lastlog.test b/tests/log/lastlog/04_lastlog_multiple/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/04_lastlog_multiple/lastlog.test
rename to tests/log/lastlog/04_lastlog_multiple/lastlog.test
diff --git a/tests/tests/log/lastlog/04_lastlog_multiple/login.exp b/tests/log/lastlog/04_lastlog_multiple/login.exp
similarity index 100%
rename from tests/tests/log/lastlog/04_lastlog_multiple/login.exp
rename to tests/log/lastlog/04_lastlog_multiple/login.exp
diff --git a/tests/tests/log/lastlog/05_lastlog-u_ID/config.txt b/tests/log/lastlog/05_lastlog-u_ID/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/05_lastlog-u_ID/config.txt
rename to tests/log/lastlog/05_lastlog-u_ID/config.txt
diff --git a/tests/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/group b/tests/log/lastlog/05_lastlog-u_ID/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/group
rename to tests/log/lastlog/05_lastlog-u_ID/config/etc/group
diff --git a/tests/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/gshadow b/tests/log/lastlog/05_lastlog-u_ID/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/gshadow
rename to tests/log/lastlog/05_lastlog-u_ID/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/05_lastlog-u_ID/config/etc/passwd b/tests/log/lastlog/05_lastlog-u_ID/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/05_lastlog-u_ID/config/etc/passwd
rename to tests/log/lastlog/05_lastlog-u_ID/config/etc/passwd
diff --git a/tests/tests/log/lastlog/05_lastlog-u_ID/config/etc/shadow b/tests/log/lastlog/05_lastlog-u_ID/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/05_lastlog-u_ID/config/etc/shadow
rename to tests/log/lastlog/05_lastlog-u_ID/config/etc/shadow
diff --git a/tests/tests/log/lastlog/05_lastlog-u_ID/data/lastlog.list b/tests/log/lastlog/05_lastlog-u_ID/data/lastlog.list
similarity index 100%
rename from tests/tests/log/lastlog/05_lastlog-u_ID/data/lastlog.list
rename to tests/log/lastlog/05_lastlog-u_ID/data/lastlog.list
diff --git a/tests/tests/log/lastlog/05_lastlog-u_ID/lastlog.test b/tests/log/lastlog/05_lastlog-u_ID/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/05_lastlog-u_ID/lastlog.test
rename to tests/log/lastlog/05_lastlog-u_ID/lastlog.test
diff --git a/tests/tests/log/lastlog/06_lastlog-u_name/config.txt b/tests/log/lastlog/06_lastlog-u_name/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/06_lastlog-u_name/config.txt
rename to tests/log/lastlog/06_lastlog-u_name/config.txt
diff --git a/tests/tests/log/lastlog/03_lastlog_format/config/etc/group b/tests/log/lastlog/06_lastlog-u_name/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/03_lastlog_format/config/etc/group
rename to tests/log/lastlog/06_lastlog-u_name/config/etc/group
diff --git a/tests/tests/log/lastlog/03_lastlog_format/config/etc/gshadow b/tests/log/lastlog/06_lastlog-u_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/03_lastlog_format/config/etc/gshadow
rename to tests/log/lastlog/06_lastlog-u_name/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/06_lastlog-u_name/config/etc/passwd b/tests/log/lastlog/06_lastlog-u_name/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/06_lastlog-u_name/config/etc/passwd
rename to tests/log/lastlog/06_lastlog-u_name/config/etc/passwd
diff --git a/tests/tests/log/lastlog/06_lastlog-u_name/config/etc/shadow b/tests/log/lastlog/06_lastlog-u_name/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/06_lastlog-u_name/config/etc/shadow
rename to tests/log/lastlog/06_lastlog-u_name/config/etc/shadow
diff --git a/tests/tests/log/lastlog/06_lastlog-u_name/data/lastlog.list b/tests/log/lastlog/06_lastlog-u_name/data/lastlog.list
similarity index 100%
rename from tests/tests/log/lastlog/06_lastlog-u_name/data/lastlog.list
rename to tests/log/lastlog/06_lastlog-u_name/data/lastlog.list
diff --git a/tests/tests/log/lastlog/06_lastlog-u_name/lastlog.test b/tests/log/lastlog/06_lastlog-u_name/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/06_lastlog-u_name/lastlog.test
rename to tests/log/lastlog/06_lastlog-u_name/lastlog.test
diff --git a/tests/tests/log/lastlog/07_lastlog-u_ID_invalid/config.txt b/tests/log/lastlog/07_lastlog-u_ID_invalid/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/07_lastlog-u_ID_invalid/config.txt
rename to tests/log/lastlog/07_lastlog-u_ID_invalid/config.txt
diff --git a/tests/tests/log/lastlog/04_lastlog_multiple/config/etc/group b/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/04_lastlog_multiple/config/etc/group
rename to tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/group
diff --git a/tests/tests/log/lastlog/04_lastlog_multiple/config/etc/gshadow b/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/04_lastlog_multiple/config/etc/gshadow
rename to tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/passwd b/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/passwd
rename to tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/passwd
diff --git a/tests/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/shadow b/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/shadow
rename to tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/shadow
diff --git a/tests/tests/log/lastlog/07_lastlog-u_ID_invalid/data/lastlog.list b/tests/log/lastlog/07_lastlog-u_ID_invalid/data/lastlog.list
similarity index 100%
rename from tests/tests/log/lastlog/07_lastlog-u_ID_invalid/data/lastlog.list
rename to tests/log/lastlog/07_lastlog-u_ID_invalid/data/lastlog.list
diff --git a/tests/tests/log/lastlog/07_lastlog-u_ID_invalid/lastlog.test b/tests/log/lastlog/07_lastlog-u_ID_invalid/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/07_lastlog-u_ID_invalid/lastlog.test
rename to tests/log/lastlog/07_lastlog-u_ID_invalid/lastlog.test
diff --git a/tests/tests/log/lastlog/08_lastlog-u_name_invalid/config.txt b/tests/log/lastlog/08_lastlog-u_name_invalid/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/08_lastlog-u_name_invalid/config.txt
rename to tests/log/lastlog/08_lastlog-u_name_invalid/config.txt
diff --git a/tests/tests/log/lastlog/05_lastlog-u_ID/config/etc/group b/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/05_lastlog-u_ID/config/etc/group
rename to tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/group
diff --git a/tests/tests/log/lastlog/05_lastlog-u_ID/config/etc/gshadow b/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/05_lastlog-u_ID/config/etc/gshadow
rename to tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/passwd b/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/passwd
rename to tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/passwd
diff --git a/tests/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/shadow b/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/shadow
rename to tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/shadow
diff --git a/tests/tests/log/lastlog/08_lastlog-u_name_invalid/data/lastlog.err b/tests/log/lastlog/08_lastlog-u_name_invalid/data/lastlog.err
similarity index 100%
rename from tests/tests/log/lastlog/08_lastlog-u_name_invalid/data/lastlog.err
rename to tests/log/lastlog/08_lastlog-u_name_invalid/data/lastlog.err
diff --git a/tests/tests/log/lastlog/08_lastlog-u_name_invalid/lastlog.test b/tests/log/lastlog/08_lastlog-u_name_invalid/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/08_lastlog-u_name_invalid/lastlog.test
rename to tests/log/lastlog/08_lastlog-u_name_invalid/lastlog.test
diff --git a/tests/tests/log/lastlog/09_lastlog-u_range/config.txt b/tests/log/lastlog/09_lastlog-u_range/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/09_lastlog-u_range/config.txt
rename to tests/log/lastlog/09_lastlog-u_range/config.txt
diff --git a/tests/tests/log/lastlog/06_lastlog-u_name/config/etc/group b/tests/log/lastlog/09_lastlog-u_range/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/06_lastlog-u_name/config/etc/group
rename to tests/log/lastlog/09_lastlog-u_range/config/etc/group
diff --git a/tests/tests/log/lastlog/06_lastlog-u_name/config/etc/gshadow b/tests/log/lastlog/09_lastlog-u_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/06_lastlog-u_name/config/etc/gshadow
rename to tests/log/lastlog/09_lastlog-u_range/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/09_lastlog-u_range/config/etc/passwd b/tests/log/lastlog/09_lastlog-u_range/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/09_lastlog-u_range/config/etc/passwd
rename to tests/log/lastlog/09_lastlog-u_range/config/etc/passwd
diff --git a/tests/tests/log/lastlog/09_lastlog-u_range/config/etc/shadow b/tests/log/lastlog/09_lastlog-u_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/09_lastlog-u_range/config/etc/shadow
rename to tests/log/lastlog/09_lastlog-u_range/config/etc/shadow
diff --git a/tests/tests/log/lastlog/09_lastlog-u_range/data/lastlog.list b/tests/log/lastlog/09_lastlog-u_range/data/lastlog.list
similarity index 100%
rename from tests/tests/log/lastlog/09_lastlog-u_range/data/lastlog.list
rename to tests/log/lastlog/09_lastlog-u_range/data/lastlog.list
diff --git a/tests/tests/log/lastlog/09_lastlog-u_range/lastlog.test b/tests/log/lastlog/09_lastlog-u_range/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/09_lastlog-u_range/lastlog.test
rename to tests/log/lastlog/09_lastlog-u_range/lastlog.test
diff --git a/tests/tests/log/lastlog/10_lastlog-u_open_range/config.txt b/tests/log/lastlog/10_lastlog-u_open_range/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/10_lastlog-u_open_range/config.txt
rename to tests/log/lastlog/10_lastlog-u_open_range/config.txt
diff --git a/tests/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/group b/tests/log/lastlog/10_lastlog-u_open_range/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/group
rename to tests/log/lastlog/10_lastlog-u_open_range/config/etc/group
diff --git a/tests/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/gshadow b/tests/log/lastlog/10_lastlog-u_open_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/gshadow
rename to tests/log/lastlog/10_lastlog-u_open_range/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/10_lastlog-u_open_range/config/etc/passwd b/tests/log/lastlog/10_lastlog-u_open_range/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/10_lastlog-u_open_range/config/etc/passwd
rename to tests/log/lastlog/10_lastlog-u_open_range/config/etc/passwd
diff --git a/tests/tests/log/lastlog/10_lastlog-u_open_range/config/etc/shadow b/tests/log/lastlog/10_lastlog-u_open_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/10_lastlog-u_open_range/config/etc/shadow
rename to tests/log/lastlog/10_lastlog-u_open_range/config/etc/shadow
diff --git a/tests/tests/log/lastlog/10_lastlog-u_open_range/data/lastlog.list b/tests/log/lastlog/10_lastlog-u_open_range/data/lastlog.list
similarity index 100%
rename from tests/tests/log/lastlog/10_lastlog-u_open_range/data/lastlog.list
rename to tests/log/lastlog/10_lastlog-u_open_range/data/lastlog.list
diff --git a/tests/tests/log/lastlog/10_lastlog-u_open_range/lastlog.test b/tests/log/lastlog/10_lastlog-u_open_range/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/10_lastlog-u_open_range/lastlog.test
rename to tests/log/lastlog/10_lastlog-u_open_range/lastlog.test
diff --git a/tests/tests/log/lastlog/11_lastlog-u_range_open/config.txt b/tests/log/lastlog/11_lastlog-u_range_open/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/11_lastlog-u_range_open/config.txt
rename to tests/log/lastlog/11_lastlog-u_range_open/config.txt
diff --git a/tests/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/group b/tests/log/lastlog/11_lastlog-u_range_open/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/group
rename to tests/log/lastlog/11_lastlog-u_range_open/config/etc/group
diff --git a/tests/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/gshadow b/tests/log/lastlog/11_lastlog-u_range_open/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/gshadow
rename to tests/log/lastlog/11_lastlog-u_range_open/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/11_lastlog-u_range_open/config/etc/passwd b/tests/log/lastlog/11_lastlog-u_range_open/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/11_lastlog-u_range_open/config/etc/passwd
rename to tests/log/lastlog/11_lastlog-u_range_open/config/etc/passwd
diff --git a/tests/tests/log/lastlog/11_lastlog-u_range_open/config/etc/shadow b/tests/log/lastlog/11_lastlog-u_range_open/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/11_lastlog-u_range_open/config/etc/shadow
rename to tests/log/lastlog/11_lastlog-u_range_open/config/etc/shadow
diff --git a/tests/tests/log/lastlog/11_lastlog-u_range_open/data/lastlog.list b/tests/log/lastlog/11_lastlog-u_range_open/data/lastlog.list
similarity index 100%
rename from tests/tests/log/lastlog/11_lastlog-u_range_open/data/lastlog.list
rename to tests/log/lastlog/11_lastlog-u_range_open/data/lastlog.list
diff --git a/tests/tests/log/lastlog/11_lastlog-u_range_open/lastlog.test b/tests/log/lastlog/11_lastlog-u_range_open/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/11_lastlog-u_range_open/lastlog.test
rename to tests/log/lastlog/11_lastlog-u_range_open/lastlog.test
diff --git a/tests/tests/log/lastlog/12_lastlog-u_range_invalid1/config.txt b/tests/log/lastlog/12_lastlog-u_range_invalid1/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/12_lastlog-u_range_invalid1/config.txt
rename to tests/log/lastlog/12_lastlog-u_range_invalid1/config.txt
diff --git a/tests/tests/log/lastlog/09_lastlog-u_range/config/etc/group b/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/09_lastlog-u_range/config/etc/group
rename to tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/group
diff --git a/tests/tests/log/lastlog/09_lastlog-u_range/config/etc/gshadow b/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/09_lastlog-u_range/config/etc/gshadow
rename to tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/passwd b/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/passwd
rename to tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/passwd
diff --git a/tests/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/shadow b/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/shadow
rename to tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/shadow
diff --git a/tests/tests/log/lastlog/12_lastlog-u_range_invalid1/data/lastlog.err b/tests/log/lastlog/12_lastlog-u_range_invalid1/data/lastlog.err
similarity index 100%
rename from tests/tests/log/lastlog/12_lastlog-u_range_invalid1/data/lastlog.err
rename to tests/log/lastlog/12_lastlog-u_range_invalid1/data/lastlog.err
diff --git a/tests/tests/log/lastlog/12_lastlog-u_range_invalid1/lastlog.test b/tests/log/lastlog/12_lastlog-u_range_invalid1/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/12_lastlog-u_range_invalid1/lastlog.test
rename to tests/log/lastlog/12_lastlog-u_range_invalid1/lastlog.test
diff --git a/tests/tests/log/lastlog/13_lastlog-u_range_invalid2/config.txt b/tests/log/lastlog/13_lastlog-u_range_invalid2/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/13_lastlog-u_range_invalid2/config.txt
rename to tests/log/lastlog/13_lastlog-u_range_invalid2/config.txt
diff --git a/tests/tests/log/lastlog/10_lastlog-u_open_range/config/etc/group b/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/10_lastlog-u_open_range/config/etc/group
rename to tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/group
diff --git a/tests/tests/log/lastlog/10_lastlog-u_open_range/config/etc/gshadow b/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/10_lastlog-u_open_range/config/etc/gshadow
rename to tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/passwd b/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/passwd
rename to tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/passwd
diff --git a/tests/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/shadow b/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/shadow
rename to tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/shadow
diff --git a/tests/tests/log/lastlog/13_lastlog-u_range_invalid2/data/lastlog.err b/tests/log/lastlog/13_lastlog-u_range_invalid2/data/lastlog.err
similarity index 100%
rename from tests/tests/log/lastlog/13_lastlog-u_range_invalid2/data/lastlog.err
rename to tests/log/lastlog/13_lastlog-u_range_invalid2/data/lastlog.err
diff --git a/tests/tests/log/lastlog/13_lastlog-u_range_invalid2/lastlog.test b/tests/log/lastlog/13_lastlog-u_range_invalid2/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/13_lastlog-u_range_invalid2/lastlog.test
rename to tests/log/lastlog/13_lastlog-u_range_invalid2/lastlog.test
diff --git a/tests/tests/log/lastlog/14_lastlog-u_range_invalid3/config.txt b/tests/log/lastlog/14_lastlog-u_range_invalid3/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/14_lastlog-u_range_invalid3/config.txt
rename to tests/log/lastlog/14_lastlog-u_range_invalid3/config.txt
diff --git a/tests/tests/log/lastlog/11_lastlog-u_range_open/config/etc/group b/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/11_lastlog-u_range_open/config/etc/group
rename to tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/group
diff --git a/tests/tests/log/lastlog/11_lastlog-u_range_open/config/etc/gshadow b/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/11_lastlog-u_range_open/config/etc/gshadow
rename to tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/passwd b/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/passwd
rename to tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/passwd
diff --git a/tests/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/shadow b/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/shadow
rename to tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/shadow
diff --git a/tests/tests/log/lastlog/14_lastlog-u_range_invalid3/data/lastlog.err b/tests/log/lastlog/14_lastlog-u_range_invalid3/data/lastlog.err
similarity index 100%
rename from tests/tests/log/lastlog/14_lastlog-u_range_invalid3/data/lastlog.err
rename to tests/log/lastlog/14_lastlog-u_range_invalid3/data/lastlog.err
diff --git a/tests/tests/log/lastlog/14_lastlog-u_range_invalid3/lastlog.test b/tests/log/lastlog/14_lastlog-u_range_invalid3/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/14_lastlog-u_range_invalid3/lastlog.test
rename to tests/log/lastlog/14_lastlog-u_range_invalid3/lastlog.test
diff --git a/tests/tests/log/lastlog/15_lastlog_bad_option/config.txt b/tests/log/lastlog/15_lastlog_bad_option/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/15_lastlog_bad_option/config.txt
rename to tests/log/lastlog/15_lastlog_bad_option/config.txt
diff --git a/tests/tests/log/lastlog/02_lastlog_usage/config/etc/group b/tests/log/lastlog/15_lastlog_bad_option/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/02_lastlog_usage/config/etc/group
rename to tests/log/lastlog/15_lastlog_bad_option/config/etc/group
diff --git a/tests/tests/log/lastlog/02_lastlog_usage/config/etc/gshadow b/tests/log/lastlog/15_lastlog_bad_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/02_lastlog_usage/config/etc/gshadow
rename to tests/log/lastlog/15_lastlog_bad_option/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/02_lastlog_usage/config/etc/passwd b/tests/log/lastlog/15_lastlog_bad_option/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/02_lastlog_usage/config/etc/passwd
rename to tests/log/lastlog/15_lastlog_bad_option/config/etc/passwd
diff --git a/tests/tests/log/lastlog/02_lastlog_usage/config/etc/shadow b/tests/log/lastlog/15_lastlog_bad_option/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/02_lastlog_usage/config/etc/shadow
rename to tests/log/lastlog/15_lastlog_bad_option/config/etc/shadow
diff --git a/tests/tests/log/lastlog/15_lastlog_bad_option/data/usage.out b/tests/log/lastlog/15_lastlog_bad_option/data/usage.out
similarity index 100%
rename from tests/tests/log/lastlog/15_lastlog_bad_option/data/usage.out
rename to tests/log/lastlog/15_lastlog_bad_option/data/usage.out
diff --git a/tests/tests/log/lastlog/15_lastlog_bad_option/lastlog.test b/tests/log/lastlog/15_lastlog_bad_option/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/15_lastlog_bad_option/lastlog.test
rename to tests/log/lastlog/15_lastlog_bad_option/lastlog.test
diff --git a/tests/tests/log/lastlog/16_lastlog_extra_arg/config.txt b/tests/log/lastlog/16_lastlog_extra_arg/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/16_lastlog_extra_arg/config.txt
rename to tests/log/lastlog/16_lastlog_extra_arg/config.txt
diff --git a/tests/tests/log/lastlog/15_lastlog_bad_option/config/etc/group b/tests/log/lastlog/16_lastlog_extra_arg/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/15_lastlog_bad_option/config/etc/group
rename to tests/log/lastlog/16_lastlog_extra_arg/config/etc/group
diff --git a/tests/tests/log/lastlog/15_lastlog_bad_option/config/etc/gshadow b/tests/log/lastlog/16_lastlog_extra_arg/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/15_lastlog_bad_option/config/etc/gshadow
rename to tests/log/lastlog/16_lastlog_extra_arg/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/15_lastlog_bad_option/config/etc/passwd b/tests/log/lastlog/16_lastlog_extra_arg/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/15_lastlog_bad_option/config/etc/passwd
rename to tests/log/lastlog/16_lastlog_extra_arg/config/etc/passwd
diff --git a/tests/tests/log/lastlog/15_lastlog_bad_option/config/etc/shadow b/tests/log/lastlog/16_lastlog_extra_arg/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/15_lastlog_bad_option/config/etc/shadow
rename to tests/log/lastlog/16_lastlog_extra_arg/config/etc/shadow
diff --git a/tests/tests/log/lastlog/16_lastlog_extra_arg/data/usage.out b/tests/log/lastlog/16_lastlog_extra_arg/data/usage.out
similarity index 100%
rename from tests/tests/log/lastlog/16_lastlog_extra_arg/data/usage.out
rename to tests/log/lastlog/16_lastlog_extra_arg/data/usage.out
diff --git a/tests/tests/log/lastlog/16_lastlog_extra_arg/lastlog.test b/tests/log/lastlog/16_lastlog_extra_arg/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/16_lastlog_extra_arg/lastlog.test
rename to tests/log/lastlog/16_lastlog_extra_arg/lastlog.test
diff --git a/tests/tests/log/lastlog/17_lastlog-t/config.txt b/tests/log/lastlog/17_lastlog-t/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/17_lastlog-t/config.txt
rename to tests/log/lastlog/17_lastlog-t/config.txt
diff --git a/tests/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/group b/tests/log/lastlog/17_lastlog-t/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/group
rename to tests/log/lastlog/17_lastlog-t/config/etc/group
diff --git a/tests/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/gshadow b/tests/log/lastlog/17_lastlog-t/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/gshadow
rename to tests/log/lastlog/17_lastlog-t/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/17_lastlog-t/config/etc/passwd b/tests/log/lastlog/17_lastlog-t/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/17_lastlog-t/config/etc/passwd
rename to tests/log/lastlog/17_lastlog-t/config/etc/passwd
diff --git a/tests/tests/log/lastlog/17_lastlog-t/config/etc/shadow b/tests/log/lastlog/17_lastlog-t/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/17_lastlog-t/config/etc/shadow
rename to tests/log/lastlog/17_lastlog-t/config/etc/shadow
diff --git a/tests/tests/log/lastlog/17_lastlog-t/data/lastlog.list b/tests/log/lastlog/17_lastlog-t/data/lastlog.list
similarity index 100%
rename from tests/tests/log/lastlog/17_lastlog-t/data/lastlog.list
rename to tests/log/lastlog/17_lastlog-t/data/lastlog.list
diff --git a/tests/tests/log/lastlog/17_lastlog-t/lastlog.test b/tests/log/lastlog/17_lastlog-t/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/17_lastlog-t/lastlog.test
rename to tests/log/lastlog/17_lastlog-t/lastlog.test
diff --git a/tests/tests/log/lastlog/17_lastlog-t/login.exp b/tests/log/lastlog/17_lastlog-t/login.exp
similarity index 100%
rename from tests/tests/log/lastlog/17_lastlog-t/login.exp
rename to tests/log/lastlog/17_lastlog-t/login.exp
diff --git a/tests/tests/log/lastlog/18_lastlog-b/config.txt b/tests/log/lastlog/18_lastlog-b/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/18_lastlog-b/config.txt
rename to tests/log/lastlog/18_lastlog-b/config.txt
diff --git a/tests/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/group b/tests/log/lastlog/18_lastlog-b/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/group
rename to tests/log/lastlog/18_lastlog-b/config/etc/group
diff --git a/tests/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/gshadow b/tests/log/lastlog/18_lastlog-b/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/gshadow
rename to tests/log/lastlog/18_lastlog-b/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/18_lastlog-b/config/etc/passwd b/tests/log/lastlog/18_lastlog-b/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/18_lastlog-b/config/etc/passwd
rename to tests/log/lastlog/18_lastlog-b/config/etc/passwd
diff --git a/tests/tests/log/lastlog/18_lastlog-b/config/etc/shadow b/tests/log/lastlog/18_lastlog-b/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/18_lastlog-b/config/etc/shadow
rename to tests/log/lastlog/18_lastlog-b/config/etc/shadow
diff --git a/tests/tests/log/lastlog/18_lastlog-b/data/lastlog.list b/tests/log/lastlog/18_lastlog-b/data/lastlog.list
similarity index 100%
rename from tests/tests/log/lastlog/18_lastlog-b/data/lastlog.list
rename to tests/log/lastlog/18_lastlog-b/data/lastlog.list
diff --git a/tests/tests/log/lastlog/18_lastlog-b/lastlog.test b/tests/log/lastlog/18_lastlog-b/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/18_lastlog-b/lastlog.test
rename to tests/log/lastlog/18_lastlog-b/lastlog.test
diff --git a/tests/tests/log/lastlog/18_lastlog-b/login.exp b/tests/log/lastlog/18_lastlog-b/login.exp
similarity index 100%
rename from tests/tests/log/lastlog/18_lastlog-b/login.exp
rename to tests/log/lastlog/18_lastlog-b/login.exp
diff --git a/tests/tests/log/lastlog/19_lastlog-t_invalid/config.txt b/tests/log/lastlog/19_lastlog-t_invalid/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/19_lastlog-t_invalid/config.txt
rename to tests/log/lastlog/19_lastlog-t_invalid/config.txt
diff --git a/tests/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/group b/tests/log/lastlog/19_lastlog-t_invalid/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/group
rename to tests/log/lastlog/19_lastlog-t_invalid/config/etc/group
diff --git a/tests/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/gshadow b/tests/log/lastlog/19_lastlog-t_invalid/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/gshadow
rename to tests/log/lastlog/19_lastlog-t_invalid/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/19_lastlog-t_invalid/config/etc/passwd b/tests/log/lastlog/19_lastlog-t_invalid/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/19_lastlog-t_invalid/config/etc/passwd
rename to tests/log/lastlog/19_lastlog-t_invalid/config/etc/passwd
diff --git a/tests/tests/log/lastlog/19_lastlog-t_invalid/config/etc/shadow b/tests/log/lastlog/19_lastlog-t_invalid/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/19_lastlog-t_invalid/config/etc/shadow
rename to tests/log/lastlog/19_lastlog-t_invalid/config/etc/shadow
diff --git a/tests/tests/log/lastlog/19_lastlog-t_invalid/data/lastlog.err b/tests/log/lastlog/19_lastlog-t_invalid/data/lastlog.err
similarity index 100%
rename from tests/tests/log/lastlog/19_lastlog-t_invalid/data/lastlog.err
rename to tests/log/lastlog/19_lastlog-t_invalid/data/lastlog.err
diff --git a/tests/tests/log/lastlog/19_lastlog-t_invalid/lastlog.test b/tests/log/lastlog/19_lastlog-t_invalid/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/19_lastlog-t_invalid/lastlog.test
rename to tests/log/lastlog/19_lastlog-t_invalid/lastlog.test
diff --git a/tests/tests/log/lastlog/20_lastlog-b_invalid/config.txt b/tests/log/lastlog/20_lastlog-b_invalid/config.txt
similarity index 100%
rename from tests/tests/log/lastlog/20_lastlog-b_invalid/config.txt
rename to tests/log/lastlog/20_lastlog-b_invalid/config.txt
diff --git a/tests/tests/log/lastlog/17_lastlog-t/config/etc/group b/tests/log/lastlog/20_lastlog-b_invalid/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/17_lastlog-t/config/etc/group
rename to tests/log/lastlog/20_lastlog-b_invalid/config/etc/group
diff --git a/tests/tests/log/lastlog/17_lastlog-t/config/etc/gshadow b/tests/log/lastlog/20_lastlog-b_invalid/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/17_lastlog-t/config/etc/gshadow
rename to tests/log/lastlog/20_lastlog-b_invalid/config/etc/gshadow
diff --git a/tests/tests/log/lastlog/20_lastlog-b_invalid/config/etc/passwd b/tests/log/lastlog/20_lastlog-b_invalid/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/20_lastlog-b_invalid/config/etc/passwd
rename to tests/log/lastlog/20_lastlog-b_invalid/config/etc/passwd
diff --git a/tests/tests/log/lastlog/20_lastlog-b_invalid/config/etc/shadow b/tests/log/lastlog/20_lastlog-b_invalid/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/20_lastlog-b_invalid/config/etc/shadow
rename to tests/log/lastlog/20_lastlog-b_invalid/config/etc/shadow
diff --git a/tests/tests/log/lastlog/20_lastlog-b_invalid/data/lastlog.err b/tests/log/lastlog/20_lastlog-b_invalid/data/lastlog.err
similarity index 100%
rename from tests/tests/log/lastlog/20_lastlog-b_invalid/data/lastlog.err
rename to tests/log/lastlog/20_lastlog-b_invalid/data/lastlog.err
diff --git a/tests/tests/log/lastlog/20_lastlog-b_invalid/lastlog.test b/tests/log/lastlog/20_lastlog-b_invalid/lastlog.test
similarity index 100%
rename from tests/tests/log/lastlog/20_lastlog-b_invalid/lastlog.test
rename to tests/log/lastlog/20_lastlog-b_invalid/lastlog.test
diff --git a/tests/tests/login/01_login_prompt/config.txt b/tests/login/01_login_prompt/config.txt
similarity index 100%
rename from tests/tests/login/01_login_prompt/config.txt
rename to tests/login/01_login_prompt/config.txt
diff --git a/tests/tests/cptools/05_cppw_2_files/config/etc/group b/tests/login/01_login_prompt/config/etc/group
similarity index 100%
rename from tests/tests/cptools/05_cppw_2_files/config/etc/group
rename to tests/login/01_login_prompt/config/etc/group
diff --git a/tests/tests/cptools/05_cppw_2_files/config/etc/gshadow b/tests/login/01_login_prompt/config/etc/gshadow
similarity index 100%
rename from tests/tests/cptools/05_cppw_2_files/config/etc/gshadow
rename to tests/login/01_login_prompt/config/etc/gshadow
diff --git a/tests/tests/login/01_login_prompt/config/etc/login.defs b/tests/login/01_login_prompt/config/etc/login.defs
similarity index 100%
rename from tests/tests/login/01_login_prompt/config/etc/login.defs
rename to tests/login/01_login_prompt/config/etc/login.defs
diff --git a/tests/tests/login/01_login_prompt/config/etc/passwd b/tests/login/01_login_prompt/config/etc/passwd
similarity index 100%
rename from tests/tests/login/01_login_prompt/config/etc/passwd
rename to tests/login/01_login_prompt/config/etc/passwd
diff --git a/tests/tests/login/01_login_prompt/config/etc/shadow b/tests/login/01_login_prompt/config/etc/shadow
similarity index 100%
rename from tests/tests/login/01_login_prompt/config/etc/shadow
rename to tests/login/01_login_prompt/config/etc/shadow
diff --git a/tests/tests/login/01_login_prompt/login.exp b/tests/login/01_login_prompt/login.exp
similarity index 100%
rename from tests/tests/login/01_login_prompt/login.exp
rename to tests/login/01_login_prompt/login.exp
diff --git a/tests/tests/login/01_login_prompt/login.test b/tests/login/01_login_prompt/login.test
similarity index 100%
rename from tests/tests/login/01_login_prompt/login.test
rename to tests/login/01_login_prompt/login.test
diff --git a/tests/tests/login/02_login_user/config.txt b/tests/login/02_login_user/config.txt
similarity index 100%
rename from tests/tests/login/02_login_user/config.txt
rename to tests/login/02_login_user/config.txt
diff --git a/tests/tests/login/01_login_prompt/config/etc/group b/tests/login/02_login_user/config/etc/group
similarity index 100%
rename from tests/tests/login/01_login_prompt/config/etc/group
rename to tests/login/02_login_user/config/etc/group
diff --git a/tests/tests/login/01_login_prompt/config/etc/gshadow b/tests/login/02_login_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/login/01_login_prompt/config/etc/gshadow
rename to tests/login/02_login_user/config/etc/gshadow
diff --git a/tests/tests/login/02_login_user/config/etc/login.defs b/tests/login/02_login_user/config/etc/login.defs
similarity index 100%
rename from tests/tests/login/02_login_user/config/etc/login.defs
rename to tests/login/02_login_user/config/etc/login.defs
diff --git a/tests/tests/login/02_login_user/config/etc/passwd b/tests/login/02_login_user/config/etc/passwd
similarity index 100%
rename from tests/tests/login/02_login_user/config/etc/passwd
rename to tests/login/02_login_user/config/etc/passwd
diff --git a/tests/tests/login/02_login_user/config/etc/shadow b/tests/login/02_login_user/config/etc/shadow
similarity index 100%
rename from tests/tests/login/02_login_user/config/etc/shadow
rename to tests/login/02_login_user/config/etc/shadow
diff --git a/tests/tests/login/02_login_user/login.exp b/tests/login/02_login_user/login.exp
similarity index 100%
rename from tests/tests/login/02_login_user/login.exp
rename to tests/login/02_login_user/login.exp
diff --git a/tests/tests/login/02_login_user/login.test b/tests/login/02_login_user/login.test
similarity index 100%
rename from tests/tests/login/02_login_user/login.test
rename to tests/login/02_login_user/login.test
diff --git a/tests/tests/login/03_login_check_tty/config.txt b/tests/login/03_login_check_tty/config.txt
similarity index 100%
rename from tests/tests/login/03_login_check_tty/config.txt
rename to tests/login/03_login_check_tty/config.txt
diff --git a/tests/tests/login/02_login_user/config/etc/group b/tests/login/03_login_check_tty/config/etc/group
similarity index 100%
rename from tests/tests/login/02_login_user/config/etc/group
rename to tests/login/03_login_check_tty/config/etc/group
diff --git a/tests/tests/login/02_login_user/config/etc/gshadow b/tests/login/03_login_check_tty/config/etc/gshadow
similarity index 100%
rename from tests/tests/login/02_login_user/config/etc/gshadow
rename to tests/login/03_login_check_tty/config/etc/gshadow
diff --git a/tests/tests/login/03_login_check_tty/config/etc/login.defs b/tests/login/03_login_check_tty/config/etc/login.defs
similarity index 100%
rename from tests/tests/login/03_login_check_tty/config/etc/login.defs
rename to tests/login/03_login_check_tty/config/etc/login.defs
diff --git a/tests/tests/login/03_login_check_tty/config/etc/passwd b/tests/login/03_login_check_tty/config/etc/passwd
similarity index 100%
rename from tests/tests/login/03_login_check_tty/config/etc/passwd
rename to tests/login/03_login_check_tty/config/etc/passwd
diff --git a/tests/tests/login/03_login_check_tty/config/etc/shadow b/tests/login/03_login_check_tty/config/etc/shadow
similarity index 100%
rename from tests/tests/login/03_login_check_tty/config/etc/shadow
rename to tests/login/03_login_check_tty/config/etc/shadow
diff --git a/tests/tests/login/03_login_check_tty/login.exp b/tests/login/03_login_check_tty/login.exp
similarity index 100%
rename from tests/tests/login/03_login_check_tty/login.exp
rename to tests/login/03_login_check_tty/login.exp
diff --git a/tests/tests/login/03_login_check_tty/login.test b/tests/login/03_login_check_tty/login.test
similarity index 100%
rename from tests/tests/login/03_login_check_tty/login.test
rename to tests/login/03_login_check_tty/login.test
diff --git a/tests/tests/cptools/08_cppw-p/config.txt b/tests/newgidmap/01_newgidmap/config.txt
similarity index 100%
rename from tests/tests/cptools/08_cppw-p/config.txt
rename to tests/newgidmap/01_newgidmap/config.txt
diff --git a/tests/tests/newgidmap/01_newgidmap/config/etc/group b/tests/newgidmap/01_newgidmap/config/etc/group
similarity index 100%
rename from tests/tests/newgidmap/01_newgidmap/config/etc/group
rename to tests/newgidmap/01_newgidmap/config/etc/group
diff --git a/tests/tests/newgidmap/01_newgidmap/config/etc/login.defs b/tests/newgidmap/01_newgidmap/config/etc/login.defs
similarity index 100%
rename from tests/tests/newgidmap/01_newgidmap/config/etc/login.defs
rename to tests/newgidmap/01_newgidmap/config/etc/login.defs
diff --git a/tests/tests/newgidmap/01_newgidmap/config/etc/passwd b/tests/newgidmap/01_newgidmap/config/etc/passwd
similarity index 100%
rename from tests/tests/newgidmap/01_newgidmap/config/etc/passwd
rename to tests/newgidmap/01_newgidmap/config/etc/passwd
diff --git a/tests/tests/newgidmap/01_newgidmap/config/etc/subgid b/tests/newgidmap/01_newgidmap/config/etc/subgid
similarity index 100%
rename from tests/tests/newgidmap/01_newgidmap/config/etc/subgid
rename to tests/newgidmap/01_newgidmap/config/etc/subgid
diff --git a/tests/tests/newgidmap/01_newgidmap/config/etc/subuid b/tests/newgidmap/01_newgidmap/config/etc/subuid
similarity index 100%
rename from tests/tests/newgidmap/01_newgidmap/config/etc/subuid
rename to tests/newgidmap/01_newgidmap/config/etc/subuid
diff --git a/tests/tests/newgidmap/01_newgidmap/data/gid_map b/tests/newgidmap/01_newgidmap/data/gid_map
similarity index 100%
rename from tests/tests/newgidmap/01_newgidmap/data/gid_map
rename to tests/newgidmap/01_newgidmap/data/gid_map
diff --git a/tests/tests/newgidmap/01_newgidmap/newgidmap.test b/tests/newgidmap/01_newgidmap/newgidmap.test
similarity index 100%
rename from tests/tests/newgidmap/01_newgidmap/newgidmap.test
rename to tests/newgidmap/01_newgidmap/newgidmap.test
diff --git a/tests/tests/cptools/09_cppw-g/config.txt b/tests/newgidmap/02_newgidmap_relaxed_gid_check/config.txt
similarity index 100%
rename from tests/tests/cptools/09_cppw-g/config.txt
rename to tests/newgidmap/02_newgidmap_relaxed_gid_check/config.txt
diff --git a/tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/group b/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/group
similarity index 100%
rename from tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/group
rename to tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/group
diff --git a/tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/login.defs b/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/login.defs
similarity index 100%
rename from tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/login.defs
rename to tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/login.defs
diff --git a/tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/passwd b/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/passwd
similarity index 100%
rename from tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/passwd
rename to tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/passwd
diff --git a/tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/subgid b/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/subgid
similarity index 100%
rename from tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/subgid
rename to tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/subgid
diff --git a/tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/subuid b/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/subuid
similarity index 100%
rename from tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/subuid
rename to tests/newgidmap/02_newgidmap_relaxed_gid_check/config/etc/subuid
diff --git a/tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/data/gid_map b/tests/newgidmap/02_newgidmap_relaxed_gid_check/data/gid_map
similarity index 100%
rename from tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/data/gid_map
rename to tests/newgidmap/02_newgidmap_relaxed_gid_check/data/gid_map
diff --git a/tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/data/gid_map.bar b/tests/newgidmap/02_newgidmap_relaxed_gid_check/data/gid_map.bar
similarity index 100%
rename from tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/data/gid_map.bar
rename to tests/newgidmap/02_newgidmap_relaxed_gid_check/data/gid_map.bar
diff --git a/tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/newgidmap.test b/tests/newgidmap/02_newgidmap_relaxed_gid_check/newgidmap.test
similarity index 100%
rename from tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/newgidmap.test
rename to tests/newgidmap/02_newgidmap_relaxed_gid_check/newgidmap.test
diff --git a/tests/tests/cptools/10_cppw-g-s/config.txt b/tests/newuidmap/01_newuidmap/config.txt
similarity index 100%
rename from tests/tests/cptools/10_cppw-g-s/config.txt
rename to tests/newuidmap/01_newuidmap/config.txt
diff --git a/tests/tests/newuidmap/01_newuidmap/config/etc/group b/tests/newuidmap/01_newuidmap/config/etc/group
similarity index 100%
rename from tests/tests/newuidmap/01_newuidmap/config/etc/group
rename to tests/newuidmap/01_newuidmap/config/etc/group
diff --git a/tests/tests/newuidmap/01_newuidmap/config/etc/login.defs b/tests/newuidmap/01_newuidmap/config/etc/login.defs
similarity index 100%
rename from tests/tests/newuidmap/01_newuidmap/config/etc/login.defs
rename to tests/newuidmap/01_newuidmap/config/etc/login.defs
diff --git a/tests/tests/newuidmap/01_newuidmap/config/etc/passwd b/tests/newuidmap/01_newuidmap/config/etc/passwd
similarity index 100%
rename from tests/tests/newuidmap/01_newuidmap/config/etc/passwd
rename to tests/newuidmap/01_newuidmap/config/etc/passwd
diff --git a/tests/tests/newuidmap/01_newuidmap/config/etc/subgid b/tests/newuidmap/01_newuidmap/config/etc/subgid
similarity index 100%
rename from tests/tests/newuidmap/01_newuidmap/config/etc/subgid
rename to tests/newuidmap/01_newuidmap/config/etc/subgid
diff --git a/tests/tests/newuidmap/01_newuidmap/config/etc/subuid b/tests/newuidmap/01_newuidmap/config/etc/subuid
similarity index 100%
rename from tests/tests/newuidmap/01_newuidmap/config/etc/subuid
rename to tests/newuidmap/01_newuidmap/config/etc/subuid
diff --git a/tests/tests/newuidmap/01_newuidmap/data/uid_map b/tests/newuidmap/01_newuidmap/data/uid_map
similarity index 100%
rename from tests/tests/newuidmap/01_newuidmap/data/uid_map
rename to tests/newuidmap/01_newuidmap/data/uid_map
diff --git a/tests/tests/newuidmap/01_newuidmap/newuidmap.test b/tests/newuidmap/01_newuidmap/newuidmap.test
similarity index 100%
rename from tests/tests/newuidmap/01_newuidmap/newuidmap.test
rename to tests/newuidmap/01_newuidmap/newuidmap.test
diff --git a/tests/tests/cptools/11_cppw-p-s/config.txt b/tests/newuidmap/02_newuidmap_relaxed_gid_check/config.txt
similarity index 100%
rename from tests/tests/cptools/11_cppw-p-s/config.txt
rename to tests/newuidmap/02_newuidmap_relaxed_gid_check/config.txt
diff --git a/tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/group b/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/group
similarity index 100%
rename from tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/group
rename to tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/group
diff --git a/tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/login.defs b/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/login.defs
similarity index 100%
rename from tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/login.defs
rename to tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/login.defs
diff --git a/tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/passwd b/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/passwd
similarity index 100%
rename from tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/passwd
rename to tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/passwd
diff --git a/tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/subgid b/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/subgid
similarity index 100%
rename from tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/subgid
rename to tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/subgid
diff --git a/tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/subuid b/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/subuid
similarity index 100%
rename from tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/subuid
rename to tests/newuidmap/02_newuidmap_relaxed_gid_check/config/etc/subuid
diff --git a/tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/data/uid_map b/tests/newuidmap/02_newuidmap_relaxed_gid_check/data/uid_map
similarity index 100%
rename from tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/data/uid_map
rename to tests/newuidmap/02_newuidmap_relaxed_gid_check/data/uid_map
diff --git a/tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/newuidmap.test b/tests/newuidmap/02_newuidmap_relaxed_gid_check/newuidmap.test
similarity index 100%
rename from tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/newuidmap.test
rename to tests/newuidmap/02_newuidmap_relaxed_gid_check/newuidmap.test
diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/config.txt b/tests/newusers/01_create_user/config.txt
similarity index 100%
rename from tests/tests/cptools/12_cppw-s_no_shadow_file/config.txt
rename to tests/newusers/01_create_user/config.txt
diff --git a/tests/tests/log/lastlog/16_lastlog_extra_arg/config/etc/group b/tests/newusers/01_create_user/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/16_lastlog_extra_arg/config/etc/group
rename to tests/newusers/01_create_user/config/etc/group
diff --git a/tests/tests/log/lastlog/16_lastlog_extra_arg/config/etc/gshadow b/tests/newusers/01_create_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/16_lastlog_extra_arg/config/etc/gshadow
rename to tests/newusers/01_create_user/config/etc/gshadow
diff --git a/tests/tests/newusers/01_create_user/config/etc/pam.d/common-password b/tests/newusers/01_create_user/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/01_create_user/config/etc/pam.d/common-password
rename to tests/newusers/01_create_user/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/01_create_user/config/etc/pam.d/newusers b/tests/newusers/01_create_user/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/01_create_user/config/etc/pam.d/newusers
rename to tests/newusers/01_create_user/config/etc/pam.d/newusers
diff --git a/tests/tests/log/lastlog/16_lastlog_extra_arg/config/etc/passwd b/tests/newusers/01_create_user/config/etc/passwd
similarity index 100%
rename from tests/tests/log/lastlog/16_lastlog_extra_arg/config/etc/passwd
rename to tests/newusers/01_create_user/config/etc/passwd
diff --git a/tests/tests/newusers/01_create_user/config/etc/shadow b/tests/newusers/01_create_user/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/01_create_user/config/etc/shadow
rename to tests/newusers/01_create_user/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/group b/tests/newusers/01_create_user/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/group
rename to tests/newusers/01_create_user/data/group
diff --git a/tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/gshadow b/tests/newusers/01_create_user/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/config/etc/gshadow
rename to tests/newusers/01_create_user/data/gshadow
diff --git a/tests/tests/newusers/01_create_user/data/newusers.list b/tests/newusers/01_create_user/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/01_create_user/data/newusers.list
rename to tests/newusers/01_create_user/data/newusers.list
diff --git a/tests/tests/newusers/01_create_user/data/passwd b/tests/newusers/01_create_user/data/passwd
similarity index 100%
rename from tests/tests/newusers/01_create_user/data/passwd
rename to tests/newusers/01_create_user/data/passwd
diff --git a/tests/tests/newusers/01_create_user/data/shadow b/tests/newusers/01_create_user/data/shadow
similarity index 100%
rename from tests/tests/newusers/01_create_user/data/shadow
rename to tests/newusers/01_create_user/data/shadow
diff --git a/tests/tests/newusers/01_create_user/newusers.test b/tests/newusers/01_create_user/newusers.test
similarity index 100%
rename from tests/tests/newusers/01_create_user/newusers.test
rename to tests/newusers/01_create_user/newusers.test
diff --git a/tests/tests/newusers/02_update_password/config.txt b/tests/newusers/02_update_password/config.txt
similarity index 100%
rename from tests/tests/newusers/02_update_password/config.txt
rename to tests/newusers/02_update_password/config.txt
diff --git a/tests/tests/newusers/02_update_password/config/etc/group b/tests/newusers/02_update_password/config/etc/group
similarity index 100%
rename from tests/tests/newusers/02_update_password/config/etc/group
rename to tests/newusers/02_update_password/config/etc/group
diff --git a/tests/tests/newusers/01_create_user/config/etc/gshadow b/tests/newusers/02_update_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/01_create_user/config/etc/gshadow
rename to tests/newusers/02_update_password/config/etc/gshadow
diff --git a/tests/tests/newusers/02_update_password/config/etc/pam.d/common-password b/tests/newusers/02_update_password/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/02_update_password/config/etc/pam.d/common-password
rename to tests/newusers/02_update_password/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/02_update_password/config/etc/pam.d/newusers b/tests/newusers/02_update_password/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/02_update_password/config/etc/pam.d/newusers
rename to tests/newusers/02_update_password/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/02_update_password/config/etc/passwd b/tests/newusers/02_update_password/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/02_update_password/config/etc/passwd
rename to tests/newusers/02_update_password/config/etc/passwd
diff --git a/tests/tests/newusers/02_update_password/config/etc/shadow b/tests/newusers/02_update_password/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/02_update_password/config/etc/shadow
rename to tests/newusers/02_update_password/config/etc/shadow
diff --git a/tests/tests/newusers/02_update_password/data/newusers.list b/tests/newusers/02_update_password/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/02_update_password/data/newusers.list
rename to tests/newusers/02_update_password/data/newusers.list
diff --git a/tests/tests/newusers/02_update_password/data/shadow b/tests/newusers/02_update_password/data/shadow
similarity index 100%
rename from tests/tests/newusers/02_update_password/data/shadow
rename to tests/newusers/02_update_password/data/shadow
diff --git a/tests/tests/newusers/02_update_password/newusers.test b/tests/newusers/02_update_password/newusers.test
similarity index 100%
rename from tests/tests/newusers/02_update_password/newusers.test
rename to tests/newusers/02_update_password/newusers.test
diff --git a/tests/tests/newusers/03_no_update_pid/config.txt b/tests/newusers/03_no_update_pid/config.txt
similarity index 100%
rename from tests/tests/newusers/03_no_update_pid/config.txt
rename to tests/newusers/03_no_update_pid/config.txt
diff --git a/tests/tests/newusers/03_no_update_pid/config/etc/group b/tests/newusers/03_no_update_pid/config/etc/group
similarity index 100%
rename from tests/tests/newusers/03_no_update_pid/config/etc/group
rename to tests/newusers/03_no_update_pid/config/etc/group
diff --git a/tests/tests/newusers/02_update_password/config/etc/gshadow b/tests/newusers/03_no_update_pid/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/02_update_password/config/etc/gshadow
rename to tests/newusers/03_no_update_pid/config/etc/gshadow
diff --git a/tests/tests/newusers/03_no_update_pid/config/etc/pam.d/common-password b/tests/newusers/03_no_update_pid/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/03_no_update_pid/config/etc/pam.d/common-password
rename to tests/newusers/03_no_update_pid/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/03_no_update_pid/config/etc/pam.d/newusers b/tests/newusers/03_no_update_pid/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/03_no_update_pid/config/etc/pam.d/newusers
rename to tests/newusers/03_no_update_pid/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/03_no_update_pid/config/etc/passwd b/tests/newusers/03_no_update_pid/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/03_no_update_pid/config/etc/passwd
rename to tests/newusers/03_no_update_pid/config/etc/passwd
diff --git a/tests/tests/newusers/03_no_update_pid/config/etc/shadow b/tests/newusers/03_no_update_pid/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/03_no_update_pid/config/etc/shadow
rename to tests/newusers/03_no_update_pid/config/etc/shadow
diff --git a/tests/tests/newusers/03_no_update_pid/data/newusers.list b/tests/newusers/03_no_update_pid/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/03_no_update_pid/data/newusers.list
rename to tests/newusers/03_no_update_pid/data/newusers.list
diff --git a/tests/tests/newusers/03_no_update_pid/data/shadow b/tests/newusers/03_no_update_pid/data/shadow
similarity index 100%
rename from tests/tests/newusers/03_no_update_pid/data/shadow
rename to tests/newusers/03_no_update_pid/data/shadow
diff --git a/tests/tests/newusers/03_no_update_pid/newusers.test b/tests/newusers/03_no_update_pid/newusers.test
similarity index 100%
rename from tests/tests/newusers/03_no_update_pid/newusers.test
rename to tests/newusers/03_no_update_pid/newusers.test
diff --git a/tests/tests/newusers/04_no_update_gid/config.txt b/tests/newusers/04_no_update_gid/config.txt
similarity index 100%
rename from tests/tests/newusers/04_no_update_gid/config.txt
rename to tests/newusers/04_no_update_gid/config.txt
diff --git a/tests/tests/newusers/04_no_update_gid/config/etc/group b/tests/newusers/04_no_update_gid/config/etc/group
similarity index 100%
rename from tests/tests/newusers/04_no_update_gid/config/etc/group
rename to tests/newusers/04_no_update_gid/config/etc/group
diff --git a/tests/tests/newusers/03_no_update_pid/config/etc/gshadow b/tests/newusers/04_no_update_gid/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/03_no_update_pid/config/etc/gshadow
rename to tests/newusers/04_no_update_gid/config/etc/gshadow
diff --git a/tests/tests/newusers/04_no_update_gid/config/etc/pam.d/common-password b/tests/newusers/04_no_update_gid/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/04_no_update_gid/config/etc/pam.d/common-password
rename to tests/newusers/04_no_update_gid/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/04_no_update_gid/config/etc/pam.d/newusers b/tests/newusers/04_no_update_gid/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/04_no_update_gid/config/etc/pam.d/newusers
rename to tests/newusers/04_no_update_gid/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/04_no_update_gid/config/etc/passwd b/tests/newusers/04_no_update_gid/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/04_no_update_gid/config/etc/passwd
rename to tests/newusers/04_no_update_gid/config/etc/passwd
diff --git a/tests/tests/newusers/04_no_update_gid/config/etc/shadow b/tests/newusers/04_no_update_gid/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/04_no_update_gid/config/etc/shadow
rename to tests/newusers/04_no_update_gid/config/etc/shadow
diff --git a/tests/tests/newusers/04_no_update_gid/data/newusers.list b/tests/newusers/04_no_update_gid/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/04_no_update_gid/data/newusers.list
rename to tests/newusers/04_no_update_gid/data/newusers.list
diff --git a/tests/tests/newusers/04_no_update_gid/data/shadow b/tests/newusers/04_no_update_gid/data/shadow
similarity index 100%
rename from tests/tests/newusers/04_no_update_gid/data/shadow
rename to tests/newusers/04_no_update_gid/data/shadow
diff --git a/tests/tests/newusers/04_no_update_gid/newusers.test b/tests/newusers/04_no_update_gid/newusers.test
similarity index 100%
rename from tests/tests/newusers/04_no_update_gid/newusers.test
rename to tests/newusers/04_no_update_gid/newusers.test
diff --git a/tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config.txt b/tests/newusers/05_create_user_pid/config.txt
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config.txt
rename to tests/newusers/05_create_user_pid/config.txt
diff --git a/tests/tests/newusers/01_create_user/config/etc/group b/tests/newusers/05_create_user_pid/config/etc/group
similarity index 100%
rename from tests/tests/newusers/01_create_user/config/etc/group
rename to tests/newusers/05_create_user_pid/config/etc/group
diff --git a/tests/tests/newusers/04_no_update_gid/config/etc/gshadow b/tests/newusers/05_create_user_pid/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/04_no_update_gid/config/etc/gshadow
rename to tests/newusers/05_create_user_pid/config/etc/gshadow
diff --git a/tests/tests/newusers/05_create_user_pid/config/etc/pam.d/common-password b/tests/newusers/05_create_user_pid/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/05_create_user_pid/config/etc/pam.d/common-password
rename to tests/newusers/05_create_user_pid/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/05_create_user_pid/config/etc/pam.d/newusers b/tests/newusers/05_create_user_pid/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/05_create_user_pid/config/etc/pam.d/newusers
rename to tests/newusers/05_create_user_pid/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/01_create_user/config/etc/passwd b/tests/newusers/05_create_user_pid/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/01_create_user/config/etc/passwd
rename to tests/newusers/05_create_user_pid/config/etc/passwd
diff --git a/tests/tests/newusers/05_create_user_pid/config/etc/shadow b/tests/newusers/05_create_user_pid/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/05_create_user_pid/config/etc/shadow
rename to tests/newusers/05_create_user_pid/config/etc/shadow
diff --git a/tests/tests/newusers/05_create_user_pid/data/group b/tests/newusers/05_create_user_pid/data/group
similarity index 100%
rename from tests/tests/newusers/05_create_user_pid/data/group
rename to tests/newusers/05_create_user_pid/data/group
diff --git a/tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/gshadow b/tests/newusers/05_create_user_pid/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/34_groupmod_set_password_group_without_shadow_pwd/config/etc/gshadow
rename to tests/newusers/05_create_user_pid/data/gshadow
diff --git a/tests/tests/newusers/05_create_user_pid/data/newusers.list b/tests/newusers/05_create_user_pid/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/05_create_user_pid/data/newusers.list
rename to tests/newusers/05_create_user_pid/data/newusers.list
diff --git a/tests/tests/newusers/05_create_user_pid/data/passwd b/tests/newusers/05_create_user_pid/data/passwd
similarity index 100%
rename from tests/tests/newusers/05_create_user_pid/data/passwd
rename to tests/newusers/05_create_user_pid/data/passwd
diff --git a/tests/tests/newusers/05_create_user_pid/data/shadow b/tests/newusers/05_create_user_pid/data/shadow
similarity index 100%
rename from tests/tests/newusers/05_create_user_pid/data/shadow
rename to tests/newusers/05_create_user_pid/data/shadow
diff --git a/tests/tests/newusers/05_create_user_pid/newusers.test b/tests/newusers/05_create_user_pid/newusers.test
similarity index 100%
rename from tests/tests/newusers/05_create_user_pid/newusers.test
rename to tests/newusers/05_create_user_pid/newusers.test
diff --git a/tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config.txt b/tests/newusers/06_create_user_gid/config.txt
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config.txt
rename to tests/newusers/06_create_user_gid/config.txt
diff --git a/tests/tests/newusers/05_create_user_pid/config/etc/group b/tests/newusers/06_create_user_gid/config/etc/group
similarity index 100%
rename from tests/tests/newusers/05_create_user_pid/config/etc/group
rename to tests/newusers/06_create_user_gid/config/etc/group
diff --git a/tests/tests/newusers/05_create_user_pid/config/etc/gshadow b/tests/newusers/06_create_user_gid/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/05_create_user_pid/config/etc/gshadow
rename to tests/newusers/06_create_user_gid/config/etc/gshadow
diff --git a/tests/tests/newusers/06_create_user_gid/config/etc/pam.d/common-password b/tests/newusers/06_create_user_gid/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/06_create_user_gid/config/etc/pam.d/common-password
rename to tests/newusers/06_create_user_gid/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/06_create_user_gid/config/etc/pam.d/newusers b/tests/newusers/06_create_user_gid/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/06_create_user_gid/config/etc/pam.d/newusers
rename to tests/newusers/06_create_user_gid/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/05_create_user_pid/config/etc/passwd b/tests/newusers/06_create_user_gid/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/05_create_user_pid/config/etc/passwd
rename to tests/newusers/06_create_user_gid/config/etc/passwd
diff --git a/tests/tests/newusers/06_create_user_gid/config/etc/shadow b/tests/newusers/06_create_user_gid/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/06_create_user_gid/config/etc/shadow
rename to tests/newusers/06_create_user_gid/config/etc/shadow
diff --git a/tests/tests/newusers/06_create_user_gid/data/group b/tests/newusers/06_create_user_gid/data/group
similarity index 100%
rename from tests/tests/newusers/06_create_user_gid/data/group
rename to tests/newusers/06_create_user_gid/data/group
diff --git a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/gshadow b/tests/newusers/06_create_user_gid/data/gshadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/gshadow
rename to tests/newusers/06_create_user_gid/data/gshadow
diff --git a/tests/tests/newusers/06_create_user_gid/data/newusers.list b/tests/newusers/06_create_user_gid/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/06_create_user_gid/data/newusers.list
rename to tests/newusers/06_create_user_gid/data/newusers.list
diff --git a/tests/tests/newusers/06_create_user_gid/data/passwd b/tests/newusers/06_create_user_gid/data/passwd
similarity index 100%
rename from tests/tests/newusers/06_create_user_gid/data/passwd
rename to tests/newusers/06_create_user_gid/data/passwd
diff --git a/tests/tests/newusers/06_create_user_gid/data/shadow b/tests/newusers/06_create_user_gid/data/shadow
similarity index 100%
rename from tests/tests/newusers/06_create_user_gid/data/shadow
rename to tests/newusers/06_create_user_gid/data/shadow
diff --git a/tests/tests/newusers/06_create_user_gid/newusers.test b/tests/newusers/06_create_user_gid/newusers.test
similarity index 100%
rename from tests/tests/newusers/06_create_user_gid/newusers.test
rename to tests/newusers/06_create_user_gid/newusers.test
diff --git a/tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config.txt b/tests/newusers/07_create_user_pid_gid/config.txt
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config.txt
rename to tests/newusers/07_create_user_pid_gid/config.txt
diff --git a/tests/tests/newusers/06_create_user_gid/config/etc/group b/tests/newusers/07_create_user_pid_gid/config/etc/group
similarity index 100%
rename from tests/tests/newusers/06_create_user_gid/config/etc/group
rename to tests/newusers/07_create_user_pid_gid/config/etc/group
diff --git a/tests/tests/newusers/06_create_user_gid/config/etc/gshadow b/tests/newusers/07_create_user_pid_gid/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/06_create_user_gid/config/etc/gshadow
rename to tests/newusers/07_create_user_pid_gid/config/etc/gshadow
diff --git a/tests/tests/newusers/07_create_user_pid_gid/config/etc/pam.d/common-password b/tests/newusers/07_create_user_pid_gid/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/07_create_user_pid_gid/config/etc/pam.d/common-password
rename to tests/newusers/07_create_user_pid_gid/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/07_create_user_pid_gid/config/etc/pam.d/newusers b/tests/newusers/07_create_user_pid_gid/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/07_create_user_pid_gid/config/etc/pam.d/newusers
rename to tests/newusers/07_create_user_pid_gid/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/06_create_user_gid/config/etc/passwd b/tests/newusers/07_create_user_pid_gid/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/06_create_user_gid/config/etc/passwd
rename to tests/newusers/07_create_user_pid_gid/config/etc/passwd
diff --git a/tests/tests/newusers/07_create_user_pid_gid/config/etc/shadow b/tests/newusers/07_create_user_pid_gid/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/07_create_user_pid_gid/config/etc/shadow
rename to tests/newusers/07_create_user_pid_gid/config/etc/shadow
diff --git a/tests/tests/newusers/07_create_user_pid_gid/data/group b/tests/newusers/07_create_user_pid_gid/data/group
similarity index 100%
rename from tests/tests/newusers/07_create_user_pid_gid/data/group
rename to tests/newusers/07_create_user_pid_gid/data/group
diff --git a/tests/tests/newusers/01_create_user/data/gshadow b/tests/newusers/07_create_user_pid_gid/data/gshadow
similarity index 100%
rename from tests/tests/newusers/01_create_user/data/gshadow
rename to tests/newusers/07_create_user_pid_gid/data/gshadow
diff --git a/tests/tests/newusers/07_create_user_pid_gid/data/newusers.list b/tests/newusers/07_create_user_pid_gid/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/07_create_user_pid_gid/data/newusers.list
rename to tests/newusers/07_create_user_pid_gid/data/newusers.list
diff --git a/tests/tests/newusers/07_create_user_pid_gid/data/passwd b/tests/newusers/07_create_user_pid_gid/data/passwd
similarity index 100%
rename from tests/tests/newusers/07_create_user_pid_gid/data/passwd
rename to tests/newusers/07_create_user_pid_gid/data/passwd
diff --git a/tests/tests/newusers/07_create_user_pid_gid/data/shadow b/tests/newusers/07_create_user_pid_gid/data/shadow
similarity index 100%
rename from tests/tests/newusers/07_create_user_pid_gid/data/shadow
rename to tests/newusers/07_create_user_pid_gid/data/shadow
diff --git a/tests/tests/newusers/07_create_user_pid_gid/newusers.test b/tests/newusers/07_create_user_pid_gid/newusers.test
similarity index 100%
rename from tests/tests/newusers/07_create_user_pid_gid/newusers.test
rename to tests/newusers/07_create_user_pid_gid/newusers.test
diff --git a/tests/tests/libsubid/01_list_ranges/config.txt b/tests/newusers/08_create_user_pid_other-gid/config.txt
similarity index 100%
rename from tests/tests/libsubid/01_list_ranges/config.txt
rename to tests/newusers/08_create_user_pid_other-gid/config.txt
diff --git a/tests/tests/newusers/07_create_user_pid_gid/config/etc/group b/tests/newusers/08_create_user_pid_other-gid/config/etc/group
similarity index 100%
rename from tests/tests/newusers/07_create_user_pid_gid/config/etc/group
rename to tests/newusers/08_create_user_pid_other-gid/config/etc/group
diff --git a/tests/tests/newusers/07_create_user_pid_gid/config/etc/gshadow b/tests/newusers/08_create_user_pid_other-gid/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/07_create_user_pid_gid/config/etc/gshadow
rename to tests/newusers/08_create_user_pid_other-gid/config/etc/gshadow
diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/config/etc/pam.d/common-password b/tests/newusers/08_create_user_pid_other-gid/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/08_create_user_pid_other-gid/config/etc/pam.d/common-password
rename to tests/newusers/08_create_user_pid_other-gid/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/config/etc/pam.d/newusers b/tests/newusers/08_create_user_pid_other-gid/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/08_create_user_pid_other-gid/config/etc/pam.d/newusers
rename to tests/newusers/08_create_user_pid_other-gid/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/07_create_user_pid_gid/config/etc/passwd b/tests/newusers/08_create_user_pid_other-gid/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/07_create_user_pid_gid/config/etc/passwd
rename to tests/newusers/08_create_user_pid_other-gid/config/etc/passwd
diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/config/etc/shadow b/tests/newusers/08_create_user_pid_other-gid/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/08_create_user_pid_other-gid/config/etc/shadow
rename to tests/newusers/08_create_user_pid_other-gid/config/etc/shadow
diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/data/group b/tests/newusers/08_create_user_pid_other-gid/data/group
similarity index 100%
rename from tests/tests/newusers/08_create_user_pid_other-gid/data/group
rename to tests/newusers/08_create_user_pid_other-gid/data/group
diff --git a/tests/tests/newusers/05_create_user_pid/data/gshadow b/tests/newusers/08_create_user_pid_other-gid/data/gshadow
similarity index 100%
rename from tests/tests/newusers/05_create_user_pid/data/gshadow
rename to tests/newusers/08_create_user_pid_other-gid/data/gshadow
diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/data/newusers.list b/tests/newusers/08_create_user_pid_other-gid/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/08_create_user_pid_other-gid/data/newusers.list
rename to tests/newusers/08_create_user_pid_other-gid/data/newusers.list
diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/data/passwd b/tests/newusers/08_create_user_pid_other-gid/data/passwd
similarity index 100%
rename from tests/tests/newusers/08_create_user_pid_other-gid/data/passwd
rename to tests/newusers/08_create_user_pid_other-gid/data/passwd
diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/data/shadow b/tests/newusers/08_create_user_pid_other-gid/data/shadow
similarity index 100%
rename from tests/tests/newusers/08_create_user_pid_other-gid/data/shadow
rename to tests/newusers/08_create_user_pid_other-gid/data/shadow
diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/newusers.test b/tests/newusers/08_create_user_pid_other-gid/newusers.test
similarity index 100%
rename from tests/tests/newusers/08_create_user_pid_other-gid/newusers.test
rename to tests/newusers/08_create_user_pid_other-gid/newusers.test
diff --git a/tests/tests/libsubid/02_get_subid_owners/config.txt b/tests/newusers/09_create_user_pid-as-user-bar/config.txt
similarity index 100%
rename from tests/tests/libsubid/02_get_subid_owners/config.txt
rename to tests/newusers/09_create_user_pid-as-user-bar/config.txt
diff --git a/tests/tests/newusers/09_create_user_pid-as-user-bar/config/etc/group b/tests/newusers/09_create_user_pid-as-user-bar/config/etc/group
similarity index 100%
rename from tests/tests/newusers/09_create_user_pid-as-user-bar/config/etc/group
rename to tests/newusers/09_create_user_pid-as-user-bar/config/etc/group
diff --git a/tests/tests/newusers/09_create_user_pid-as-user-bar/config/etc/gshadow b/tests/newusers/09_create_user_pid-as-user-bar/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/09_create_user_pid-as-user-bar/config/etc/gshadow
rename to tests/newusers/09_create_user_pid-as-user-bar/config/etc/gshadow
diff --git a/tests/tests/newusers/09_create_user_pid-as-user-bar/config/etc/pam.d/common-password b/tests/newusers/09_create_user_pid-as-user-bar/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/09_create_user_pid-as-user-bar/config/etc/pam.d/common-password
rename to tests/newusers/09_create_user_pid-as-user-bar/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/09_create_user_pid-as-user-bar/config/etc/pam.d/newusers b/tests/newusers/09_create_user_pid-as-user-bar/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/09_create_user_pid-as-user-bar/config/etc/pam.d/newusers
rename to tests/newusers/09_create_user_pid-as-user-bar/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/09_create_user_pid-as-user-bar/config/etc/passwd b/tests/newusers/09_create_user_pid-as-user-bar/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/09_create_user_pid-as-user-bar/config/etc/passwd
rename to tests/newusers/09_create_user_pid-as-user-bar/config/etc/passwd
diff --git a/tests/tests/newusers/09_create_user_pid-as-user-bar/config/etc/shadow b/tests/newusers/09_create_user_pid-as-user-bar/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/09_create_user_pid-as-user-bar/config/etc/shadow
rename to tests/newusers/09_create_user_pid-as-user-bar/config/etc/shadow
diff --git a/tests/tests/newusers/09_create_user_pid-as-user-bar/data/group b/tests/newusers/09_create_user_pid-as-user-bar/data/group
similarity index 100%
rename from tests/tests/newusers/09_create_user_pid-as-user-bar/data/group
rename to tests/newusers/09_create_user_pid-as-user-bar/data/group
diff --git a/tests/tests/newusers/09_create_user_pid-as-user-bar/data/gshadow b/tests/newusers/09_create_user_pid-as-user-bar/data/gshadow
similarity index 100%
rename from tests/tests/newusers/09_create_user_pid-as-user-bar/data/gshadow
rename to tests/newusers/09_create_user_pid-as-user-bar/data/gshadow
diff --git a/tests/tests/newusers/09_create_user_pid-as-user-bar/data/newusers.list b/tests/newusers/09_create_user_pid-as-user-bar/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/09_create_user_pid-as-user-bar/data/newusers.list
rename to tests/newusers/09_create_user_pid-as-user-bar/data/newusers.list
diff --git a/tests/tests/newusers/09_create_user_pid-as-user-bar/data/passwd b/tests/newusers/09_create_user_pid-as-user-bar/data/passwd
similarity index 100%
rename from tests/tests/newusers/09_create_user_pid-as-user-bar/data/passwd
rename to tests/newusers/09_create_user_pid-as-user-bar/data/passwd
diff --git a/tests/tests/newusers/09_create_user_pid-as-user-bar/data/shadow b/tests/newusers/09_create_user_pid-as-user-bar/data/shadow
similarity index 100%
rename from tests/tests/newusers/09_create_user_pid-as-user-bar/data/shadow
rename to tests/newusers/09_create_user_pid-as-user-bar/data/shadow
diff --git a/tests/tests/newusers/09_create_user_pid-as-user-bar/newusers.test b/tests/newusers/09_create_user_pid-as-user-bar/newusers.test
similarity index 100%
rename from tests/tests/newusers/09_create_user_pid-as-user-bar/newusers.test
rename to tests/newusers/09_create_user_pid-as-user-bar/newusers.test
diff --git a/tests/tests/libsubid/03_add_remove/config.txt b/tests/newusers/10_create_user_gid-as-group-bar/config.txt
similarity index 100%
rename from tests/tests/libsubid/03_add_remove/config.txt
rename to tests/newusers/10_create_user_gid-as-group-bar/config.txt
diff --git a/tests/tests/newusers/10_create_user_gid-as-group-bar/config/etc/group b/tests/newusers/10_create_user_gid-as-group-bar/config/etc/group
similarity index 100%
rename from tests/tests/newusers/10_create_user_gid-as-group-bar/config/etc/group
rename to tests/newusers/10_create_user_gid-as-group-bar/config/etc/group
diff --git a/tests/tests/newusers/10_create_user_gid-as-group-bar/config/etc/gshadow b/tests/newusers/10_create_user_gid-as-group-bar/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/10_create_user_gid-as-group-bar/config/etc/gshadow
rename to tests/newusers/10_create_user_gid-as-group-bar/config/etc/gshadow
diff --git a/tests/tests/newusers/10_create_user_gid-as-group-bar/config/etc/pam.d/common-password b/tests/newusers/10_create_user_gid-as-group-bar/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/10_create_user_gid-as-group-bar/config/etc/pam.d/common-password
rename to tests/newusers/10_create_user_gid-as-group-bar/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/10_create_user_gid-as-group-bar/config/etc/pam.d/newusers b/tests/newusers/10_create_user_gid-as-group-bar/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/10_create_user_gid-as-group-bar/config/etc/pam.d/newusers
rename to tests/newusers/10_create_user_gid-as-group-bar/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/10_create_user_gid-as-group-bar/config/etc/passwd b/tests/newusers/10_create_user_gid-as-group-bar/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/10_create_user_gid-as-group-bar/config/etc/passwd
rename to tests/newusers/10_create_user_gid-as-group-bar/config/etc/passwd
diff --git a/tests/tests/newusers/10_create_user_gid-as-group-bar/config/etc/shadow b/tests/newusers/10_create_user_gid-as-group-bar/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/10_create_user_gid-as-group-bar/config/etc/shadow
rename to tests/newusers/10_create_user_gid-as-group-bar/config/etc/shadow
diff --git a/tests/tests/newusers/10_create_user_gid-as-group-bar/data/newusers.list b/tests/newusers/10_create_user_gid-as-group-bar/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/10_create_user_gid-as-group-bar/data/newusers.list
rename to tests/newusers/10_create_user_gid-as-group-bar/data/newusers.list
diff --git a/tests/tests/newusers/10_create_user_gid-as-group-bar/data/passwd b/tests/newusers/10_create_user_gid-as-group-bar/data/passwd
similarity index 100%
rename from tests/tests/newusers/10_create_user_gid-as-group-bar/data/passwd
rename to tests/newusers/10_create_user_gid-as-group-bar/data/passwd
diff --git a/tests/tests/newusers/10_create_user_gid-as-group-bar/data/shadow b/tests/newusers/10_create_user_gid-as-group-bar/data/shadow
similarity index 100%
rename from tests/tests/newusers/10_create_user_gid-as-group-bar/data/shadow
rename to tests/newusers/10_create_user_gid-as-group-bar/data/shadow
diff --git a/tests/tests/newusers/10_create_user_gid-as-group-bar/newusers.test b/tests/newusers/10_create_user_gid-as-group-bar/newusers.test
similarity index 100%
rename from tests/tests/newusers/10_create_user_gid-as-group-bar/newusers.test
rename to tests/newusers/10_create_user_gid-as-group-bar/newusers.test
diff --git a/tests/tests/newusers/11_update_gecos/config.txt b/tests/newusers/11_update_gecos/config.txt
similarity index 100%
rename from tests/tests/newusers/11_update_gecos/config.txt
rename to tests/newusers/11_update_gecos/config.txt
diff --git a/tests/tests/newusers/11_update_gecos/config/etc/group b/tests/newusers/11_update_gecos/config/etc/group
similarity index 100%
rename from tests/tests/newusers/11_update_gecos/config/etc/group
rename to tests/newusers/11_update_gecos/config/etc/group
diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/config/etc/gshadow b/tests/newusers/11_update_gecos/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/08_create_user_pid_other-gid/config/etc/gshadow
rename to tests/newusers/11_update_gecos/config/etc/gshadow
diff --git a/tests/tests/newusers/11_update_gecos/config/etc/pam.d/common-password b/tests/newusers/11_update_gecos/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/11_update_gecos/config/etc/pam.d/common-password
rename to tests/newusers/11_update_gecos/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/11_update_gecos/config/etc/pam.d/newusers b/tests/newusers/11_update_gecos/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/11_update_gecos/config/etc/pam.d/newusers
rename to tests/newusers/11_update_gecos/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/11_update_gecos/config/etc/passwd b/tests/newusers/11_update_gecos/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/11_update_gecos/config/etc/passwd
rename to tests/newusers/11_update_gecos/config/etc/passwd
diff --git a/tests/tests/newusers/11_update_gecos/config/etc/shadow b/tests/newusers/11_update_gecos/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/11_update_gecos/config/etc/shadow
rename to tests/newusers/11_update_gecos/config/etc/shadow
diff --git a/tests/tests/newusers/11_update_gecos/data/newusers.list b/tests/newusers/11_update_gecos/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/11_update_gecos/data/newusers.list
rename to tests/newusers/11_update_gecos/data/newusers.list
diff --git a/tests/tests/newusers/11_update_gecos/data/passwd b/tests/newusers/11_update_gecos/data/passwd
similarity index 100%
rename from tests/tests/newusers/11_update_gecos/data/passwd
rename to tests/newusers/11_update_gecos/data/passwd
diff --git a/tests/tests/newusers/11_update_gecos/data/shadow b/tests/newusers/11_update_gecos/data/shadow
similarity index 100%
rename from tests/tests/newusers/11_update_gecos/data/shadow
rename to tests/newusers/11_update_gecos/data/shadow
diff --git a/tests/tests/newusers/11_update_gecos/newusers.test b/tests/newusers/11_update_gecos/newusers.test
similarity index 100%
rename from tests/tests/newusers/11_update_gecos/newusers.test
rename to tests/newusers/11_update_gecos/newusers.test
diff --git a/tests/tests/newusers/12_update_shell/config.txt b/tests/newusers/12_update_shell/config.txt
similarity index 100%
rename from tests/tests/newusers/12_update_shell/config.txt
rename to tests/newusers/12_update_shell/config.txt
diff --git a/tests/tests/newusers/12_update_shell/config/etc/group b/tests/newusers/12_update_shell/config/etc/group
similarity index 100%
rename from tests/tests/newusers/12_update_shell/config/etc/group
rename to tests/newusers/12_update_shell/config/etc/group
diff --git a/tests/tests/newusers/11_update_gecos/config/etc/gshadow b/tests/newusers/12_update_shell/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/11_update_gecos/config/etc/gshadow
rename to tests/newusers/12_update_shell/config/etc/gshadow
diff --git a/tests/tests/newusers/12_update_shell/config/etc/pam.d/common-password b/tests/newusers/12_update_shell/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/12_update_shell/config/etc/pam.d/common-password
rename to tests/newusers/12_update_shell/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/12_update_shell/config/etc/pam.d/newusers b/tests/newusers/12_update_shell/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/12_update_shell/config/etc/pam.d/newusers
rename to tests/newusers/12_update_shell/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/12_update_shell/config/etc/passwd b/tests/newusers/12_update_shell/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/12_update_shell/config/etc/passwd
rename to tests/newusers/12_update_shell/config/etc/passwd
diff --git a/tests/tests/newusers/12_update_shell/config/etc/shadow b/tests/newusers/12_update_shell/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/12_update_shell/config/etc/shadow
rename to tests/newusers/12_update_shell/config/etc/shadow
diff --git a/tests/tests/newusers/12_update_shell/data/newusers.list b/tests/newusers/12_update_shell/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/12_update_shell/data/newusers.list
rename to tests/newusers/12_update_shell/data/newusers.list
diff --git a/tests/tests/newusers/12_update_shell/data/passwd b/tests/newusers/12_update_shell/data/passwd
similarity index 100%
rename from tests/tests/newusers/12_update_shell/data/passwd
rename to tests/newusers/12_update_shell/data/passwd
diff --git a/tests/tests/newusers/12_update_shell/data/shadow b/tests/newusers/12_update_shell/data/shadow
similarity index 100%
rename from tests/tests/newusers/12_update_shell/data/shadow
rename to tests/newusers/12_update_shell/data/shadow
diff --git a/tests/tests/newusers/12_update_shell/newusers.test b/tests/newusers/12_update_shell/newusers.test
similarity index 100%
rename from tests/tests/newusers/12_update_shell/newusers.test
rename to tests/newusers/12_update_shell/newusers.test
diff --git a/tests/tests/newgidmap/01_newgidmap/config.txt b/tests/newusers/13_create_user_new-home/config.txt
similarity index 100%
rename from tests/tests/newgidmap/01_newgidmap/config.txt
rename to tests/newusers/13_create_user_new-home/config.txt
diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/config/etc/group b/tests/newusers/13_create_user_new-home/config/etc/group
similarity index 100%
rename from tests/tests/newusers/08_create_user_pid_other-gid/config/etc/group
rename to tests/newusers/13_create_user_new-home/config/etc/group
diff --git a/tests/tests/newusers/12_update_shell/config/etc/gshadow b/tests/newusers/13_create_user_new-home/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/12_update_shell/config/etc/gshadow
rename to tests/newusers/13_create_user_new-home/config/etc/gshadow
diff --git a/tests/tests/newusers/13_create_user_new-home/config/etc/pam.d/common-password b/tests/newusers/13_create_user_new-home/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/13_create_user_new-home/config/etc/pam.d/common-password
rename to tests/newusers/13_create_user_new-home/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/13_create_user_new-home/config/etc/pam.d/newusers b/tests/newusers/13_create_user_new-home/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/13_create_user_new-home/config/etc/pam.d/newusers
rename to tests/newusers/13_create_user_new-home/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/config/etc/passwd b/tests/newusers/13_create_user_new-home/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/08_create_user_pid_other-gid/config/etc/passwd
rename to tests/newusers/13_create_user_new-home/config/etc/passwd
diff --git a/tests/tests/newusers/13_create_user_new-home/config/etc/shadow b/tests/newusers/13_create_user_new-home/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/13_create_user_new-home/config/etc/shadow
rename to tests/newusers/13_create_user_new-home/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/group b/tests/newusers/13_create_user_new-home/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/group
rename to tests/newusers/13_create_user_new-home/data/group
diff --git a/tests/tests/newusers/06_create_user_gid/data/gshadow b/tests/newusers/13_create_user_new-home/data/gshadow
similarity index 100%
rename from tests/tests/newusers/06_create_user_gid/data/gshadow
rename to tests/newusers/13_create_user_new-home/data/gshadow
diff --git a/tests/tests/newusers/13_create_user_new-home/data/home_ls-a b/tests/newusers/13_create_user_new-home/data/home_ls-a
similarity index 100%
rename from tests/tests/newusers/13_create_user_new-home/data/home_ls-a
rename to tests/newusers/13_create_user_new-home/data/home_ls-a
diff --git a/tests/tests/newusers/13_create_user_new-home/data/newusers.list b/tests/newusers/13_create_user_new-home/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/13_create_user_new-home/data/newusers.list
rename to tests/newusers/13_create_user_new-home/data/newusers.list
diff --git a/tests/tests/newusers/13_create_user_new-home/data/passwd b/tests/newusers/13_create_user_new-home/data/passwd
similarity index 100%
rename from tests/tests/newusers/13_create_user_new-home/data/passwd
rename to tests/newusers/13_create_user_new-home/data/passwd
diff --git a/tests/tests/newusers/13_create_user_new-home/data/shadow b/tests/newusers/13_create_user_new-home/data/shadow
similarity index 100%
rename from tests/tests/newusers/13_create_user_new-home/data/shadow
rename to tests/newusers/13_create_user_new-home/data/shadow
diff --git a/tests/tests/newusers/13_create_user_new-home/newusers.test b/tests/newusers/13_create_user_new-home/newusers.test
similarity index 100%
rename from tests/tests/newusers/13_create_user_new-home/newusers.test
rename to tests/newusers/13_create_user_new-home/newusers.test
diff --git a/tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/config.txt b/tests/newusers/14_create_user_existing-home/config.txt
similarity index 100%
rename from tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/config.txt
rename to tests/newusers/14_create_user_existing-home/config.txt
diff --git a/tests/tests/newusers/13_create_user_new-home/config/etc/group b/tests/newusers/14_create_user_existing-home/config/etc/group
similarity index 100%
rename from tests/tests/newusers/13_create_user_new-home/config/etc/group
rename to tests/newusers/14_create_user_existing-home/config/etc/group
diff --git a/tests/tests/newusers/13_create_user_new-home/config/etc/gshadow b/tests/newusers/14_create_user_existing-home/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/13_create_user_new-home/config/etc/gshadow
rename to tests/newusers/14_create_user_existing-home/config/etc/gshadow
diff --git a/tests/tests/newusers/14_create_user_existing-home/config/etc/pam.d/common-password b/tests/newusers/14_create_user_existing-home/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/14_create_user_existing-home/config/etc/pam.d/common-password
rename to tests/newusers/14_create_user_existing-home/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/14_create_user_existing-home/config/etc/pam.d/newusers b/tests/newusers/14_create_user_existing-home/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/14_create_user_existing-home/config/etc/pam.d/newusers
rename to tests/newusers/14_create_user_existing-home/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/13_create_user_new-home/config/etc/passwd b/tests/newusers/14_create_user_existing-home/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/13_create_user_new-home/config/etc/passwd
rename to tests/newusers/14_create_user_existing-home/config/etc/passwd
diff --git a/tests/tests/newusers/14_create_user_existing-home/config/etc/shadow b/tests/newusers/14_create_user_existing-home/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/14_create_user_existing-home/config/etc/shadow
rename to tests/newusers/14_create_user_existing-home/config/etc/shadow
diff --git a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/group b/tests/newusers/14_create_user_existing-home/data/group
similarity index 100%
rename from tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/group
rename to tests/newusers/14_create_user_existing-home/data/group
diff --git a/tests/tests/newusers/07_create_user_pid_gid/data/gshadow b/tests/newusers/14_create_user_existing-home/data/gshadow
similarity index 100%
rename from tests/tests/newusers/07_create_user_pid_gid/data/gshadow
rename to tests/newusers/14_create_user_existing-home/data/gshadow
diff --git a/tests/tests/newusers/14_create_user_existing-home/data/home_ls-a b/tests/newusers/14_create_user_existing-home/data/home_ls-a
similarity index 100%
rename from tests/tests/newusers/14_create_user_existing-home/data/home_ls-a
rename to tests/newusers/14_create_user_existing-home/data/home_ls-a
diff --git a/tests/tests/newusers/14_create_user_existing-home/data/newusers.list b/tests/newusers/14_create_user_existing-home/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/14_create_user_existing-home/data/newusers.list
rename to tests/newusers/14_create_user_existing-home/data/newusers.list
diff --git a/tests/tests/newusers/14_create_user_existing-home/data/passwd b/tests/newusers/14_create_user_existing-home/data/passwd
similarity index 100%
rename from tests/tests/newusers/14_create_user_existing-home/data/passwd
rename to tests/newusers/14_create_user_existing-home/data/passwd
diff --git a/tests/tests/newusers/14_create_user_existing-home/data/shadow b/tests/newusers/14_create_user_existing-home/data/shadow
similarity index 100%
rename from tests/tests/newusers/14_create_user_existing-home/data/shadow
rename to tests/newusers/14_create_user_existing-home/data/shadow
diff --git a/tests/tests/newusers/14_create_user_existing-home/newusers.test b/tests/newusers/14_create_user_existing-home/newusers.test
similarity index 100%
rename from tests/tests/newusers/14_create_user_existing-home/newusers.test
rename to tests/newusers/14_create_user_existing-home/newusers.test
diff --git a/tests/tests/newusers/15_update_new-home/config.txt b/tests/newusers/15_update_new-home/config.txt
similarity index 100%
rename from tests/tests/newusers/15_update_new-home/config.txt
rename to tests/newusers/15_update_new-home/config.txt
diff --git a/tests/tests/newusers/15_update_new-home/config/etc/group b/tests/newusers/15_update_new-home/config/etc/group
similarity index 100%
rename from tests/tests/newusers/15_update_new-home/config/etc/group
rename to tests/newusers/15_update_new-home/config/etc/group
diff --git a/tests/tests/newusers/14_create_user_existing-home/config/etc/gshadow b/tests/newusers/15_update_new-home/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/14_create_user_existing-home/config/etc/gshadow
rename to tests/newusers/15_update_new-home/config/etc/gshadow
diff --git a/tests/tests/newusers/15_update_new-home/config/etc/pam.d/common-password b/tests/newusers/15_update_new-home/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/15_update_new-home/config/etc/pam.d/common-password
rename to tests/newusers/15_update_new-home/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/15_update_new-home/config/etc/pam.d/newusers b/tests/newusers/15_update_new-home/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/15_update_new-home/config/etc/pam.d/newusers
rename to tests/newusers/15_update_new-home/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/15_update_new-home/config/etc/passwd b/tests/newusers/15_update_new-home/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/15_update_new-home/config/etc/passwd
rename to tests/newusers/15_update_new-home/config/etc/passwd
diff --git a/tests/tests/newusers/15_update_new-home/config/etc/shadow b/tests/newusers/15_update_new-home/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/15_update_new-home/config/etc/shadow
rename to tests/newusers/15_update_new-home/config/etc/shadow
diff --git a/tests/tests/newusers/15_update_new-home/data/home_ls-a b/tests/newusers/15_update_new-home/data/home_ls-a
similarity index 100%
rename from tests/tests/newusers/15_update_new-home/data/home_ls-a
rename to tests/newusers/15_update_new-home/data/home_ls-a
diff --git a/tests/tests/newusers/15_update_new-home/data/newusers.list b/tests/newusers/15_update_new-home/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/15_update_new-home/data/newusers.list
rename to tests/newusers/15_update_new-home/data/newusers.list
diff --git a/tests/tests/newusers/15_update_new-home/data/passwd b/tests/newusers/15_update_new-home/data/passwd
similarity index 100%
rename from tests/tests/newusers/15_update_new-home/data/passwd
rename to tests/newusers/15_update_new-home/data/passwd
diff --git a/tests/tests/newusers/15_update_new-home/data/shadow b/tests/newusers/15_update_new-home/data/shadow
similarity index 100%
rename from tests/tests/newusers/15_update_new-home/data/shadow
rename to tests/newusers/15_update_new-home/data/shadow
diff --git a/tests/tests/newusers/15_update_new-home/newusers.test b/tests/newusers/15_update_new-home/newusers.test
similarity index 100%
rename from tests/tests/newusers/15_update_new-home/newusers.test
rename to tests/newusers/15_update_new-home/newusers.test
diff --git a/tests/tests/newusers/16_update_existing-home/config.txt b/tests/newusers/16_update_existing-home/config.txt
similarity index 100%
rename from tests/tests/newusers/16_update_existing-home/config.txt
rename to tests/newusers/16_update_existing-home/config.txt
diff --git a/tests/tests/newusers/16_update_existing-home/config/etc/group b/tests/newusers/16_update_existing-home/config/etc/group
similarity index 100%
rename from tests/tests/newusers/16_update_existing-home/config/etc/group
rename to tests/newusers/16_update_existing-home/config/etc/group
diff --git a/tests/tests/newusers/15_update_new-home/config/etc/gshadow b/tests/newusers/16_update_existing-home/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/15_update_new-home/config/etc/gshadow
rename to tests/newusers/16_update_existing-home/config/etc/gshadow
diff --git a/tests/tests/newusers/16_update_existing-home/config/etc/pam.d/common-password b/tests/newusers/16_update_existing-home/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/16_update_existing-home/config/etc/pam.d/common-password
rename to tests/newusers/16_update_existing-home/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/16_update_existing-home/config/etc/pam.d/newusers b/tests/newusers/16_update_existing-home/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/16_update_existing-home/config/etc/pam.d/newusers
rename to tests/newusers/16_update_existing-home/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/16_update_existing-home/config/etc/passwd b/tests/newusers/16_update_existing-home/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/16_update_existing-home/config/etc/passwd
rename to tests/newusers/16_update_existing-home/config/etc/passwd
diff --git a/tests/tests/newusers/16_update_existing-home/config/etc/shadow b/tests/newusers/16_update_existing-home/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/16_update_existing-home/config/etc/shadow
rename to tests/newusers/16_update_existing-home/config/etc/shadow
diff --git a/tests/tests/newusers/16_update_existing-home/data/home_ls-a b/tests/newusers/16_update_existing-home/data/home_ls-a
similarity index 100%
rename from tests/tests/newusers/16_update_existing-home/data/home_ls-a
rename to tests/newusers/16_update_existing-home/data/home_ls-a
diff --git a/tests/tests/newusers/16_update_existing-home/data/newusers.list b/tests/newusers/16_update_existing-home/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/16_update_existing-home/data/newusers.list
rename to tests/newusers/16_update_existing-home/data/newusers.list
diff --git a/tests/tests/newusers/16_update_existing-home/data/passwd b/tests/newusers/16_update_existing-home/data/passwd
similarity index 100%
rename from tests/tests/newusers/16_update_existing-home/data/passwd
rename to tests/newusers/16_update_existing-home/data/passwd
diff --git a/tests/tests/newusers/16_update_existing-home/data/shadow b/tests/newusers/16_update_existing-home/data/shadow
similarity index 100%
rename from tests/tests/newusers/16_update_existing-home/data/shadow
rename to tests/newusers/16_update_existing-home/data/shadow
diff --git a/tests/tests/newusers/16_update_existing-home/newusers.test b/tests/newusers/16_update_existing-home/newusers.test
similarity index 100%
rename from tests/tests/newusers/16_update_existing-home/newusers.test
rename to tests/newusers/16_update_existing-home/newusers.test
diff --git a/tests/tests/newuidmap/01_newuidmap/config.txt b/tests/newusers/17_create_user_pid-already-used/config.txt
similarity index 100%
rename from tests/tests/newuidmap/01_newuidmap/config.txt
rename to tests/newusers/17_create_user_pid-already-used/config.txt
diff --git a/tests/tests/newusers/17_create_user_pid-already-used/config/etc/group b/tests/newusers/17_create_user_pid-already-used/config/etc/group
similarity index 100%
rename from tests/tests/newusers/17_create_user_pid-already-used/config/etc/group
rename to tests/newusers/17_create_user_pid-already-used/config/etc/group
diff --git a/tests/tests/newusers/17_create_user_pid-already-used/config/etc/gshadow b/tests/newusers/17_create_user_pid-already-used/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/17_create_user_pid-already-used/config/etc/gshadow
rename to tests/newusers/17_create_user_pid-already-used/config/etc/gshadow
diff --git a/tests/tests/newusers/17_create_user_pid-already-used/config/etc/pam.d/common-password b/tests/newusers/17_create_user_pid-already-used/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/17_create_user_pid-already-used/config/etc/pam.d/common-password
rename to tests/newusers/17_create_user_pid-already-used/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/17_create_user_pid-already-used/config/etc/pam.d/newusers b/tests/newusers/17_create_user_pid-already-used/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/17_create_user_pid-already-used/config/etc/pam.d/newusers
rename to tests/newusers/17_create_user_pid-already-used/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/17_create_user_pid-already-used/config/etc/passwd b/tests/newusers/17_create_user_pid-already-used/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/17_create_user_pid-already-used/config/etc/passwd
rename to tests/newusers/17_create_user_pid-already-used/config/etc/passwd
diff --git a/tests/tests/newusers/17_create_user_pid-already-used/config/etc/shadow b/tests/newusers/17_create_user_pid-already-used/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/17_create_user_pid-already-used/config/etc/shadow
rename to tests/newusers/17_create_user_pid-already-used/config/etc/shadow
diff --git a/tests/tests/newusers/17_create_user_pid-already-used/data/group b/tests/newusers/17_create_user_pid-already-used/data/group
similarity index 100%
rename from tests/tests/newusers/17_create_user_pid-already-used/data/group
rename to tests/newusers/17_create_user_pid-already-used/data/group
diff --git a/tests/tests/newusers/17_create_user_pid-already-used/data/gshadow b/tests/newusers/17_create_user_pid-already-used/data/gshadow
similarity index 100%
rename from tests/tests/newusers/17_create_user_pid-already-used/data/gshadow
rename to tests/newusers/17_create_user_pid-already-used/data/gshadow
diff --git a/tests/tests/newusers/17_create_user_pid-already-used/data/newusers.list b/tests/newusers/17_create_user_pid-already-used/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/17_create_user_pid-already-used/data/newusers.list
rename to tests/newusers/17_create_user_pid-already-used/data/newusers.list
diff --git a/tests/tests/newusers/17_create_user_pid-already-used/data/passwd b/tests/newusers/17_create_user_pid-already-used/data/passwd
similarity index 100%
rename from tests/tests/newusers/17_create_user_pid-already-used/data/passwd
rename to tests/newusers/17_create_user_pid-already-used/data/passwd
diff --git a/tests/tests/newusers/17_create_user_pid-already-used/data/shadow b/tests/newusers/17_create_user_pid-already-used/data/shadow
similarity index 100%
rename from tests/tests/newusers/17_create_user_pid-already-used/data/shadow
rename to tests/newusers/17_create_user_pid-already-used/data/shadow
diff --git a/tests/tests/newusers/17_create_user_pid-already-used/newusers.test b/tests/newusers/17_create_user_pid-already-used/newusers.test
similarity index 100%
rename from tests/tests/newusers/17_create_user_pid-already-used/newusers.test
rename to tests/newusers/17_create_user_pid-already-used/newusers.test
diff --git a/tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/config.txt b/tests/newusers/18_create_user_gid-already-used/config.txt
similarity index 100%
rename from tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/config.txt
rename to tests/newusers/18_create_user_gid-already-used/config.txt
diff --git a/tests/tests/newusers/18_create_user_gid-already-used/config/etc/group b/tests/newusers/18_create_user_gid-already-used/config/etc/group
similarity index 100%
rename from tests/tests/newusers/18_create_user_gid-already-used/config/etc/group
rename to tests/newusers/18_create_user_gid-already-used/config/etc/group
diff --git a/tests/tests/newusers/18_create_user_gid-already-used/config/etc/gshadow b/tests/newusers/18_create_user_gid-already-used/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/18_create_user_gid-already-used/config/etc/gshadow
rename to tests/newusers/18_create_user_gid-already-used/config/etc/gshadow
diff --git a/tests/tests/newusers/18_create_user_gid-already-used/config/etc/pam.d/common-password b/tests/newusers/18_create_user_gid-already-used/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/18_create_user_gid-already-used/config/etc/pam.d/common-password
rename to tests/newusers/18_create_user_gid-already-used/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/18_create_user_gid-already-used/config/etc/pam.d/newusers b/tests/newusers/18_create_user_gid-already-used/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/18_create_user_gid-already-used/config/etc/pam.d/newusers
rename to tests/newusers/18_create_user_gid-already-used/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/18_create_user_gid-already-used/config/etc/passwd b/tests/newusers/18_create_user_gid-already-used/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/18_create_user_gid-already-used/config/etc/passwd
rename to tests/newusers/18_create_user_gid-already-used/config/etc/passwd
diff --git a/tests/tests/newusers/18_create_user_gid-already-used/config/etc/shadow b/tests/newusers/18_create_user_gid-already-used/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/18_create_user_gid-already-used/config/etc/shadow
rename to tests/newusers/18_create_user_gid-already-used/config/etc/shadow
diff --git a/tests/tests/newusers/18_create_user_gid-already-used/data/newusers.list b/tests/newusers/18_create_user_gid-already-used/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/18_create_user_gid-already-used/data/newusers.list
rename to tests/newusers/18_create_user_gid-already-used/data/newusers.list
diff --git a/tests/tests/newusers/18_create_user_gid-already-used/data/passwd b/tests/newusers/18_create_user_gid-already-used/data/passwd
similarity index 100%
rename from tests/tests/newusers/18_create_user_gid-already-used/data/passwd
rename to tests/newusers/18_create_user_gid-already-used/data/passwd
diff --git a/tests/tests/newusers/18_create_user_gid-already-used/data/shadow b/tests/newusers/18_create_user_gid-already-used/data/shadow
similarity index 100%
rename from tests/tests/newusers/18_create_user_gid-already-used/data/shadow
rename to tests/newusers/18_create_user_gid-already-used/data/shadow
diff --git a/tests/tests/newusers/18_create_user_gid-already-used/newusers.test b/tests/newusers/18_create_user_gid-already-used/newusers.test
similarity index 100%
rename from tests/tests/newusers/18_create_user_gid-already-used/newusers.test
rename to tests/newusers/18_create_user_gid-already-used/newusers.test
diff --git a/tests/tests/newusers/19_update_keep-old-home/config.txt b/tests/newusers/19_update_keep-old-home/config.txt
similarity index 100%
rename from tests/tests/newusers/19_update_keep-old-home/config.txt
rename to tests/newusers/19_update_keep-old-home/config.txt
diff --git a/tests/tests/newusers/19_update_keep-old-home/config/etc/group b/tests/newusers/19_update_keep-old-home/config/etc/group
similarity index 100%
rename from tests/tests/newusers/19_update_keep-old-home/config/etc/group
rename to tests/newusers/19_update_keep-old-home/config/etc/group
diff --git a/tests/tests/newusers/16_update_existing-home/config/etc/gshadow b/tests/newusers/19_update_keep-old-home/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/16_update_existing-home/config/etc/gshadow
rename to tests/newusers/19_update_keep-old-home/config/etc/gshadow
diff --git a/tests/tests/newusers/19_update_keep-old-home/config/etc/pam.d/common-password b/tests/newusers/19_update_keep-old-home/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/19_update_keep-old-home/config/etc/pam.d/common-password
rename to tests/newusers/19_update_keep-old-home/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/19_update_keep-old-home/config/etc/pam.d/newusers b/tests/newusers/19_update_keep-old-home/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/19_update_keep-old-home/config/etc/pam.d/newusers
rename to tests/newusers/19_update_keep-old-home/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/19_update_keep-old-home/config/etc/passwd b/tests/newusers/19_update_keep-old-home/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/19_update_keep-old-home/config/etc/passwd
rename to tests/newusers/19_update_keep-old-home/config/etc/passwd
diff --git a/tests/tests/newusers/19_update_keep-old-home/config/etc/shadow b/tests/newusers/19_update_keep-old-home/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/19_update_keep-old-home/config/etc/shadow
rename to tests/newusers/19_update_keep-old-home/config/etc/shadow
diff --git a/tests/tests/newusers/19_update_keep-old-home/data/home_ls-a b/tests/newusers/19_update_keep-old-home/data/home_ls-a
similarity index 100%
rename from tests/tests/newusers/19_update_keep-old-home/data/home_ls-a
rename to tests/newusers/19_update_keep-old-home/data/home_ls-a
diff --git a/tests/tests/newusers/19_update_keep-old-home/data/home_ls-a.old b/tests/newusers/19_update_keep-old-home/data/home_ls-a.old
similarity index 100%
rename from tests/tests/newusers/19_update_keep-old-home/data/home_ls-a.old
rename to tests/newusers/19_update_keep-old-home/data/home_ls-a.old
diff --git a/tests/tests/newusers/19_update_keep-old-home/data/newusers.list b/tests/newusers/19_update_keep-old-home/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/19_update_keep-old-home/data/newusers.list
rename to tests/newusers/19_update_keep-old-home/data/newusers.list
diff --git a/tests/tests/newusers/19_update_keep-old-home/data/passwd b/tests/newusers/19_update_keep-old-home/data/passwd
similarity index 100%
rename from tests/tests/newusers/19_update_keep-old-home/data/passwd
rename to tests/newusers/19_update_keep-old-home/data/passwd
diff --git a/tests/tests/newusers/19_update_keep-old-home/data/shadow b/tests/newusers/19_update_keep-old-home/data/shadow
similarity index 100%
rename from tests/tests/newusers/19_update_keep-old-home/data/shadow
rename to tests/newusers/19_update_keep-old-home/data/shadow
diff --git a/tests/tests/newusers/19_update_keep-old-home/newusers.test b/tests/newusers/19_update_keep-old-home/newusers.test
similarity index 100%
rename from tests/tests/newusers/19_update_keep-old-home/newusers.test
rename to tests/newusers/19_update_keep-old-home/newusers.test
diff --git a/tests/tests/newusers/20_multiple_users/config.txt b/tests/newusers/20_multiple_users/config.txt
similarity index 100%
rename from tests/tests/newusers/20_multiple_users/config.txt
rename to tests/newusers/20_multiple_users/config.txt
diff --git a/tests/tests/newusers/20_multiple_users/config/etc/group b/tests/newusers/20_multiple_users/config/etc/group
similarity index 100%
rename from tests/tests/newusers/20_multiple_users/config/etc/group
rename to tests/newusers/20_multiple_users/config/etc/group
diff --git a/tests/tests/newusers/19_update_keep-old-home/config/etc/gshadow b/tests/newusers/20_multiple_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/19_update_keep-old-home/config/etc/gshadow
rename to tests/newusers/20_multiple_users/config/etc/gshadow
diff --git a/tests/tests/newusers/20_multiple_users/config/etc/pam.d/common-password b/tests/newusers/20_multiple_users/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/20_multiple_users/config/etc/pam.d/common-password
rename to tests/newusers/20_multiple_users/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/20_multiple_users/config/etc/pam.d/newusers b/tests/newusers/20_multiple_users/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/20_multiple_users/config/etc/pam.d/newusers
rename to tests/newusers/20_multiple_users/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/20_multiple_users/config/etc/passwd b/tests/newusers/20_multiple_users/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/20_multiple_users/config/etc/passwd
rename to tests/newusers/20_multiple_users/config/etc/passwd
diff --git a/tests/tests/newusers/20_multiple_users/config/etc/shadow b/tests/newusers/20_multiple_users/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/20_multiple_users/config/etc/shadow
rename to tests/newusers/20_multiple_users/config/etc/shadow
diff --git a/tests/tests/newusers/20_multiple_users/data/group b/tests/newusers/20_multiple_users/data/group
similarity index 100%
rename from tests/tests/newusers/20_multiple_users/data/group
rename to tests/newusers/20_multiple_users/data/group
diff --git a/tests/tests/newusers/20_multiple_users/data/gshadow b/tests/newusers/20_multiple_users/data/gshadow
similarity index 100%
rename from tests/tests/newusers/20_multiple_users/data/gshadow
rename to tests/newusers/20_multiple_users/data/gshadow
diff --git a/tests/tests/newusers/20_multiple_users/data/newusers.list b/tests/newusers/20_multiple_users/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/20_multiple_users/data/newusers.list
rename to tests/newusers/20_multiple_users/data/newusers.list
diff --git a/tests/tests/newusers/20_multiple_users/data/passwd b/tests/newusers/20_multiple_users/data/passwd
similarity index 100%
rename from tests/tests/newusers/20_multiple_users/data/passwd
rename to tests/newusers/20_multiple_users/data/passwd
diff --git a/tests/tests/newusers/20_multiple_users/data/shadow b/tests/newusers/20_multiple_users/data/shadow
similarity index 100%
rename from tests/tests/newusers/20_multiple_users/data/shadow
rename to tests/newusers/20_multiple_users/data/shadow
diff --git a/tests/tests/newusers/20_multiple_users/newusers.test b/tests/newusers/20_multiple_users/newusers.test
similarity index 100%
rename from tests/tests/newusers/20_multiple_users/newusers.test
rename to tests/newusers/20_multiple_users/newusers.test
diff --git a/tests/tests/newusers/01_create_user/config.txt b/tests/newusers/21_create_user_UID_MAX/config.txt
similarity index 100%
rename from tests/tests/newusers/01_create_user/config.txt
rename to tests/newusers/21_create_user_UID_MAX/config.txt
diff --git a/tests/tests/newusers/14_create_user_existing-home/config/etc/group b/tests/newusers/21_create_user_UID_MAX/config/etc/group
similarity index 100%
rename from tests/tests/newusers/14_create_user_existing-home/config/etc/group
rename to tests/newusers/21_create_user_UID_MAX/config/etc/group
diff --git a/tests/tests/newusers/20_multiple_users/config/etc/gshadow b/tests/newusers/21_create_user_UID_MAX/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/20_multiple_users/config/etc/gshadow
rename to tests/newusers/21_create_user_UID_MAX/config/etc/gshadow
diff --git a/tests/tests/newusers/21_create_user_UID_MAX/config/etc/pam.d/common-password b/tests/newusers/21_create_user_UID_MAX/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/21_create_user_UID_MAX/config/etc/pam.d/common-password
rename to tests/newusers/21_create_user_UID_MAX/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/21_create_user_UID_MAX/config/etc/pam.d/newusers b/tests/newusers/21_create_user_UID_MAX/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/21_create_user_UID_MAX/config/etc/pam.d/newusers
rename to tests/newusers/21_create_user_UID_MAX/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/14_create_user_existing-home/config/etc/passwd b/tests/newusers/21_create_user_UID_MAX/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/14_create_user_existing-home/config/etc/passwd
rename to tests/newusers/21_create_user_UID_MAX/config/etc/passwd
diff --git a/tests/tests/newusers/21_create_user_UID_MAX/config/etc/shadow b/tests/newusers/21_create_user_UID_MAX/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/21_create_user_UID_MAX/config/etc/shadow
rename to tests/newusers/21_create_user_UID_MAX/config/etc/shadow
diff --git a/tests/tests/newusers/21_create_user_UID_MAX/data/group b/tests/newusers/21_create_user_UID_MAX/data/group
similarity index 100%
rename from tests/tests/newusers/21_create_user_UID_MAX/data/group
rename to tests/newusers/21_create_user_UID_MAX/data/group
diff --git a/tests/tests/newusers/21_create_user_UID_MAX/data/gshadow b/tests/newusers/21_create_user_UID_MAX/data/gshadow
similarity index 100%
rename from tests/tests/newusers/21_create_user_UID_MAX/data/gshadow
rename to tests/newusers/21_create_user_UID_MAX/data/gshadow
diff --git a/tests/tests/newusers/21_create_user_UID_MAX/data/newusers.list b/tests/newusers/21_create_user_UID_MAX/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/21_create_user_UID_MAX/data/newusers.list
rename to tests/newusers/21_create_user_UID_MAX/data/newusers.list
diff --git a/tests/tests/newusers/21_create_user_UID_MAX/data/passwd b/tests/newusers/21_create_user_UID_MAX/data/passwd
similarity index 100%
rename from tests/tests/newusers/21_create_user_UID_MAX/data/passwd
rename to tests/newusers/21_create_user_UID_MAX/data/passwd
diff --git a/tests/tests/newusers/21_create_user_UID_MAX/data/shadow b/tests/newusers/21_create_user_UID_MAX/data/shadow
similarity index 100%
rename from tests/tests/newusers/21_create_user_UID_MAX/data/shadow
rename to tests/newusers/21_create_user_UID_MAX/data/shadow
diff --git a/tests/tests/newusers/21_create_user_UID_MAX/newusers.test b/tests/newusers/21_create_user_UID_MAX/newusers.test
similarity index 100%
rename from tests/tests/newusers/21_create_user_UID_MAX/newusers.test
rename to tests/newusers/21_create_user_UID_MAX/newusers.test
diff --git a/tests/tests/newusers/05_create_user_pid/config.txt b/tests/newusers/22_create_user_GID_MAX/config.txt
similarity index 100%
rename from tests/tests/newusers/05_create_user_pid/config.txt
rename to tests/newusers/22_create_user_GID_MAX/config.txt
diff --git a/tests/tests/newusers/21_create_user_UID_MAX/config/etc/group b/tests/newusers/22_create_user_GID_MAX/config/etc/group
similarity index 100%
rename from tests/tests/newusers/21_create_user_UID_MAX/config/etc/group
rename to tests/newusers/22_create_user_GID_MAX/config/etc/group
diff --git a/tests/tests/newusers/21_create_user_UID_MAX/config/etc/gshadow b/tests/newusers/22_create_user_GID_MAX/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/21_create_user_UID_MAX/config/etc/gshadow
rename to tests/newusers/22_create_user_GID_MAX/config/etc/gshadow
diff --git a/tests/tests/newusers/22_create_user_GID_MAX/config/etc/pam.d/common-password b/tests/newusers/22_create_user_GID_MAX/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/22_create_user_GID_MAX/config/etc/pam.d/common-password
rename to tests/newusers/22_create_user_GID_MAX/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/22_create_user_GID_MAX/config/etc/pam.d/newusers b/tests/newusers/22_create_user_GID_MAX/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/22_create_user_GID_MAX/config/etc/pam.d/newusers
rename to tests/newusers/22_create_user_GID_MAX/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/21_create_user_UID_MAX/config/etc/passwd b/tests/newusers/22_create_user_GID_MAX/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/21_create_user_UID_MAX/config/etc/passwd
rename to tests/newusers/22_create_user_GID_MAX/config/etc/passwd
diff --git a/tests/tests/newusers/22_create_user_GID_MAX/config/etc/shadow b/tests/newusers/22_create_user_GID_MAX/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/22_create_user_GID_MAX/config/etc/shadow
rename to tests/newusers/22_create_user_GID_MAX/config/etc/shadow
diff --git a/tests/tests/newusers/22_create_user_GID_MAX/data/group b/tests/newusers/22_create_user_GID_MAX/data/group
similarity index 100%
rename from tests/tests/newusers/22_create_user_GID_MAX/data/group
rename to tests/newusers/22_create_user_GID_MAX/data/group
diff --git a/tests/tests/newusers/22_create_user_GID_MAX/data/gshadow b/tests/newusers/22_create_user_GID_MAX/data/gshadow
similarity index 100%
rename from tests/tests/newusers/22_create_user_GID_MAX/data/gshadow
rename to tests/newusers/22_create_user_GID_MAX/data/gshadow
diff --git a/tests/tests/newusers/22_create_user_GID_MAX/data/newusers.list b/tests/newusers/22_create_user_GID_MAX/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/22_create_user_GID_MAX/data/newusers.list
rename to tests/newusers/22_create_user_GID_MAX/data/newusers.list
diff --git a/tests/tests/newusers/22_create_user_GID_MAX/data/passwd b/tests/newusers/22_create_user_GID_MAX/data/passwd
similarity index 100%
rename from tests/tests/newusers/22_create_user_GID_MAX/data/passwd
rename to tests/newusers/22_create_user_GID_MAX/data/passwd
diff --git a/tests/tests/newusers/22_create_user_GID_MAX/data/shadow b/tests/newusers/22_create_user_GID_MAX/data/shadow
similarity index 100%
rename from tests/tests/newusers/22_create_user_GID_MAX/data/shadow
rename to tests/newusers/22_create_user_GID_MAX/data/shadow
diff --git a/tests/tests/newusers/22_create_user_GID_MAX/newusers.test b/tests/newusers/22_create_user_GID_MAX/newusers.test
similarity index 100%
rename from tests/tests/newusers/22_create_user_GID_MAX/newusers.test
rename to tests/newusers/22_create_user_GID_MAX/newusers.test
diff --git a/tests/tests/newusers/06_create_user_gid/config.txt b/tests/newusers/23_create_user_error_negative_UID/config.txt
similarity index 100%
rename from tests/tests/newusers/06_create_user_gid/config.txt
rename to tests/newusers/23_create_user_error_negative_UID/config.txt
diff --git a/tests/tests/newusers/22_create_user_GID_MAX/config/etc/group b/tests/newusers/23_create_user_error_negative_UID/config/etc/group
similarity index 100%
rename from tests/tests/newusers/22_create_user_GID_MAX/config/etc/group
rename to tests/newusers/23_create_user_error_negative_UID/config/etc/group
diff --git a/tests/tests/newusers/22_create_user_GID_MAX/config/etc/gshadow b/tests/newusers/23_create_user_error_negative_UID/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/22_create_user_GID_MAX/config/etc/gshadow
rename to tests/newusers/23_create_user_error_negative_UID/config/etc/gshadow
diff --git a/tests/tests/newusers/22_create_user_GID_MAX/config/etc/passwd b/tests/newusers/23_create_user_error_negative_UID/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/22_create_user_GID_MAX/config/etc/passwd
rename to tests/newusers/23_create_user_error_negative_UID/config/etc/passwd
diff --git a/tests/tests/newusers/23_create_user_error_negative_UID/config/etc/shadow b/tests/newusers/23_create_user_error_negative_UID/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/23_create_user_error_negative_UID/config/etc/shadow
rename to tests/newusers/23_create_user_error_negative_UID/config/etc/shadow
diff --git a/tests/tests/newusers/23_create_user_error_negative_UID/data/newusers.err b/tests/newusers/23_create_user_error_negative_UID/data/newusers.err
similarity index 100%
rename from tests/tests/newusers/23_create_user_error_negative_UID/data/newusers.err
rename to tests/newusers/23_create_user_error_negative_UID/data/newusers.err
diff --git a/tests/tests/newusers/23_create_user_error_negative_UID/data/newusers.list b/tests/newusers/23_create_user_error_negative_UID/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/23_create_user_error_negative_UID/data/newusers.list
rename to tests/newusers/23_create_user_error_negative_UID/data/newusers.list
diff --git a/tests/tests/newusers/23_create_user_error_negative_UID/newusers.test b/tests/newusers/23_create_user_error_negative_UID/newusers.test
similarity index 100%
rename from tests/tests/newusers/23_create_user_error_negative_UID/newusers.test
rename to tests/newusers/23_create_user_error_negative_UID/newusers.test
diff --git a/tests/tests/newusers/07_create_user_pid_gid/config.txt b/tests/newusers/24_create_user_error_invalid_UID/config.txt
similarity index 100%
rename from tests/tests/newusers/07_create_user_pid_gid/config.txt
rename to tests/newusers/24_create_user_error_invalid_UID/config.txt
diff --git a/tests/tests/newusers/23_create_user_error_negative_UID/config/etc/group b/tests/newusers/24_create_user_error_invalid_UID/config/etc/group
similarity index 100%
rename from tests/tests/newusers/23_create_user_error_negative_UID/config/etc/group
rename to tests/newusers/24_create_user_error_invalid_UID/config/etc/group
diff --git a/tests/tests/newusers/23_create_user_error_negative_UID/config/etc/gshadow b/tests/newusers/24_create_user_error_invalid_UID/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/23_create_user_error_negative_UID/config/etc/gshadow
rename to tests/newusers/24_create_user_error_invalid_UID/config/etc/gshadow
diff --git a/tests/tests/newusers/23_create_user_error_negative_UID/config/etc/passwd b/tests/newusers/24_create_user_error_invalid_UID/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/23_create_user_error_negative_UID/config/etc/passwd
rename to tests/newusers/24_create_user_error_invalid_UID/config/etc/passwd
diff --git a/tests/tests/newusers/24_create_user_error_invalid_UID/config/etc/shadow b/tests/newusers/24_create_user_error_invalid_UID/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/24_create_user_error_invalid_UID/config/etc/shadow
rename to tests/newusers/24_create_user_error_invalid_UID/config/etc/shadow
diff --git a/tests/tests/newusers/24_create_user_error_invalid_UID/data/newusers.err b/tests/newusers/24_create_user_error_invalid_UID/data/newusers.err
similarity index 100%
rename from tests/tests/newusers/24_create_user_error_invalid_UID/data/newusers.err
rename to tests/newusers/24_create_user_error_invalid_UID/data/newusers.err
diff --git a/tests/tests/newusers/24_create_user_error_invalid_UID/data/newusers.list b/tests/newusers/24_create_user_error_invalid_UID/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/24_create_user_error_invalid_UID/data/newusers.list
rename to tests/newusers/24_create_user_error_invalid_UID/data/newusers.list
diff --git a/tests/tests/newusers/24_create_user_error_invalid_UID/newusers.test b/tests/newusers/24_create_user_error_invalid_UID/newusers.test
similarity index 100%
rename from tests/tests/newusers/24_create_user_error_invalid_UID/newusers.test
rename to tests/newusers/24_create_user_error_invalid_UID/newusers.test
diff --git a/tests/tests/newusers/25_create_user_error_no_remaining_UID/config.txt b/tests/newusers/25_create_user_error_no_remaining_UID/config.txt
similarity index 100%
rename from tests/tests/newusers/25_create_user_error_no_remaining_UID/config.txt
rename to tests/newusers/25_create_user_error_no_remaining_UID/config.txt
diff --git a/tests/tests/newusers/24_create_user_error_invalid_UID/config/etc/group b/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/group
similarity index 100%
rename from tests/tests/newusers/24_create_user_error_invalid_UID/config/etc/group
rename to tests/newusers/25_create_user_error_no_remaining_UID/config/etc/group
diff --git a/tests/tests/newusers/24_create_user_error_invalid_UID/config/etc/gshadow b/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/24_create_user_error_invalid_UID/config/etc/gshadow
rename to tests/newusers/25_create_user_error_no_remaining_UID/config/etc/gshadow
diff --git a/tests/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/login.defs b/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/login.defs
similarity index 100%
rename from tests/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/login.defs
rename to tests/newusers/25_create_user_error_no_remaining_UID/config/etc/login.defs
diff --git a/tests/tests/newusers/24_create_user_error_invalid_UID/config/etc/passwd b/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/24_create_user_error_invalid_UID/config/etc/passwd
rename to tests/newusers/25_create_user_error_no_remaining_UID/config/etc/passwd
diff --git a/tests/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/shadow b/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/shadow
rename to tests/newusers/25_create_user_error_no_remaining_UID/config/etc/shadow
diff --git a/tests/tests/newusers/25_create_user_error_no_remaining_UID/data/newusers.err b/tests/newusers/25_create_user_error_no_remaining_UID/data/newusers.err
similarity index 100%
rename from tests/tests/newusers/25_create_user_error_no_remaining_UID/data/newusers.err
rename to tests/newusers/25_create_user_error_no_remaining_UID/data/newusers.err
diff --git a/tests/tests/newusers/25_create_user_error_no_remaining_UID/data/newusers.list b/tests/newusers/25_create_user_error_no_remaining_UID/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/25_create_user_error_no_remaining_UID/data/newusers.list
rename to tests/newusers/25_create_user_error_no_remaining_UID/data/newusers.list
diff --git a/tests/tests/newusers/25_create_user_error_no_remaining_UID/newusers.test b/tests/newusers/25_create_user_error_no_remaining_UID/newusers.test
similarity index 100%
rename from tests/tests/newusers/25_create_user_error_no_remaining_UID/newusers.test
rename to tests/newusers/25_create_user_error_no_remaining_UID/newusers.test
diff --git a/tests/tests/newusers/26_create_user_error_no_remaining_GID/config.txt b/tests/newusers/26_create_user_error_no_remaining_GID/config.txt
similarity index 100%
rename from tests/tests/newusers/26_create_user_error_no_remaining_GID/config.txt
rename to tests/newusers/26_create_user_error_no_remaining_GID/config.txt
diff --git a/tests/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/group b/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/group
similarity index 100%
rename from tests/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/group
rename to tests/newusers/26_create_user_error_no_remaining_GID/config/etc/group
diff --git a/tests/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/gshadow b/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/gshadow
rename to tests/newusers/26_create_user_error_no_remaining_GID/config/etc/gshadow
diff --git a/tests/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/login.defs b/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/login.defs
similarity index 100%
rename from tests/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/login.defs
rename to tests/newusers/26_create_user_error_no_remaining_GID/config/etc/login.defs
diff --git a/tests/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/passwd b/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/25_create_user_error_no_remaining_UID/config/etc/passwd
rename to tests/newusers/26_create_user_error_no_remaining_GID/config/etc/passwd
diff --git a/tests/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/shadow b/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/shadow
rename to tests/newusers/26_create_user_error_no_remaining_GID/config/etc/shadow
diff --git a/tests/tests/newusers/26_create_user_error_no_remaining_GID/data/newusers.err b/tests/newusers/26_create_user_error_no_remaining_GID/data/newusers.err
similarity index 100%
rename from tests/tests/newusers/26_create_user_error_no_remaining_GID/data/newusers.err
rename to tests/newusers/26_create_user_error_no_remaining_GID/data/newusers.err
diff --git a/tests/tests/newusers/26_create_user_error_no_remaining_GID/data/newusers.list b/tests/newusers/26_create_user_error_no_remaining_GID/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/26_create_user_error_no_remaining_GID/data/newusers.list
rename to tests/newusers/26_create_user_error_no_remaining_GID/data/newusers.list
diff --git a/tests/tests/newusers/26_create_user_error_no_remaining_GID/newusers.test b/tests/newusers/26_create_user_error_no_remaining_GID/newusers.test
similarity index 100%
rename from tests/tests/newusers/26_create_user_error_no_remaining_GID/newusers.test
rename to tests/newusers/26_create_user_error_no_remaining_GID/newusers.test
diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/config.txt b/tests/newusers/27_create_user_error_invalid_username/config.txt
similarity index 100%
rename from tests/tests/newusers/08_create_user_pid_other-gid/config.txt
rename to tests/newusers/27_create_user_error_invalid_username/config.txt
diff --git a/tests/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/group b/tests/newusers/27_create_user_error_invalid_username/config/etc/group
similarity index 100%
rename from tests/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/group
rename to tests/newusers/27_create_user_error_invalid_username/config/etc/group
diff --git a/tests/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/gshadow b/tests/newusers/27_create_user_error_invalid_username/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/gshadow
rename to tests/newusers/27_create_user_error_invalid_username/config/etc/gshadow
diff --git a/tests/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/passwd b/tests/newusers/27_create_user_error_invalid_username/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/passwd
rename to tests/newusers/27_create_user_error_invalid_username/config/etc/passwd
diff --git a/tests/tests/newusers/27_create_user_error_invalid_username/config/etc/shadow b/tests/newusers/27_create_user_error_invalid_username/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/27_create_user_error_invalid_username/config/etc/shadow
rename to tests/newusers/27_create_user_error_invalid_username/config/etc/shadow
diff --git a/tests/tests/newusers/27_create_user_error_invalid_username/data/newusers.err b/tests/newusers/27_create_user_error_invalid_username/data/newusers.err
similarity index 100%
rename from tests/tests/newusers/27_create_user_error_invalid_username/data/newusers.err
rename to tests/newusers/27_create_user_error_invalid_username/data/newusers.err
diff --git a/tests/tests/newusers/27_create_user_error_invalid_username/data/newusers.list b/tests/newusers/27_create_user_error_invalid_username/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/27_create_user_error_invalid_username/data/newusers.list
rename to tests/newusers/27_create_user_error_invalid_username/data/newusers.list
diff --git a/tests/tests/newusers/27_create_user_error_invalid_username/newusers.test b/tests/newusers/27_create_user_error_invalid_username/newusers.test
similarity index 100%
rename from tests/tests/newusers/27_create_user_error_invalid_username/newusers.test
rename to tests/newusers/27_create_user_error_invalid_username/newusers.test
diff --git a/tests/tests/newusers/09_create_user_pid-as-user-bar/config.txt b/tests/newusers/28_create_user_error_invalid_groupname/config.txt
similarity index 100%
rename from tests/tests/newusers/09_create_user_pid-as-user-bar/config.txt
rename to tests/newusers/28_create_user_error_invalid_groupname/config.txt
diff --git a/tests/tests/newusers/27_create_user_error_invalid_username/config/etc/group b/tests/newusers/28_create_user_error_invalid_groupname/config/etc/group
similarity index 100%
rename from tests/tests/newusers/27_create_user_error_invalid_username/config/etc/group
rename to tests/newusers/28_create_user_error_invalid_groupname/config/etc/group
diff --git a/tests/tests/newusers/27_create_user_error_invalid_username/config/etc/gshadow b/tests/newusers/28_create_user_error_invalid_groupname/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/27_create_user_error_invalid_username/config/etc/gshadow
rename to tests/newusers/28_create_user_error_invalid_groupname/config/etc/gshadow
diff --git a/tests/tests/newusers/27_create_user_error_invalid_username/config/etc/passwd b/tests/newusers/28_create_user_error_invalid_groupname/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/27_create_user_error_invalid_username/config/etc/passwd
rename to tests/newusers/28_create_user_error_invalid_groupname/config/etc/passwd
diff --git a/tests/tests/newusers/28_create_user_error_invalid_groupname/config/etc/shadow b/tests/newusers/28_create_user_error_invalid_groupname/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/28_create_user_error_invalid_groupname/config/etc/shadow
rename to tests/newusers/28_create_user_error_invalid_groupname/config/etc/shadow
diff --git a/tests/tests/newusers/28_create_user_error_invalid_groupname/data/newusers.err b/tests/newusers/28_create_user_error_invalid_groupname/data/newusers.err
similarity index 100%
rename from tests/tests/newusers/28_create_user_error_invalid_groupname/data/newusers.err
rename to tests/newusers/28_create_user_error_invalid_groupname/data/newusers.err
diff --git a/tests/tests/newusers/28_create_user_error_invalid_groupname/data/newusers.list b/tests/newusers/28_create_user_error_invalid_groupname/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/28_create_user_error_invalid_groupname/data/newusers.list
rename to tests/newusers/28_create_user_error_invalid_groupname/data/newusers.list
diff --git a/tests/tests/newusers/28_create_user_error_invalid_groupname/newusers.test b/tests/newusers/28_create_user_error_invalid_groupname/newusers.test
similarity index 100%
rename from tests/tests/newusers/28_create_user_error_invalid_groupname/newusers.test
rename to tests/newusers/28_create_user_error_invalid_groupname/newusers.test
diff --git a/tests/tests/newusers/10_create_user_gid-as-group-bar/config.txt b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config.txt
similarity index 100%
rename from tests/tests/newusers/10_create_user_gid-as-group-bar/config.txt
rename to tests/newusers/29_create_user_error_invalid_username_valid_groupname/config.txt
diff --git a/tests/tests/newusers/28_create_user_error_invalid_groupname/config/etc/group b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/group
similarity index 100%
rename from tests/tests/newusers/28_create_user_error_invalid_groupname/config/etc/group
rename to tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/group
diff --git a/tests/tests/newusers/28_create_user_error_invalid_groupname/config/etc/gshadow b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/28_create_user_error_invalid_groupname/config/etc/gshadow
rename to tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/gshadow
diff --git a/tests/tests/newusers/28_create_user_error_invalid_groupname/config/etc/passwd b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/28_create_user_error_invalid_groupname/config/etc/passwd
rename to tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/passwd
diff --git a/tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/shadow b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/shadow
rename to tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/shadow
diff --git a/tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/newusers.err b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/newusers.err
similarity index 100%
rename from tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/newusers.err
rename to tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/newusers.err
diff --git a/tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/newusers.list b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/newusers.list
rename to tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/newusers.list
diff --git a/tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/newusers.test b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/newusers.test
similarity index 100%
rename from tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/newusers.test
rename to tests/newusers/29_create_user_error_invalid_username_valid_groupname/newusers.test
diff --git a/tests/tests/newusers/13_create_user_new-home/config.txt b/tests/newusers/30_create_user_different_groupname/config.txt
similarity index 100%
rename from tests/tests/newusers/13_create_user_new-home/config.txt
rename to tests/newusers/30_create_user_different_groupname/config.txt
diff --git a/tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/group b/tests/newusers/30_create_user_different_groupname/config/etc/group
similarity index 100%
rename from tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/group
rename to tests/newusers/30_create_user_different_groupname/config/etc/group
diff --git a/tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/gshadow b/tests/newusers/30_create_user_different_groupname/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/gshadow
rename to tests/newusers/30_create_user_different_groupname/config/etc/gshadow
diff --git a/tests/tests/newusers/30_create_user_different_groupname/config/etc/pam.d/common-password b/tests/newusers/30_create_user_different_groupname/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/30_create_user_different_groupname/config/etc/pam.d/common-password
rename to tests/newusers/30_create_user_different_groupname/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/30_create_user_different_groupname/config/etc/pam.d/newusers b/tests/newusers/30_create_user_different_groupname/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/30_create_user_different_groupname/config/etc/pam.d/newusers
rename to tests/newusers/30_create_user_different_groupname/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/passwd b/tests/newusers/30_create_user_different_groupname/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config/etc/passwd
rename to tests/newusers/30_create_user_different_groupname/config/etc/passwd
diff --git a/tests/tests/newusers/30_create_user_different_groupname/config/etc/shadow b/tests/newusers/30_create_user_different_groupname/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/30_create_user_different_groupname/config/etc/shadow
rename to tests/newusers/30_create_user_different_groupname/config/etc/shadow
diff --git a/tests/tests/newusers/30_create_user_different_groupname/data/group b/tests/newusers/30_create_user_different_groupname/data/group
similarity index 100%
rename from tests/tests/newusers/30_create_user_different_groupname/data/group
rename to tests/newusers/30_create_user_different_groupname/data/group
diff --git a/tests/tests/newusers/30_create_user_different_groupname/data/gshadow b/tests/newusers/30_create_user_different_groupname/data/gshadow
similarity index 100%
rename from tests/tests/newusers/30_create_user_different_groupname/data/gshadow
rename to tests/newusers/30_create_user_different_groupname/data/gshadow
diff --git a/tests/tests/newusers/30_create_user_different_groupname/data/newusers.list b/tests/newusers/30_create_user_different_groupname/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/30_create_user_different_groupname/data/newusers.list
rename to tests/newusers/30_create_user_different_groupname/data/newusers.list
diff --git a/tests/tests/newusers/30_create_user_different_groupname/data/passwd b/tests/newusers/30_create_user_different_groupname/data/passwd
similarity index 100%
rename from tests/tests/newusers/30_create_user_different_groupname/data/passwd
rename to tests/newusers/30_create_user_different_groupname/data/passwd
diff --git a/tests/tests/newusers/30_create_user_different_groupname/data/shadow b/tests/newusers/30_create_user_different_groupname/data/shadow
similarity index 100%
rename from tests/tests/newusers/30_create_user_different_groupname/data/shadow
rename to tests/newusers/30_create_user_different_groupname/data/shadow
diff --git a/tests/tests/newusers/30_create_user_different_groupname/newusers.test b/tests/newusers/30_create_user_different_groupname/newusers.test
similarity index 100%
rename from tests/tests/newusers/30_create_user_different_groupname/newusers.test
rename to tests/newusers/30_create_user_different_groupname/newusers.test
diff --git a/tests/tests/newusers/14_create_user_existing-home/config.txt b/tests/newusers/31_create_user_error_invalid_GID/config.txt
similarity index 100%
rename from tests/tests/newusers/14_create_user_existing-home/config.txt
rename to tests/newusers/31_create_user_error_invalid_GID/config.txt
diff --git a/tests/tests/newusers/30_create_user_different_groupname/config/etc/group b/tests/newusers/31_create_user_error_invalid_GID/config/etc/group
similarity index 100%
rename from tests/tests/newusers/30_create_user_different_groupname/config/etc/group
rename to tests/newusers/31_create_user_error_invalid_GID/config/etc/group
diff --git a/tests/tests/newusers/30_create_user_different_groupname/config/etc/gshadow b/tests/newusers/31_create_user_error_invalid_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/30_create_user_different_groupname/config/etc/gshadow
rename to tests/newusers/31_create_user_error_invalid_GID/config/etc/gshadow
diff --git a/tests/tests/newusers/30_create_user_different_groupname/config/etc/passwd b/tests/newusers/31_create_user_error_invalid_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/30_create_user_different_groupname/config/etc/passwd
rename to tests/newusers/31_create_user_error_invalid_GID/config/etc/passwd
diff --git a/tests/tests/newusers/31_create_user_error_invalid_GID/config/etc/shadow b/tests/newusers/31_create_user_error_invalid_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/31_create_user_error_invalid_GID/config/etc/shadow
rename to tests/newusers/31_create_user_error_invalid_GID/config/etc/shadow
diff --git a/tests/tests/newusers/31_create_user_error_invalid_GID/data/newusers.err b/tests/newusers/31_create_user_error_invalid_GID/data/newusers.err
similarity index 100%
rename from tests/tests/newusers/31_create_user_error_invalid_GID/data/newusers.err
rename to tests/newusers/31_create_user_error_invalid_GID/data/newusers.err
diff --git a/tests/tests/newusers/31_create_user_error_invalid_GID/data/newusers.list b/tests/newusers/31_create_user_error_invalid_GID/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/31_create_user_error_invalid_GID/data/newusers.list
rename to tests/newusers/31_create_user_error_invalid_GID/data/newusers.list
diff --git a/tests/tests/newusers/31_create_user_error_invalid_GID/newusers.test b/tests/newusers/31_create_user_error_invalid_GID/newusers.test
similarity index 100%
rename from tests/tests/newusers/31_create_user_error_invalid_GID/newusers.test
rename to tests/newusers/31_create_user_error_invalid_GID/newusers.test
diff --git a/tests/tests/newusers/32_create_user_error_gshadow_group_exists/config.txt b/tests/newusers/32_create_user_error_gshadow_group_exists/config.txt
similarity index 100%
rename from tests/tests/newusers/32_create_user_error_gshadow_group_exists/config.txt
rename to tests/newusers/32_create_user_error_gshadow_group_exists/config.txt
diff --git a/tests/tests/newusers/31_create_user_error_invalid_GID/config/etc/group b/tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/group
similarity index 100%
rename from tests/tests/newusers/31_create_user_error_invalid_GID/config/etc/group
rename to tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/group
diff --git a/tests/tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/gshadow b/tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/gshadow
rename to tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/gshadow
diff --git a/tests/tests/newusers/31_create_user_error_invalid_GID/config/etc/passwd b/tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/31_create_user_error_invalid_GID/config/etc/passwd
rename to tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/passwd
diff --git a/tests/tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/shadow b/tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/shadow
rename to tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/shadow
diff --git a/tests/tests/newusers/32_create_user_error_gshadow_group_exists/data/newusers.err b/tests/newusers/32_create_user_error_gshadow_group_exists/data/newusers.err
similarity index 100%
rename from tests/tests/newusers/32_create_user_error_gshadow_group_exists/data/newusers.err
rename to tests/newusers/32_create_user_error_gshadow_group_exists/data/newusers.err
diff --git a/tests/tests/newusers/32_create_user_error_gshadow_group_exists/data/newusers.list b/tests/newusers/32_create_user_error_gshadow_group_exists/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/32_create_user_error_gshadow_group_exists/data/newusers.list
rename to tests/newusers/32_create_user_error_gshadow_group_exists/data/newusers.list
diff --git a/tests/tests/newusers/32_create_user_error_gshadow_group_exists/newusers.test b/tests/newusers/32_create_user_error_gshadow_group_exists/newusers.test
similarity index 100%
rename from tests/tests/newusers/32_create_user_error_gshadow_group_exists/newusers.test
rename to tests/newusers/32_create_user_error_gshadow_group_exists/newusers.test
diff --git a/tests/tests/newusers/33_update_password_no_shadow_password/config.txt b/tests/newusers/33_update_password_no_shadow_password/config.txt
similarity index 100%
rename from tests/tests/newusers/33_update_password_no_shadow_password/config.txt
rename to tests/newusers/33_update_password_no_shadow_password/config.txt
diff --git a/tests/tests/newusers/33_update_password_no_shadow_password/config/etc/group b/tests/newusers/33_update_password_no_shadow_password/config/etc/group
similarity index 100%
rename from tests/tests/newusers/33_update_password_no_shadow_password/config/etc/group
rename to tests/newusers/33_update_password_no_shadow_password/config/etc/group
diff --git a/tests/tests/newusers/31_create_user_error_invalid_GID/config/etc/gshadow b/tests/newusers/33_update_password_no_shadow_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/31_create_user_error_invalid_GID/config/etc/gshadow
rename to tests/newusers/33_update_password_no_shadow_password/config/etc/gshadow
diff --git a/tests/tests/newusers/33_update_password_no_shadow_password/config/etc/pam.d/common-password b/tests/newusers/33_update_password_no_shadow_password/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/33_update_password_no_shadow_password/config/etc/pam.d/common-password
rename to tests/newusers/33_update_password_no_shadow_password/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/33_update_password_no_shadow_password/config/etc/pam.d/newusers b/tests/newusers/33_update_password_no_shadow_password/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/33_update_password_no_shadow_password/config/etc/pam.d/newusers
rename to tests/newusers/33_update_password_no_shadow_password/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/33_update_password_no_shadow_password/config/etc/passwd b/tests/newusers/33_update_password_no_shadow_password/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/33_update_password_no_shadow_password/config/etc/passwd
rename to tests/newusers/33_update_password_no_shadow_password/config/etc/passwd
diff --git a/tests/tests/newusers/33_update_password_no_shadow_password/config/etc/shadow b/tests/newusers/33_update_password_no_shadow_password/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/33_update_password_no_shadow_password/config/etc/shadow
rename to tests/newusers/33_update_password_no_shadow_password/config/etc/shadow
diff --git a/tests/tests/newusers/33_update_password_no_shadow_password/data/newusers.list b/tests/newusers/33_update_password_no_shadow_password/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/33_update_password_no_shadow_password/data/newusers.list
rename to tests/newusers/33_update_password_no_shadow_password/data/newusers.list
diff --git a/tests/tests/newusers/33_update_password_no_shadow_password/data/passwd b/tests/newusers/33_update_password_no_shadow_password/data/passwd
similarity index 100%
rename from tests/tests/newusers/33_update_password_no_shadow_password/data/passwd
rename to tests/newusers/33_update_password_no_shadow_password/data/passwd
diff --git a/tests/tests/newusers/33_update_password_no_shadow_password/newusers.test b/tests/newusers/33_update_password_no_shadow_password/newusers.test
similarity index 100%
rename from tests/tests/newusers/33_update_password_no_shadow_password/newusers.test
rename to tests/newusers/33_update_password_no_shadow_password/newusers.test
diff --git a/tests/tests/newusers/34_update_password_no_shadow/config.txt b/tests/newusers/34_update_password_no_shadow/config.txt
similarity index 100%
rename from tests/tests/newusers/34_update_password_no_shadow/config.txt
rename to tests/newusers/34_update_password_no_shadow/config.txt
diff --git a/tests/tests/newusers/34_update_password_no_shadow/config/etc/group b/tests/newusers/34_update_password_no_shadow/config/etc/group
similarity index 100%
rename from tests/tests/newusers/34_update_password_no_shadow/config/etc/group
rename to tests/newusers/34_update_password_no_shadow/config/etc/group
diff --git a/tests/tests/newusers/33_update_password_no_shadow_password/config/etc/gshadow b/tests/newusers/34_update_password_no_shadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/33_update_password_no_shadow_password/config/etc/gshadow
rename to tests/newusers/34_update_password_no_shadow/config/etc/gshadow
diff --git a/tests/tests/newusers/34_update_password_no_shadow/config/etc/pam.d/common-password b/tests/newusers/34_update_password_no_shadow/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/34_update_password_no_shadow/config/etc/pam.d/common-password
rename to tests/newusers/34_update_password_no_shadow/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/34_update_password_no_shadow/config/etc/pam.d/newusers b/tests/newusers/34_update_password_no_shadow/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/34_update_password_no_shadow/config/etc/pam.d/newusers
rename to tests/newusers/34_update_password_no_shadow/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/34_update_password_no_shadow/config/etc/passwd b/tests/newusers/34_update_password_no_shadow/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/34_update_password_no_shadow/config/etc/passwd
rename to tests/newusers/34_update_password_no_shadow/config/etc/passwd
diff --git a/tests/tests/newusers/34_update_password_no_shadow/config/etc/shadow b/tests/newusers/34_update_password_no_shadow/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/34_update_password_no_shadow/config/etc/shadow
rename to tests/newusers/34_update_password_no_shadow/config/etc/shadow
diff --git a/tests/tests/newusers/34_update_password_no_shadow/data/newusers.list b/tests/newusers/34_update_password_no_shadow/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/34_update_password_no_shadow/data/newusers.list
rename to tests/newusers/34_update_password_no_shadow/data/newusers.list
diff --git a/tests/tests/newusers/34_update_password_no_shadow/data/passwd b/tests/newusers/34_update_password_no_shadow/data/passwd
similarity index 100%
rename from tests/tests/newusers/34_update_password_no_shadow/data/passwd
rename to tests/newusers/34_update_password_no_shadow/data/passwd
diff --git a/tests/tests/newusers/34_update_password_no_shadow/newusers.test b/tests/newusers/34_update_password_no_shadow/newusers.test
similarity index 100%
rename from tests/tests/newusers/34_update_password_no_shadow/newusers.test
rename to tests/newusers/34_update_password_no_shadow/newusers.test
diff --git a/tests/tests/newusers/17_create_user_pid-already-used/config.txt b/tests/newusers/35_read_from_stdin/config.txt
similarity index 100%
rename from tests/tests/newusers/17_create_user_pid-already-used/config.txt
rename to tests/newusers/35_read_from_stdin/config.txt
diff --git a/tests/tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/group b/tests/newusers/35_read_from_stdin/config/etc/group
similarity index 100%
rename from tests/tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/group
rename to tests/newusers/35_read_from_stdin/config/etc/group
diff --git a/tests/tests/newusers/34_update_password_no_shadow/config/etc/gshadow b/tests/newusers/35_read_from_stdin/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/34_update_password_no_shadow/config/etc/gshadow
rename to tests/newusers/35_read_from_stdin/config/etc/gshadow
diff --git a/tests/tests/newusers/35_read_from_stdin/config/etc/pam.d/common-password b/tests/newusers/35_read_from_stdin/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/35_read_from_stdin/config/etc/pam.d/common-password
rename to tests/newusers/35_read_from_stdin/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/35_read_from_stdin/config/etc/pam.d/newusers b/tests/newusers/35_read_from_stdin/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/35_read_from_stdin/config/etc/pam.d/newusers
rename to tests/newusers/35_read_from_stdin/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/passwd b/tests/newusers/35_read_from_stdin/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/32_create_user_error_gshadow_group_exists/config/etc/passwd
rename to tests/newusers/35_read_from_stdin/config/etc/passwd
diff --git a/tests/tests/newusers/35_read_from_stdin/config/etc/shadow b/tests/newusers/35_read_from_stdin/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/35_read_from_stdin/config/etc/shadow
rename to tests/newusers/35_read_from_stdin/config/etc/shadow
diff --git a/tests/tests/newusers/35_read_from_stdin/data/group b/tests/newusers/35_read_from_stdin/data/group
similarity index 100%
rename from tests/tests/newusers/35_read_from_stdin/data/group
rename to tests/newusers/35_read_from_stdin/data/group
diff --git a/tests/tests/newusers/35_read_from_stdin/data/gshadow b/tests/newusers/35_read_from_stdin/data/gshadow
similarity index 100%
rename from tests/tests/newusers/35_read_from_stdin/data/gshadow
rename to tests/newusers/35_read_from_stdin/data/gshadow
diff --git a/tests/tests/newusers/35_read_from_stdin/data/newusers.list b/tests/newusers/35_read_from_stdin/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/35_read_from_stdin/data/newusers.list
rename to tests/newusers/35_read_from_stdin/data/newusers.list
diff --git a/tests/tests/newusers/35_read_from_stdin/data/passwd b/tests/newusers/35_read_from_stdin/data/passwd
similarity index 100%
rename from tests/tests/newusers/35_read_from_stdin/data/passwd
rename to tests/newusers/35_read_from_stdin/data/passwd
diff --git a/tests/tests/newusers/35_read_from_stdin/data/shadow b/tests/newusers/35_read_from_stdin/data/shadow
similarity index 100%
rename from tests/tests/newusers/35_read_from_stdin/data/shadow
rename to tests/newusers/35_read_from_stdin/data/shadow
diff --git a/tests/tests/newusers/35_read_from_stdin/newusers.test b/tests/newusers/35_read_from_stdin/newusers.test
similarity index 100%
rename from tests/tests/newusers/35_read_from_stdin/newusers.test
rename to tests/newusers/35_read_from_stdin/newusers.test
diff --git a/tests/tests/newusers/18_create_user_gid-already-used/config.txt b/tests/newusers/36_create_user_encrypted/config.txt
similarity index 100%
rename from tests/tests/newusers/18_create_user_gid-already-used/config.txt
rename to tests/newusers/36_create_user_encrypted/config.txt
diff --git a/tests/tests/newusers/35_read_from_stdin/config/etc/group b/tests/newusers/36_create_user_encrypted/config/etc/group
similarity index 100%
rename from tests/tests/newusers/35_read_from_stdin/config/etc/group
rename to tests/newusers/36_create_user_encrypted/config/etc/group
diff --git a/tests/tests/newusers/35_read_from_stdin/config/etc/gshadow b/tests/newusers/36_create_user_encrypted/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/35_read_from_stdin/config/etc/gshadow
rename to tests/newusers/36_create_user_encrypted/config/etc/gshadow
diff --git a/tests/tests/newusers/35_read_from_stdin/config/etc/passwd b/tests/newusers/36_create_user_encrypted/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/35_read_from_stdin/config/etc/passwd
rename to tests/newusers/36_create_user_encrypted/config/etc/passwd
diff --git a/tests/tests/newusers/36_create_user_encrypted/config/etc/shadow b/tests/newusers/36_create_user_encrypted/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/36_create_user_encrypted/config/etc/shadow
rename to tests/newusers/36_create_user_encrypted/config/etc/shadow
diff --git a/tests/tests/newusers/01_create_user/data/group b/tests/newusers/36_create_user_encrypted/data/group
similarity index 100%
rename from tests/tests/newusers/01_create_user/data/group
rename to tests/newusers/36_create_user_encrypted/data/group
diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/data/gshadow b/tests/newusers/36_create_user_encrypted/data/gshadow
similarity index 100%
rename from tests/tests/newusers/08_create_user_pid_other-gid/data/gshadow
rename to tests/newusers/36_create_user_encrypted/data/gshadow
diff --git a/tests/tests/newusers/36_create_user_encrypted/data/newusers.list b/tests/newusers/36_create_user_encrypted/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/36_create_user_encrypted/data/newusers.list
rename to tests/newusers/36_create_user_encrypted/data/newusers.list
diff --git a/tests/tests/newusers/36_create_user_encrypted/data/passwd b/tests/newusers/36_create_user_encrypted/data/passwd
similarity index 100%
rename from tests/tests/newusers/36_create_user_encrypted/data/passwd
rename to tests/newusers/36_create_user_encrypted/data/passwd
diff --git a/tests/tests/newusers/36_create_user_encrypted/data/shadow b/tests/newusers/36_create_user_encrypted/data/shadow
similarity index 100%
rename from tests/tests/newusers/36_create_user_encrypted/data/shadow
rename to tests/newusers/36_create_user_encrypted/data/shadow
diff --git a/tests/tests/newusers/36_create_user_encrypted/newusers.test b/tests/newusers/36_create_user_encrypted/newusers.test
similarity index 100%
rename from tests/tests/newusers/36_create_user_encrypted/newusers.test
rename to tests/newusers/36_create_user_encrypted/newusers.test
diff --git a/tests/tests/newusers/21_create_user_UID_MAX/config.txt b/tests/newusers/37_create_user_encrypt_MD5-PAM/config.txt
similarity index 100%
rename from tests/tests/newusers/21_create_user_UID_MAX/config.txt
rename to tests/newusers/37_create_user_encrypt_MD5-PAM/config.txt
diff --git a/tests/tests/newusers/36_create_user_encrypted/config/etc/group b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/group
similarity index 100%
rename from tests/tests/newusers/36_create_user_encrypted/config/etc/group
rename to tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/group
diff --git a/tests/tests/newusers/36_create_user_encrypted/config/etc/gshadow b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/36_create_user_encrypted/config/etc/gshadow
rename to tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/gshadow
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/common-password b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/common-password
rename to tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/newusers b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/newusers
rename to tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/36_create_user_encrypted/config/etc/passwd b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/36_create_user_encrypted/config/etc/passwd
rename to tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/passwd
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/shadow b/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/shadow
rename to tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/shadow
diff --git a/tests/tests/newusers/13_create_user_new-home/data/group b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/group
similarity index 100%
rename from tests/tests/newusers/13_create_user_new-home/data/group
rename to tests/newusers/37_create_user_encrypt_MD5-PAM/data/group
diff --git a/tests/tests/newusers/13_create_user_new-home/data/gshadow b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/gshadow
similarity index 100%
rename from tests/tests/newusers/13_create_user_new-home/data/gshadow
rename to tests/newusers/37_create_user_encrypt_MD5-PAM/data/gshadow
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5-PAM/data/newusers.list b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/data/newusers.list
rename to tests/newusers/37_create_user_encrypt_MD5-PAM/data/newusers.list
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5-PAM/data/passwd b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/passwd
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/data/passwd
rename to tests/newusers/37_create_user_encrypt_MD5-PAM/data/passwd
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5-PAM/data/shadow b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/shadow
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/data/shadow
rename to tests/newusers/37_create_user_encrypt_MD5-PAM/data/shadow
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5-PAM/newusers.test b/tests/newusers/37_create_user_encrypt_MD5-PAM/newusers.test
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/newusers.test
rename to tests/newusers/37_create_user_encrypt_MD5-PAM/newusers.test
diff --git a/tests/tests/newusers/22_create_user_GID_MAX/config.txt b/tests/newusers/37_create_user_encrypt_MD5/config.txt
similarity index 100%
rename from tests/tests/newusers/22_create_user_GID_MAX/config.txt
rename to tests/newusers/37_create_user_encrypt_MD5/config.txt
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/group b/tests/newusers/37_create_user_encrypt_MD5/config/etc/group
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/group
rename to tests/newusers/37_create_user_encrypt_MD5/config/etc/group
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/gshadow b/tests/newusers/37_create_user_encrypt_MD5/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/gshadow
rename to tests/newusers/37_create_user_encrypt_MD5/config/etc/gshadow
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/passwd b/tests/newusers/37_create_user_encrypt_MD5/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config/etc/passwd
rename to tests/newusers/37_create_user_encrypt_MD5/config/etc/passwd
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5/config/etc/shadow b/tests/newusers/37_create_user_encrypt_MD5/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5/config/etc/shadow
rename to tests/newusers/37_create_user_encrypt_MD5/config/etc/shadow
diff --git a/tests/tests/newusers/14_create_user_existing-home/data/group b/tests/newusers/37_create_user_encrypt_MD5/data/group
similarity index 100%
rename from tests/tests/newusers/14_create_user_existing-home/data/group
rename to tests/newusers/37_create_user_encrypt_MD5/data/group
diff --git a/tests/tests/newusers/14_create_user_existing-home/data/gshadow b/tests/newusers/37_create_user_encrypt_MD5/data/gshadow
similarity index 100%
rename from tests/tests/newusers/14_create_user_existing-home/data/gshadow
rename to tests/newusers/37_create_user_encrypt_MD5/data/gshadow
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5/data/newusers.list b/tests/newusers/37_create_user_encrypt_MD5/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5/data/newusers.list
rename to tests/newusers/37_create_user_encrypt_MD5/data/newusers.list
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5/data/passwd b/tests/newusers/37_create_user_encrypt_MD5/data/passwd
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5/data/passwd
rename to tests/newusers/37_create_user_encrypt_MD5/data/passwd
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5/data/shadow b/tests/newusers/37_create_user_encrypt_MD5/data/shadow
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5/data/shadow
rename to tests/newusers/37_create_user_encrypt_MD5/data/shadow
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5/newusers.test b/tests/newusers/37_create_user_encrypt_MD5/newusers.test
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5/newusers.test
rename to tests/newusers/37_create_user_encrypt_MD5/newusers.test
diff --git a/tests/tests/newusers/38_update_password_no_shadow_encrypted/config.txt b/tests/newusers/38_update_password_no_shadow_encrypted/config.txt
similarity index 100%
rename from tests/tests/newusers/38_update_password_no_shadow_encrypted/config.txt
rename to tests/newusers/38_update_password_no_shadow_encrypted/config.txt
diff --git a/tests/tests/newusers/38_update_password_no_shadow_encrypted/config/etc/group b/tests/newusers/38_update_password_no_shadow_encrypted/config/etc/group
similarity index 100%
rename from tests/tests/newusers/38_update_password_no_shadow_encrypted/config/etc/group
rename to tests/newusers/38_update_password_no_shadow_encrypted/config/etc/group
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5/config/etc/gshadow b/tests/newusers/38_update_password_no_shadow_encrypted/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5/config/etc/gshadow
rename to tests/newusers/38_update_password_no_shadow_encrypted/config/etc/gshadow
diff --git a/tests/tests/newusers/38_update_password_no_shadow_encrypted/config/etc/passwd b/tests/newusers/38_update_password_no_shadow_encrypted/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/38_update_password_no_shadow_encrypted/config/etc/passwd
rename to tests/newusers/38_update_password_no_shadow_encrypted/config/etc/passwd
diff --git a/tests/tests/newusers/38_update_password_no_shadow_encrypted/config/etc/shadow b/tests/newusers/38_update_password_no_shadow_encrypted/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/38_update_password_no_shadow_encrypted/config/etc/shadow
rename to tests/newusers/38_update_password_no_shadow_encrypted/config/etc/shadow
diff --git a/tests/tests/newusers/38_update_password_no_shadow_encrypted/data/newusers.list b/tests/newusers/38_update_password_no_shadow_encrypted/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/38_update_password_no_shadow_encrypted/data/newusers.list
rename to tests/newusers/38_update_password_no_shadow_encrypted/data/newusers.list
diff --git a/tests/tests/newusers/38_update_password_no_shadow_encrypted/data/passwd b/tests/newusers/38_update_password_no_shadow_encrypted/data/passwd
similarity index 100%
rename from tests/tests/newusers/38_update_password_no_shadow_encrypted/data/passwd
rename to tests/newusers/38_update_password_no_shadow_encrypted/data/passwd
diff --git a/tests/tests/newusers/38_update_password_no_shadow_encrypted/newusers.test b/tests/newusers/38_update_password_no_shadow_encrypted/newusers.test
similarity index 100%
rename from tests/tests/newusers/38_update_password_no_shadow_encrypted/newusers.test
rename to tests/newusers/38_update_password_no_shadow_encrypted/newusers.test
diff --git a/tests/tests/newusers/39_update_password_no_shadow_password_encrypted/config.txt b/tests/newusers/39_update_password_no_shadow_password_encrypted/config.txt
similarity index 100%
rename from tests/tests/newusers/39_update_password_no_shadow_password_encrypted/config.txt
rename to tests/newusers/39_update_password_no_shadow_password_encrypted/config.txt
diff --git a/tests/tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/group b/tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/group
similarity index 100%
rename from tests/tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/group
rename to tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/group
diff --git a/tests/tests/newusers/38_update_password_no_shadow_encrypted/config/etc/gshadow b/tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/38_update_password_no_shadow_encrypted/config/etc/gshadow
rename to tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/gshadow
diff --git a/tests/tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/passwd b/tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/passwd
rename to tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/passwd
diff --git a/tests/tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/shadow b/tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/shadow
rename to tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/shadow
diff --git a/tests/tests/newusers/39_update_password_no_shadow_password_encrypted/data/newusers.list b/tests/newusers/39_update_password_no_shadow_password_encrypted/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/39_update_password_no_shadow_password_encrypted/data/newusers.list
rename to tests/newusers/39_update_password_no_shadow_password_encrypted/data/newusers.list
diff --git a/tests/tests/newusers/39_update_password_no_shadow_password_encrypted/data/passwd b/tests/newusers/39_update_password_no_shadow_password_encrypted/data/passwd
similarity index 100%
rename from tests/tests/newusers/39_update_password_no_shadow_password_encrypted/data/passwd
rename to tests/newusers/39_update_password_no_shadow_password_encrypted/data/passwd
diff --git a/tests/tests/newusers/39_update_password_no_shadow_password_encrypted/newusers.test b/tests/newusers/39_update_password_no_shadow_password_encrypted/newusers.test
similarity index 100%
rename from tests/tests/newusers/39_update_password_no_shadow_password_encrypted/newusers.test
rename to tests/newusers/39_update_password_no_shadow_password_encrypted/newusers.test
diff --git a/tests/tests/newusers/40_update_password_encrypted/config.txt b/tests/newusers/40_update_password_encrypted/config.txt
similarity index 100%
rename from tests/tests/newusers/40_update_password_encrypted/config.txt
rename to tests/newusers/40_update_password_encrypted/config.txt
diff --git a/tests/tests/newusers/40_update_password_encrypted/config/etc/group b/tests/newusers/40_update_password_encrypted/config/etc/group
similarity index 100%
rename from tests/tests/newusers/40_update_password_encrypted/config/etc/group
rename to tests/newusers/40_update_password_encrypted/config/etc/group
diff --git a/tests/tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/gshadow b/tests/newusers/40_update_password_encrypted/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/39_update_password_no_shadow_password_encrypted/config/etc/gshadow
rename to tests/newusers/40_update_password_encrypted/config/etc/gshadow
diff --git a/tests/tests/newusers/40_update_password_encrypted/config/etc/passwd b/tests/newusers/40_update_password_encrypted/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/40_update_password_encrypted/config/etc/passwd
rename to tests/newusers/40_update_password_encrypted/config/etc/passwd
diff --git a/tests/tests/newusers/40_update_password_encrypted/config/etc/shadow b/tests/newusers/40_update_password_encrypted/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/40_update_password_encrypted/config/etc/shadow
rename to tests/newusers/40_update_password_encrypted/config/etc/shadow
diff --git a/tests/tests/newusers/40_update_password_encrypted/data/newusers.list b/tests/newusers/40_update_password_encrypted/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/40_update_password_encrypted/data/newusers.list
rename to tests/newusers/40_update_password_encrypted/data/newusers.list
diff --git a/tests/tests/newusers/40_update_password_encrypted/data/shadow b/tests/newusers/40_update_password_encrypted/data/shadow
similarity index 100%
rename from tests/tests/newusers/40_update_password_encrypted/data/shadow
rename to tests/newusers/40_update_password_encrypted/data/shadow
diff --git a/tests/tests/newusers/40_update_password_encrypted/newusers.test b/tests/newusers/40_update_password_encrypted/newusers.test
similarity index 100%
rename from tests/tests/newusers/40_update_password_encrypted/newusers.test
rename to tests/newusers/40_update_password_encrypted/newusers.test
diff --git a/tests/tests/newusers/23_create_user_error_negative_UID/config.txt b/tests/newusers/41_create_user_encrypt_SHA256-PAM/config.txt
similarity index 100%
rename from tests/tests/newusers/23_create_user_error_negative_UID/config.txt
rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/config.txt
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5/config/etc/group b/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/group
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5/config/etc/group
rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/group
diff --git a/tests/tests/newusers/40_update_password_encrypted/config/etc/gshadow b/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/40_update_password_encrypted/config/etc/gshadow
rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/gshadow
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/pam.d/common-password b/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/pam.d/common-password
rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/pam.d/newusers b/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/pam.d/newusers
rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5/config/etc/passwd b/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5/config/etc/passwd
rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/passwd
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/shadow b/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/shadow
rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/shadow
diff --git a/tests/tests/newusers/36_create_user_encrypted/data/group b/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/group
similarity index 100%
rename from tests/tests/newusers/36_create_user_encrypted/data/group
rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/data/group
diff --git a/tests/tests/newusers/36_create_user_encrypted/data/gshadow b/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/gshadow
similarity index 100%
rename from tests/tests/newusers/36_create_user_encrypted/data/gshadow
rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/data/gshadow
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/newusers.list b/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/newusers.list
rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/data/newusers.list
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/passwd b/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/passwd
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/passwd
rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/data/passwd
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/shadow b/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/shadow
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/shadow
rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/data/shadow
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/newusers.test b/tests/newusers/41_create_user_encrypt_SHA256-PAM/newusers.test
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/newusers.test
rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/newusers.test
diff --git a/tests/tests/newusers/24_create_user_error_invalid_UID/config.txt b/tests/newusers/41_create_user_encrypt_SHA256/config.txt
similarity index 100%
rename from tests/tests/newusers/24_create_user_error_invalid_UID/config.txt
rename to tests/newusers/41_create_user_encrypt_SHA256/config.txt
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/group b/tests/newusers/41_create_user_encrypt_SHA256/config/etc/group
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/group
rename to tests/newusers/41_create_user_encrypt_SHA256/config/etc/group
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/gshadow b/tests/newusers/41_create_user_encrypt_SHA256/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/gshadow
rename to tests/newusers/41_create_user_encrypt_SHA256/config/etc/gshadow
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/passwd b/tests/newusers/41_create_user_encrypt_SHA256/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config/etc/passwd
rename to tests/newusers/41_create_user_encrypt_SHA256/config/etc/passwd
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256/config/etc/shadow b/tests/newusers/41_create_user_encrypt_SHA256/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256/config/etc/shadow
rename to tests/newusers/41_create_user_encrypt_SHA256/config/etc/shadow
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5-PAM/data/group b/tests/newusers/41_create_user_encrypt_SHA256/data/group
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/data/group
rename to tests/newusers/41_create_user_encrypt_SHA256/data/group
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5-PAM/data/gshadow b/tests/newusers/41_create_user_encrypt_SHA256/data/gshadow
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/data/gshadow
rename to tests/newusers/41_create_user_encrypt_SHA256/data/gshadow
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256/data/newusers.list b/tests/newusers/41_create_user_encrypt_SHA256/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256/data/newusers.list
rename to tests/newusers/41_create_user_encrypt_SHA256/data/newusers.list
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256/data/passwd b/tests/newusers/41_create_user_encrypt_SHA256/data/passwd
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256/data/passwd
rename to tests/newusers/41_create_user_encrypt_SHA256/data/passwd
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256/data/shadow b/tests/newusers/41_create_user_encrypt_SHA256/data/shadow
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256/data/shadow
rename to tests/newusers/41_create_user_encrypt_SHA256/data/shadow
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256/newusers.test b/tests/newusers/41_create_user_encrypt_SHA256/newusers.test
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256/newusers.test
rename to tests/newusers/41_create_user_encrypt_SHA256/newusers.test
diff --git a/tests/tests/newusers/27_create_user_error_invalid_username/config.txt b/tests/newusers/42_create_user_encrypt_SHA512-PAM/config.txt
similarity index 100%
rename from tests/tests/newusers/27_create_user_error_invalid_username/config.txt
rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/config.txt
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256/config/etc/group b/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/group
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256/config/etc/group
rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/group
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256/config/etc/gshadow b/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256/config/etc/gshadow
rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/gshadow
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/pam.d/common-password b/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/pam.d/common-password
rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/pam.d/newusers b/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/pam.d/newusers
rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256/config/etc/passwd b/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256/config/etc/passwd
rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/passwd
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/shadow b/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/shadow
rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/shadow
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5/data/group b/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/group
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5/data/group
rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/data/group
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5/data/gshadow b/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/gshadow
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5/data/gshadow
rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/data/gshadow
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/newusers.list b/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/newusers.list
rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/data/newusers.list
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/passwd b/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/passwd
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/passwd
rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/data/passwd
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/shadow b/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/shadow
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/shadow
rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/data/shadow
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/newusers.test b/tests/newusers/42_create_user_encrypt_SHA512-PAM/newusers.test
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/newusers.test
rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/newusers.test
diff --git a/tests/tests/newusers/28_create_user_error_invalid_groupname/config.txt b/tests/newusers/42_create_user_encrypt_SHA512/config.txt
similarity index 100%
rename from tests/tests/newusers/28_create_user_error_invalid_groupname/config.txt
rename to tests/newusers/42_create_user_encrypt_SHA512/config.txt
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/group b/tests/newusers/42_create_user_encrypt_SHA512/config/etc/group
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/group
rename to tests/newusers/42_create_user_encrypt_SHA512/config/etc/group
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/gshadow b/tests/newusers/42_create_user_encrypt_SHA512/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/gshadow
rename to tests/newusers/42_create_user_encrypt_SHA512/config/etc/gshadow
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/passwd b/tests/newusers/42_create_user_encrypt_SHA512/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config/etc/passwd
rename to tests/newusers/42_create_user_encrypt_SHA512/config/etc/passwd
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512/config/etc/shadow b/tests/newusers/42_create_user_encrypt_SHA512/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512/config/etc/shadow
rename to tests/newusers/42_create_user_encrypt_SHA512/config/etc/shadow
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/group b/tests/newusers/42_create_user_encrypt_SHA512/data/group
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/group
rename to tests/newusers/42_create_user_encrypt_SHA512/data/group
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/gshadow b/tests/newusers/42_create_user_encrypt_SHA512/data/gshadow
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/gshadow
rename to tests/newusers/42_create_user_encrypt_SHA512/data/gshadow
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512/data/newusers.list b/tests/newusers/42_create_user_encrypt_SHA512/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512/data/newusers.list
rename to tests/newusers/42_create_user_encrypt_SHA512/data/newusers.list
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512/data/passwd b/tests/newusers/42_create_user_encrypt_SHA512/data/passwd
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512/data/passwd
rename to tests/newusers/42_create_user_encrypt_SHA512/data/passwd
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512/data/shadow b/tests/newusers/42_create_user_encrypt_SHA512/data/shadow
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512/data/shadow
rename to tests/newusers/42_create_user_encrypt_SHA512/data/shadow
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512/newusers.test b/tests/newusers/42_create_user_encrypt_SHA512/newusers.test
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512/newusers.test
rename to tests/newusers/42_create_user_encrypt_SHA512/newusers.test
diff --git a/tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config.txt b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config.txt
similarity index 100%
rename from tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config.txt
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config.txt
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512/config/etc/group b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/group
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512/config/etc/group
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/group
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512/config/etc/gshadow b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512/config/etc/gshadow
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/gshadow
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/pam.d/common-password b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/pam.d/common-password
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/pam.d/newusers b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/pam.d/newusers
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512/config/etc/passwd b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512/config/etc/passwd
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/passwd
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/shadow b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/shadow
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/shadow
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256/data/group b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/group
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256/data/group
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/group
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256/data/gshadow b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/gshadow
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256/data/gshadow
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/gshadow
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/newusers.list b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/newusers.list
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/newusers.list
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/passwd b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/passwd
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/passwd
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/passwd
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/shadow b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/shadow
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/shadow
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/shadow
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/newusers.test b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/newusers.test
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/newusers.test
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/newusers.test
diff --git a/tests/tests/newusers/30_create_user_different_groupname/config.txt b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config.txt
similarity index 100%
rename from tests/tests/newusers/30_create_user_different_groupname/config.txt
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config.txt
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/group b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/group
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/group
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/group
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/gshadow b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/gshadow
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/gshadow
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/passwd b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config/etc/passwd
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/passwd
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/shadow b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/shadow
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/shadow
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/group b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/group
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/group
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/group
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/gshadow b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/gshadow
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/gshadow
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/gshadow
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/newusers.list b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/newusers.list
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/newusers.list
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/passwd b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/passwd
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/passwd
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/passwd
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/shadow b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/shadow
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/shadow
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/shadow
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/newusers.test b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/newusers.test
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/newusers.test
rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/newusers.test
diff --git a/tests/tests/newusers/31_create_user_error_invalid_GID/config.txt b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config.txt
similarity index 100%
rename from tests/tests/newusers/31_create_user_error_invalid_GID/config.txt
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config.txt
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/group b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/group
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/group
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/group
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/gshadow b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/gshadow
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/gshadow
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/pam.d/common-password b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/pam.d/common-password
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/pam.d/newusers b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/pam.d/newusers
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/passwd b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config/etc/passwd
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/passwd
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/shadow b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/shadow
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/shadow
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512/data/group b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/group
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512/data/group
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/group
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512/data/gshadow b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/gshadow
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512/data/gshadow
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/gshadow
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/newusers.list b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/newusers.list
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/newusers.list
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/passwd b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/passwd
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/passwd
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/passwd
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/shadow b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/shadow
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/shadow
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/shadow
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/newusers.test b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/newusers.test
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/newusers.test
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/newusers.test
diff --git a/tests/tests/newusers/35_read_from_stdin/config.txt b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config.txt
similarity index 100%
rename from tests/tests/newusers/35_read_from_stdin/config.txt
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config.txt
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/group b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/group
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/group
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/group
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/gshadow b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/gshadow
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/gshadow
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/passwd b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config/etc/passwd
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/passwd
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/shadow b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/shadow
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/shadow
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/group b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/group
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/group
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/group
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/gshadow b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/gshadow
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/gshadow
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/gshadow
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/newusers.list b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/newusers.list
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/newusers.list
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/passwd b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/passwd
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/passwd
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/passwd
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/shadow b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/shadow
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/shadow
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/shadow
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/newusers.test b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/newusers.test
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/newusers.test
rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300/newusers.test
diff --git a/tests/tests/newusers/36_create_user_encrypted/config.txt b/tests/newusers/45_create_user_encrypt_rounds_3000/config.txt
similarity index 100%
rename from tests/tests/newusers/36_create_user_encrypted/config.txt
rename to tests/newusers/45_create_user_encrypt_rounds_3000/config.txt
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/group b/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/group
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/group
rename to tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/group
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/gshadow b/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/gshadow
rename to tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/gshadow
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/passwd b/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config/etc/passwd
rename to tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/passwd
diff --git a/tests/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/shadow b/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/shadow
rename to tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/shadow
diff --git a/tests/tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.err b/tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.err
similarity index 100%
rename from tests/tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.err
rename to tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.err
diff --git a/tests/tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.list b/tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.list
rename to tests/newusers/45_create_user_encrypt_rounds_3000/data/newusers.list
diff --git a/tests/tests/newusers/45_create_user_encrypt_rounds_3000/newusers.test b/tests/newusers/45_create_user_encrypt_rounds_3000/newusers.test
similarity index 100%
rename from tests/tests/newusers/45_create_user_encrypt_rounds_3000/newusers.test
rename to tests/newusers/45_create_user_encrypt_rounds_3000/newusers.test
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config.txt b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config.txt
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config.txt
rename to tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config.txt
diff --git a/tests/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/group b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/group
similarity index 100%
rename from tests/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/group
rename to tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/group
diff --git a/tests/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/gshadow b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/gshadow
rename to tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/gshadow
diff --git a/tests/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/passwd b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/passwd
rename to tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/passwd
diff --git a/tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/shadow b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/shadow
rename to tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/shadow
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/group b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/group
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/group
rename to tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/group
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/gshadow b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/gshadow
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/gshadow
rename to tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/gshadow
diff --git a/tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/newusers.list b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/newusers.list
rename to tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/newusers.list
diff --git a/tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/passwd b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/passwd
similarity index 100%
rename from tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/passwd
rename to tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/passwd
diff --git a/tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/shadow b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/shadow
similarity index 100%
rename from tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/shadow
rename to tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/shadow
diff --git a/tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test
similarity index 100%
rename from tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test
rename to tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/newusers.test
diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5/config.txt b/tests/newusers/47_create_user_error_UID_4294967295/config.txt
similarity index 100%
rename from tests/tests/newusers/37_create_user_encrypt_MD5/config.txt
rename to tests/newusers/47_create_user_error_UID_4294967295/config.txt
diff --git a/tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/group b/tests/newusers/47_create_user_error_UID_4294967295/config/etc/group
similarity index 100%
rename from tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/group
rename to tests/newusers/47_create_user_error_UID_4294967295/config/etc/group
diff --git a/tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/gshadow b/tests/newusers/47_create_user_error_UID_4294967295/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/gshadow
rename to tests/newusers/47_create_user_error_UID_4294967295/config/etc/gshadow
diff --git a/tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/passwd b/tests/newusers/47_create_user_error_UID_4294967295/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config/etc/passwd
rename to tests/newusers/47_create_user_error_UID_4294967295/config/etc/passwd
diff --git a/tests/tests/newusers/47_create_user_error_UID_4294967295/config/etc/shadow b/tests/newusers/47_create_user_error_UID_4294967295/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/47_create_user_error_UID_4294967295/config/etc/shadow
rename to tests/newusers/47_create_user_error_UID_4294967295/config/etc/shadow
diff --git a/tests/tests/newusers/47_create_user_error_UID_4294967295/data/newusers.err b/tests/newusers/47_create_user_error_UID_4294967295/data/newusers.err
similarity index 100%
rename from tests/tests/newusers/47_create_user_error_UID_4294967295/data/newusers.err
rename to tests/newusers/47_create_user_error_UID_4294967295/data/newusers.err
diff --git a/tests/tests/newusers/47_create_user_error_UID_4294967295/data/newusers.list b/tests/newusers/47_create_user_error_UID_4294967295/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/47_create_user_error_UID_4294967295/data/newusers.list
rename to tests/newusers/47_create_user_error_UID_4294967295/data/newusers.list
diff --git a/tests/tests/newusers/47_create_user_error_UID_4294967295/newusers.test b/tests/newusers/47_create_user_error_UID_4294967295/newusers.test
similarity index 100%
rename from tests/tests/newusers/47_create_user_error_UID_4294967295/newusers.test
rename to tests/newusers/47_create_user_error_UID_4294967295/newusers.test
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config.txt b/tests/newusers/48_create_user_error_GID_4294967295/config.txt
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config.txt
rename to tests/newusers/48_create_user_error_GID_4294967295/config.txt
diff --git a/tests/tests/newusers/47_create_user_error_UID_4294967295/config/etc/group b/tests/newusers/48_create_user_error_GID_4294967295/config/etc/group
similarity index 100%
rename from tests/tests/newusers/47_create_user_error_UID_4294967295/config/etc/group
rename to tests/newusers/48_create_user_error_GID_4294967295/config/etc/group
diff --git a/tests/tests/newusers/47_create_user_error_UID_4294967295/config/etc/gshadow b/tests/newusers/48_create_user_error_GID_4294967295/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/47_create_user_error_UID_4294967295/config/etc/gshadow
rename to tests/newusers/48_create_user_error_GID_4294967295/config/etc/gshadow
diff --git a/tests/tests/newusers/47_create_user_error_UID_4294967295/config/etc/passwd b/tests/newusers/48_create_user_error_GID_4294967295/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/47_create_user_error_UID_4294967295/config/etc/passwd
rename to tests/newusers/48_create_user_error_GID_4294967295/config/etc/passwd
diff --git a/tests/tests/newusers/48_create_user_error_GID_4294967295/config/etc/shadow b/tests/newusers/48_create_user_error_GID_4294967295/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/48_create_user_error_GID_4294967295/config/etc/shadow
rename to tests/newusers/48_create_user_error_GID_4294967295/config/etc/shadow
diff --git a/tests/tests/newusers/48_create_user_error_GID_4294967295/data/newusers.err b/tests/newusers/48_create_user_error_GID_4294967295/data/newusers.err
similarity index 100%
rename from tests/tests/newusers/48_create_user_error_GID_4294967295/data/newusers.err
rename to tests/newusers/48_create_user_error_GID_4294967295/data/newusers.err
diff --git a/tests/tests/newusers/48_create_user_error_GID_4294967295/data/newusers.list b/tests/newusers/48_create_user_error_GID_4294967295/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/48_create_user_error_GID_4294967295/data/newusers.list
rename to tests/newusers/48_create_user_error_GID_4294967295/data/newusers.list
diff --git a/tests/tests/newusers/48_create_user_error_GID_4294967295/newusers.test b/tests/newusers/48_create_user_error_GID_4294967295/newusers.test
similarity index 100%
rename from tests/tests/newusers/48_create_user_error_GID_4294967295/newusers.test
rename to tests/newusers/48_create_user_error_GID_4294967295/newusers.test
diff --git a/tests/tests/newusers/49_multiple_system_users/config.txt b/tests/newusers/49_multiple_system_users/config.txt
similarity index 100%
rename from tests/tests/newusers/49_multiple_system_users/config.txt
rename to tests/newusers/49_multiple_system_users/config.txt
diff --git a/tests/tests/newusers/49_multiple_system_users/config/etc/group b/tests/newusers/49_multiple_system_users/config/etc/group
similarity index 100%
rename from tests/tests/newusers/49_multiple_system_users/config/etc/group
rename to tests/newusers/49_multiple_system_users/config/etc/group
diff --git a/tests/tests/newusers/49_multiple_system_users/config/etc/gshadow b/tests/newusers/49_multiple_system_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/49_multiple_system_users/config/etc/gshadow
rename to tests/newusers/49_multiple_system_users/config/etc/gshadow
diff --git a/tests/tests/newusers/49_multiple_system_users/config/etc/pam.d/common-password b/tests/newusers/49_multiple_system_users/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/49_multiple_system_users/config/etc/pam.d/common-password
rename to tests/newusers/49_multiple_system_users/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/49_multiple_system_users/config/etc/pam.d/newusers b/tests/newusers/49_multiple_system_users/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/49_multiple_system_users/config/etc/pam.d/newusers
rename to tests/newusers/49_multiple_system_users/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/49_multiple_system_users/config/etc/passwd b/tests/newusers/49_multiple_system_users/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/49_multiple_system_users/config/etc/passwd
rename to tests/newusers/49_multiple_system_users/config/etc/passwd
diff --git a/tests/tests/newusers/49_multiple_system_users/config/etc/shadow b/tests/newusers/49_multiple_system_users/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/49_multiple_system_users/config/etc/shadow
rename to tests/newusers/49_multiple_system_users/config/etc/shadow
diff --git a/tests/tests/newusers/49_multiple_system_users/data/group b/tests/newusers/49_multiple_system_users/data/group
similarity index 100%
rename from tests/tests/newusers/49_multiple_system_users/data/group
rename to tests/newusers/49_multiple_system_users/data/group
diff --git a/tests/tests/newusers/49_multiple_system_users/data/gshadow b/tests/newusers/49_multiple_system_users/data/gshadow
similarity index 100%
rename from tests/tests/newusers/49_multiple_system_users/data/gshadow
rename to tests/newusers/49_multiple_system_users/data/gshadow
diff --git a/tests/tests/newusers/49_multiple_system_users/data/newusers.list b/tests/newusers/49_multiple_system_users/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/49_multiple_system_users/data/newusers.list
rename to tests/newusers/49_multiple_system_users/data/newusers.list
diff --git a/tests/tests/newusers/49_multiple_system_users/data/passwd b/tests/newusers/49_multiple_system_users/data/passwd
similarity index 100%
rename from tests/tests/newusers/49_multiple_system_users/data/passwd
rename to tests/newusers/49_multiple_system_users/data/passwd
diff --git a/tests/tests/newusers/49_multiple_system_users/data/shadow b/tests/newusers/49_multiple_system_users/data/shadow
similarity index 100%
rename from tests/tests/newusers/49_multiple_system_users/data/shadow
rename to tests/newusers/49_multiple_system_users/data/shadow
diff --git a/tests/tests/newusers/49_multiple_system_users/newusers.test b/tests/newusers/49_multiple_system_users/newusers.test
similarity index 100%
rename from tests/tests/newusers/49_multiple_system_users/newusers.test
rename to tests/newusers/49_multiple_system_users/newusers.test
diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256/config.txt b/tests/newusers/50_usage/config.txt
similarity index 100%
rename from tests/tests/newusers/41_create_user_encrypt_SHA256/config.txt
rename to tests/newusers/50_usage/config.txt
diff --git a/tests/tests/login/03_login_check_tty/config/etc/group b/tests/newusers/50_usage/config/etc/group
similarity index 100%
rename from tests/tests/login/03_login_check_tty/config/etc/group
rename to tests/newusers/50_usage/config/etc/group
diff --git a/tests/tests/login/03_login_check_tty/config/etc/gshadow b/tests/newusers/50_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/login/03_login_check_tty/config/etc/gshadow
rename to tests/newusers/50_usage/config/etc/gshadow
diff --git a/tests/tests/newusers/50_usage/config/etc/passwd b/tests/newusers/50_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/50_usage/config/etc/passwd
rename to tests/newusers/50_usage/config/etc/passwd
diff --git a/tests/tests/newusers/50_usage/config/etc/shadow b/tests/newusers/50_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/50_usage/config/etc/shadow
rename to tests/newusers/50_usage/config/etc/shadow
diff --git a/tests/tests/newusers/50_usage/data/usage.out b/tests/newusers/50_usage/data/usage.out
similarity index 100%
rename from tests/tests/newusers/50_usage/data/usage.out
rename to tests/newusers/50_usage/data/usage.out
diff --git a/tests/tests/newusers/50_usage/newusers.test b/tests/newusers/50_usage/newusers.test
similarity index 100%
rename from tests/tests/newusers/50_usage/newusers.test
rename to tests/newusers/50_usage/newusers.test
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config.txt b/tests/newusers/51_usage_invalid_option/config.txt
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config.txt
rename to tests/newusers/51_usage_invalid_option/config.txt
diff --git a/tests/tests/newusers/50_usage/config/etc/group b/tests/newusers/51_usage_invalid_option/config/etc/group
similarity index 100%
rename from tests/tests/newusers/50_usage/config/etc/group
rename to tests/newusers/51_usage_invalid_option/config/etc/group
diff --git a/tests/tests/newusers/50_usage/config/etc/gshadow b/tests/newusers/51_usage_invalid_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/50_usage/config/etc/gshadow
rename to tests/newusers/51_usage_invalid_option/config/etc/gshadow
diff --git a/tests/tests/newusers/51_usage_invalid_option/config/etc/passwd b/tests/newusers/51_usage_invalid_option/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/51_usage_invalid_option/config/etc/passwd
rename to tests/newusers/51_usage_invalid_option/config/etc/passwd
diff --git a/tests/tests/newusers/51_usage_invalid_option/config/etc/shadow b/tests/newusers/51_usage_invalid_option/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/51_usage_invalid_option/config/etc/shadow
rename to tests/newusers/51_usage_invalid_option/config/etc/shadow
diff --git a/tests/tests/newusers/51_usage_invalid_option/data/usage.out b/tests/newusers/51_usage_invalid_option/data/usage.out
similarity index 100%
rename from tests/tests/newusers/51_usage_invalid_option/data/usage.out
rename to tests/newusers/51_usage_invalid_option/data/usage.out
diff --git a/tests/tests/newusers/51_usage_invalid_option/newusers.test b/tests/newusers/51_usage_invalid_option/newusers.test
similarity index 100%
rename from tests/tests/newusers/51_usage_invalid_option/newusers.test
rename to tests/newusers/51_usage_invalid_option/newusers.test
diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512/config.txt b/tests/newusers/52_usage_2_input_files/config.txt
similarity index 100%
rename from tests/tests/newusers/42_create_user_encrypt_SHA512/config.txt
rename to tests/newusers/52_usage_2_input_files/config.txt
diff --git a/tests/tests/newusers/51_usage_invalid_option/config/etc/group b/tests/newusers/52_usage_2_input_files/config/etc/group
similarity index 100%
rename from tests/tests/newusers/51_usage_invalid_option/config/etc/group
rename to tests/newusers/52_usage_2_input_files/config/etc/group
diff --git a/tests/tests/newusers/51_usage_invalid_option/config/etc/gshadow b/tests/newusers/52_usage_2_input_files/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/51_usage_invalid_option/config/etc/gshadow
rename to tests/newusers/52_usage_2_input_files/config/etc/gshadow
diff --git a/tests/tests/newusers/52_usage_2_input_files/config/etc/passwd b/tests/newusers/52_usage_2_input_files/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/52_usage_2_input_files/config/etc/passwd
rename to tests/newusers/52_usage_2_input_files/config/etc/passwd
diff --git a/tests/tests/newusers/52_usage_2_input_files/config/etc/shadow b/tests/newusers/52_usage_2_input_files/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/52_usage_2_input_files/config/etc/shadow
rename to tests/newusers/52_usage_2_input_files/config/etc/shadow
diff --git a/tests/tests/newusers/52_usage_2_input_files/data/usage.out b/tests/newusers/52_usage_2_input_files/data/usage.out
similarity index 100%
rename from tests/tests/newusers/52_usage_2_input_files/data/usage.out
rename to tests/newusers/52_usage_2_input_files/data/usage.out
diff --git a/tests/tests/newusers/52_usage_2_input_files/newusers.test b/tests/newusers/52_usage_2_input_files/newusers.test
similarity index 100%
rename from tests/tests/newusers/52_usage_2_input_files/newusers.test
rename to tests/newusers/52_usage_2_input_files/newusers.test
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config.txt b/tests/newusers/53_locked_passwd/config.txt
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config.txt
rename to tests/newusers/53_locked_passwd/config.txt
diff --git a/tests/tests/newusers/52_usage_2_input_files/config/etc/group b/tests/newusers/53_locked_passwd/config/etc/group
similarity index 100%
rename from tests/tests/newusers/52_usage_2_input_files/config/etc/group
rename to tests/newusers/53_locked_passwd/config/etc/group
diff --git a/tests/tests/newusers/52_usage_2_input_files/config/etc/gshadow b/tests/newusers/53_locked_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/52_usage_2_input_files/config/etc/gshadow
rename to tests/newusers/53_locked_passwd/config/etc/gshadow
diff --git a/tests/tests/newusers/53_locked_passwd/config/etc/passwd b/tests/newusers/53_locked_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/53_locked_passwd/config/etc/passwd
rename to tests/newusers/53_locked_passwd/config/etc/passwd
diff --git a/tests/tests/newusers/53_locked_passwd/config/etc/shadow b/tests/newusers/53_locked_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/53_locked_passwd/config/etc/shadow
rename to tests/newusers/53_locked_passwd/config/etc/shadow
diff --git a/tests/tests/newusers/53_locked_passwd/data/newusers.list b/tests/newusers/53_locked_passwd/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/53_locked_passwd/data/newusers.list
rename to tests/newusers/53_locked_passwd/data/newusers.list
diff --git a/tests/tests/newusers/53_locked_passwd/data/usage.out b/tests/newusers/53_locked_passwd/data/usage.out
similarity index 100%
rename from tests/tests/newusers/53_locked_passwd/data/usage.out
rename to tests/newusers/53_locked_passwd/data/usage.out
diff --git a/tests/tests/newusers/53_locked_passwd/newusers.test b/tests/newusers/53_locked_passwd/newusers.test
similarity index 100%
rename from tests/tests/newusers/53_locked_passwd/newusers.test
rename to tests/newusers/53_locked_passwd/newusers.test
diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config.txt b/tests/newusers/54_locked_shadow/config.txt
similarity index 100%
rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config.txt
rename to tests/newusers/54_locked_shadow/config.txt
diff --git a/tests/tests/newusers/53_locked_passwd/config/etc/group b/tests/newusers/54_locked_shadow/config/etc/group
similarity index 100%
rename from tests/tests/newusers/53_locked_passwd/config/etc/group
rename to tests/newusers/54_locked_shadow/config/etc/group
diff --git a/tests/tests/newusers/53_locked_passwd/config/etc/gshadow b/tests/newusers/54_locked_shadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/53_locked_passwd/config/etc/gshadow
rename to tests/newusers/54_locked_shadow/config/etc/gshadow
diff --git a/tests/tests/newusers/54_locked_shadow/config/etc/passwd b/tests/newusers/54_locked_shadow/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/54_locked_shadow/config/etc/passwd
rename to tests/newusers/54_locked_shadow/config/etc/passwd
diff --git a/tests/tests/newusers/54_locked_shadow/config/etc/shadow b/tests/newusers/54_locked_shadow/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/54_locked_shadow/config/etc/shadow
rename to tests/newusers/54_locked_shadow/config/etc/shadow
diff --git a/tests/tests/newusers/54_locked_shadow/data/newusers.list b/tests/newusers/54_locked_shadow/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/54_locked_shadow/data/newusers.list
rename to tests/newusers/54_locked_shadow/data/newusers.list
diff --git a/tests/tests/newusers/54_locked_shadow/data/usage.out b/tests/newusers/54_locked_shadow/data/usage.out
similarity index 100%
rename from tests/tests/newusers/54_locked_shadow/data/usage.out
rename to tests/newusers/54_locked_shadow/data/usage.out
diff --git a/tests/tests/newusers/54_locked_shadow/newusers.test b/tests/newusers/54_locked_shadow/newusers.test
similarity index 100%
rename from tests/tests/newusers/54_locked_shadow/newusers.test
rename to tests/newusers/54_locked_shadow/newusers.test
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config.txt b/tests/newusers/55_locked_group/config.txt
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config.txt
rename to tests/newusers/55_locked_group/config.txt
diff --git a/tests/tests/newusers/54_locked_shadow/config/etc/group b/tests/newusers/55_locked_group/config/etc/group
similarity index 100%
rename from tests/tests/newusers/54_locked_shadow/config/etc/group
rename to tests/newusers/55_locked_group/config/etc/group
diff --git a/tests/tests/newusers/54_locked_shadow/config/etc/gshadow b/tests/newusers/55_locked_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/54_locked_shadow/config/etc/gshadow
rename to tests/newusers/55_locked_group/config/etc/gshadow
diff --git a/tests/tests/newusers/55_locked_group/config/etc/passwd b/tests/newusers/55_locked_group/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/55_locked_group/config/etc/passwd
rename to tests/newusers/55_locked_group/config/etc/passwd
diff --git a/tests/tests/newusers/55_locked_group/config/etc/shadow b/tests/newusers/55_locked_group/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/55_locked_group/config/etc/shadow
rename to tests/newusers/55_locked_group/config/etc/shadow
diff --git a/tests/tests/newusers/55_locked_group/data/newusers.list b/tests/newusers/55_locked_group/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/55_locked_group/data/newusers.list
rename to tests/newusers/55_locked_group/data/newusers.list
diff --git a/tests/tests/newusers/55_locked_group/data/usage.out b/tests/newusers/55_locked_group/data/usage.out
similarity index 100%
rename from tests/tests/newusers/55_locked_group/data/usage.out
rename to tests/newusers/55_locked_group/data/usage.out
diff --git a/tests/tests/newusers/55_locked_group/newusers.test b/tests/newusers/55_locked_group/newusers.test
similarity index 100%
rename from tests/tests/newusers/55_locked_group/newusers.test
rename to tests/newusers/55_locked_group/newusers.test
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config.txt b/tests/newusers/56_locked_gshadow/config.txt
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config.txt
rename to tests/newusers/56_locked_gshadow/config.txt
diff --git a/tests/tests/newusers/55_locked_group/config/etc/group b/tests/newusers/56_locked_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/newusers/55_locked_group/config/etc/group
rename to tests/newusers/56_locked_gshadow/config/etc/group
diff --git a/tests/tests/newusers/55_locked_group/config/etc/gshadow b/tests/newusers/56_locked_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/55_locked_group/config/etc/gshadow
rename to tests/newusers/56_locked_gshadow/config/etc/gshadow
diff --git a/tests/tests/newusers/56_locked_gshadow/config/etc/passwd b/tests/newusers/56_locked_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/56_locked_gshadow/config/etc/passwd
rename to tests/newusers/56_locked_gshadow/config/etc/passwd
diff --git a/tests/tests/newusers/56_locked_gshadow/config/etc/shadow b/tests/newusers/56_locked_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/56_locked_gshadow/config/etc/shadow
rename to tests/newusers/56_locked_gshadow/config/etc/shadow
diff --git a/tests/tests/newusers/56_locked_gshadow/data/newusers.list b/tests/newusers/56_locked_gshadow/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/56_locked_gshadow/data/newusers.list
rename to tests/newusers/56_locked_gshadow/data/newusers.list
diff --git a/tests/tests/newusers/56_locked_gshadow/data/usage.out b/tests/newusers/56_locked_gshadow/data/usage.out
similarity index 100%
rename from tests/tests/newusers/56_locked_gshadow/data/usage.out
rename to tests/newusers/56_locked_gshadow/data/usage.out
diff --git a/tests/tests/newusers/56_locked_gshadow/newusers.test b/tests/newusers/56_locked_gshadow/newusers.test
similarity index 100%
rename from tests/tests/newusers/56_locked_gshadow/newusers.test
rename to tests/newusers/56_locked_gshadow/newusers.test
diff --git a/tests/tests/newusers/45_create_user_encrypt_rounds_3000/config.txt b/tests/newusers/57_missing_input_file/config.txt
similarity index 100%
rename from tests/tests/newusers/45_create_user_encrypt_rounds_3000/config.txt
rename to tests/newusers/57_missing_input_file/config.txt
diff --git a/tests/tests/newusers/56_locked_gshadow/config/etc/group b/tests/newusers/57_missing_input_file/config/etc/group
similarity index 100%
rename from tests/tests/newusers/56_locked_gshadow/config/etc/group
rename to tests/newusers/57_missing_input_file/config/etc/group
diff --git a/tests/tests/newusers/56_locked_gshadow/config/etc/gshadow b/tests/newusers/57_missing_input_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/56_locked_gshadow/config/etc/gshadow
rename to tests/newusers/57_missing_input_file/config/etc/gshadow
diff --git a/tests/tests/newusers/57_missing_input_file/config/etc/passwd b/tests/newusers/57_missing_input_file/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/57_missing_input_file/config/etc/passwd
rename to tests/newusers/57_missing_input_file/config/etc/passwd
diff --git a/tests/tests/newusers/57_missing_input_file/config/etc/shadow b/tests/newusers/57_missing_input_file/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/57_missing_input_file/config/etc/shadow
rename to tests/newusers/57_missing_input_file/config/etc/shadow
diff --git a/tests/tests/newusers/57_missing_input_file/data/usage.out b/tests/newusers/57_missing_input_file/data/usage.out
similarity index 100%
rename from tests/tests/newusers/57_missing_input_file/data/usage.out
rename to tests/newusers/57_missing_input_file/data/usage.out
diff --git a/tests/tests/newusers/57_missing_input_file/newusers.test b/tests/newusers/57_missing_input_file/newusers.test
similarity index 100%
rename from tests/tests/newusers/57_missing_input_file/newusers.test
rename to tests/newusers/57_missing_input_file/newusers.test
diff --git a/tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config.txt b/tests/newusers/58_invalid_input_file/config.txt
similarity index 100%
rename from tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config.txt
rename to tests/newusers/58_invalid_input_file/config.txt
diff --git a/tests/tests/newusers/57_missing_input_file/config/etc/group b/tests/newusers/58_invalid_input_file/config/etc/group
similarity index 100%
rename from tests/tests/newusers/57_missing_input_file/config/etc/group
rename to tests/newusers/58_invalid_input_file/config/etc/group
diff --git a/tests/tests/newusers/57_missing_input_file/config/etc/gshadow b/tests/newusers/58_invalid_input_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/57_missing_input_file/config/etc/gshadow
rename to tests/newusers/58_invalid_input_file/config/etc/gshadow
diff --git a/tests/tests/newusers/58_invalid_input_file/config/etc/passwd b/tests/newusers/58_invalid_input_file/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/58_invalid_input_file/config/etc/passwd
rename to tests/newusers/58_invalid_input_file/config/etc/passwd
diff --git a/tests/tests/newusers/58_invalid_input_file/config/etc/shadow b/tests/newusers/58_invalid_input_file/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/58_invalid_input_file/config/etc/shadow
rename to tests/newusers/58_invalid_input_file/config/etc/shadow
diff --git a/tests/tests/newusers/58_invalid_input_file/data/newusers.err b/tests/newusers/58_invalid_input_file/data/newusers.err
similarity index 100%
rename from tests/tests/newusers/58_invalid_input_file/data/newusers.err
rename to tests/newusers/58_invalid_input_file/data/newusers.err
diff --git a/tests/tests/newusers/58_invalid_input_file/data/newusers.list b/tests/newusers/58_invalid_input_file/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/58_invalid_input_file/data/newusers.list
rename to tests/newusers/58_invalid_input_file/data/newusers.list
diff --git a/tests/tests/newusers/58_invalid_input_file/newusers.test b/tests/newusers/58_invalid_input_file/newusers.test
similarity index 100%
rename from tests/tests/newusers/58_invalid_input_file/newusers.test
rename to tests/newusers/58_invalid_input_file/newusers.test
diff --git a/tests/tests/newusers/59_no_gshadow_file/config.txt b/tests/newusers/59_no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/newusers/59_no_gshadow_file/config.txt
rename to tests/newusers/59_no_gshadow_file/config.txt
diff --git a/tests/tests/newusers/48_create_user_error_GID_4294967295/config/etc/group b/tests/newusers/59_no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/newusers/48_create_user_error_GID_4294967295/config/etc/group
rename to tests/newusers/59_no_gshadow_file/config/etc/group
diff --git a/tests/tests/newusers/48_create_user_error_GID_4294967295/config/etc/gshadow b/tests/newusers/59_no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/48_create_user_error_GID_4294967295/config/etc/gshadow
rename to tests/newusers/59_no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/newusers/59_no_gshadow_file/config/etc/pam.d/common-password b/tests/newusers/59_no_gshadow_file/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/59_no_gshadow_file/config/etc/pam.d/common-password
rename to tests/newusers/59_no_gshadow_file/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/59_no_gshadow_file/config/etc/pam.d/newusers b/tests/newusers/59_no_gshadow_file/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/59_no_gshadow_file/config/etc/pam.d/newusers
rename to tests/newusers/59_no_gshadow_file/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/48_create_user_error_GID_4294967295/config/etc/passwd b/tests/newusers/59_no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/48_create_user_error_GID_4294967295/config/etc/passwd
rename to tests/newusers/59_no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/newusers/59_no_gshadow_file/config/etc/shadow b/tests/newusers/59_no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/59_no_gshadow_file/config/etc/shadow
rename to tests/newusers/59_no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/newusers/59_no_gshadow_file/data/group b/tests/newusers/59_no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/newusers/59_no_gshadow_file/data/group
rename to tests/newusers/59_no_gshadow_file/data/group
diff --git a/tests/tests/newusers/59_no_gshadow_file/data/newusers.list b/tests/newusers/59_no_gshadow_file/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/59_no_gshadow_file/data/newusers.list
rename to tests/newusers/59_no_gshadow_file/data/newusers.list
diff --git a/tests/tests/newusers/59_no_gshadow_file/data/passwd b/tests/newusers/59_no_gshadow_file/data/passwd
similarity index 100%
rename from tests/tests/newusers/59_no_gshadow_file/data/passwd
rename to tests/newusers/59_no_gshadow_file/data/passwd
diff --git a/tests/tests/newusers/59_no_gshadow_file/data/shadow b/tests/newusers/59_no_gshadow_file/data/shadow
similarity index 100%
rename from tests/tests/newusers/59_no_gshadow_file/data/shadow
rename to tests/newusers/59_no_gshadow_file/data/shadow
diff --git a/tests/tests/newusers/59_no_gshadow_file/newusers.test b/tests/newusers/59_no_gshadow_file/newusers.test
similarity index 100%
rename from tests/tests/newusers/59_no_gshadow_file/newusers.test
rename to tests/newusers/59_no_gshadow_file/newusers.test
diff --git a/tests/tests/newusers/60_update_no_gecos/config.txt b/tests/newusers/60_update_no_gecos/config.txt
similarity index 100%
rename from tests/tests/newusers/60_update_no_gecos/config.txt
rename to tests/newusers/60_update_no_gecos/config.txt
diff --git a/tests/tests/newusers/60_update_no_gecos/config/etc/group b/tests/newusers/60_update_no_gecos/config/etc/group
similarity index 100%
rename from tests/tests/newusers/60_update_no_gecos/config/etc/group
rename to tests/newusers/60_update_no_gecos/config/etc/group
diff --git a/tests/tests/newusers/59_no_gshadow_file/config/etc/gshadow b/tests/newusers/60_update_no_gecos/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/59_no_gshadow_file/config/etc/gshadow
rename to tests/newusers/60_update_no_gecos/config/etc/gshadow
diff --git a/tests/tests/newusers/60_update_no_gecos/config/etc/pam.d/common-password b/tests/newusers/60_update_no_gecos/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/60_update_no_gecos/config/etc/pam.d/common-password
rename to tests/newusers/60_update_no_gecos/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/60_update_no_gecos/config/etc/pam.d/newusers b/tests/newusers/60_update_no_gecos/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/60_update_no_gecos/config/etc/pam.d/newusers
rename to tests/newusers/60_update_no_gecos/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/60_update_no_gecos/config/etc/passwd b/tests/newusers/60_update_no_gecos/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/60_update_no_gecos/config/etc/passwd
rename to tests/newusers/60_update_no_gecos/config/etc/passwd
diff --git a/tests/tests/newusers/60_update_no_gecos/config/etc/shadow b/tests/newusers/60_update_no_gecos/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/60_update_no_gecos/config/etc/shadow
rename to tests/newusers/60_update_no_gecos/config/etc/shadow
diff --git a/tests/tests/newusers/60_update_no_gecos/data/newusers.list b/tests/newusers/60_update_no_gecos/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/60_update_no_gecos/data/newusers.list
rename to tests/newusers/60_update_no_gecos/data/newusers.list
diff --git a/tests/tests/newusers/60_update_no_gecos/data/passwd b/tests/newusers/60_update_no_gecos/data/passwd
similarity index 100%
rename from tests/tests/newusers/60_update_no_gecos/data/passwd
rename to tests/newusers/60_update_no_gecos/data/passwd
diff --git a/tests/tests/newusers/60_update_no_gecos/data/shadow b/tests/newusers/60_update_no_gecos/data/shadow
similarity index 100%
rename from tests/tests/newusers/60_update_no_gecos/data/shadow
rename to tests/newusers/60_update_no_gecos/data/shadow
diff --git a/tests/tests/newusers/60_update_no_gecos/newusers.test b/tests/newusers/60_update_no_gecos/newusers.test
similarity index 100%
rename from tests/tests/newusers/60_update_no_gecos/newusers.test
rename to tests/newusers/60_update_no_gecos/newusers.test
diff --git a/tests/tests/newusers/61_update_no_shell/config.txt b/tests/newusers/61_update_no_shell/config.txt
similarity index 100%
rename from tests/tests/newusers/61_update_no_shell/config.txt
rename to tests/newusers/61_update_no_shell/config.txt
diff --git a/tests/tests/newusers/61_update_no_shell/config/etc/group b/tests/newusers/61_update_no_shell/config/etc/group
similarity index 100%
rename from tests/tests/newusers/61_update_no_shell/config/etc/group
rename to tests/newusers/61_update_no_shell/config/etc/group
diff --git a/tests/tests/newusers/60_update_no_gecos/config/etc/gshadow b/tests/newusers/61_update_no_shell/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/60_update_no_gecos/config/etc/gshadow
rename to tests/newusers/61_update_no_shell/config/etc/gshadow
diff --git a/tests/tests/newusers/61_update_no_shell/config/etc/pam.d/common-password b/tests/newusers/61_update_no_shell/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/newusers/61_update_no_shell/config/etc/pam.d/common-password
rename to tests/newusers/61_update_no_shell/config/etc/pam.d/common-password
diff --git a/tests/tests/newusers/61_update_no_shell/config/etc/pam.d/newusers b/tests/newusers/61_update_no_shell/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/newusers/61_update_no_shell/config/etc/pam.d/newusers
rename to tests/newusers/61_update_no_shell/config/etc/pam.d/newusers
diff --git a/tests/tests/newusers/61_update_no_shell/config/etc/passwd b/tests/newusers/61_update_no_shell/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/61_update_no_shell/config/etc/passwd
rename to tests/newusers/61_update_no_shell/config/etc/passwd
diff --git a/tests/tests/newusers/61_update_no_shell/config/etc/shadow b/tests/newusers/61_update_no_shell/config/etc/shadow
similarity index 100%
rename from tests/tests/newusers/61_update_no_shell/config/etc/shadow
rename to tests/newusers/61_update_no_shell/config/etc/shadow
diff --git a/tests/tests/newusers/61_update_no_shell/data/newusers.list b/tests/newusers/61_update_no_shell/data/newusers.list
similarity index 100%
rename from tests/tests/newusers/61_update_no_shell/data/newusers.list
rename to tests/newusers/61_update_no_shell/data/newusers.list
diff --git a/tests/tests/newusers/61_update_no_shell/data/passwd b/tests/newusers/61_update_no_shell/data/passwd
similarity index 100%
rename from tests/tests/newusers/61_update_no_shell/data/passwd
rename to tests/newusers/61_update_no_shell/data/passwd
diff --git a/tests/tests/newusers/61_update_no_shell/data/shadow b/tests/newusers/61_update_no_shell/data/shadow
similarity index 100%
rename from tests/tests/newusers/61_update_no_shell/data/shadow
rename to tests/newusers/61_update_no_shell/data/shadow
diff --git a/tests/tests/newusers/61_update_no_shell/newusers.test b/tests/newusers/61_update_no_shell/newusers.test
similarity index 100%
rename from tests/tests/newusers/61_update_no_shell/newusers.test
rename to tests/newusers/61_update_no_shell/newusers.test
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/group b/tests/passwd/01_passwd_-S_root_locked_account/config/etc/group
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/group
rename to tests/passwd/01_passwd_-S_root_locked_account/config/etc/group
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/gshadow b/tests/passwd/01_passwd_-S_root_locked_account/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/gshadow
rename to tests/passwd/01_passwd_-S_root_locked_account/config/etc/gshadow
diff --git a/tests/tests/passwd/01_passwd_-S_root_locked_account/config/etc/passwd b/tests/passwd/01_passwd_-S_root_locked_account/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/01_passwd_-S_root_locked_account/config/etc/passwd
rename to tests/passwd/01_passwd_-S_root_locked_account/config/etc/passwd
diff --git a/tests/tests/passwd/01_passwd_-S_root_locked_account/config/etc/shadow b/tests/passwd/01_passwd_-S_root_locked_account/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/01_passwd_-S_root_locked_account/config/etc/shadow
rename to tests/passwd/01_passwd_-S_root_locked_account/config/etc/shadow
diff --git a/tests/tests/passwd/01_passwd_-S_root_locked_account/data/passwd.out b/tests/passwd/01_passwd_-S_root_locked_account/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/01_passwd_-S_root_locked_account/data/passwd.out
rename to tests/passwd/01_passwd_-S_root_locked_account/data/passwd.out
diff --git a/tests/tests/passwd/01_passwd_-S_root_locked_account/passwd.test b/tests/passwd/01_passwd_-S_root_locked_account/passwd.test
similarity index 100%
rename from tests/tests/passwd/01_passwd_-S_root_locked_account/passwd.test
rename to tests/passwd/01_passwd_-S_root_locked_account/passwd.test
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/group b/tests/passwd/02_passwd_-S_root_valid_account/config/etc/group
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/group
rename to tests/passwd/02_passwd_-S_root_valid_account/config/etc/group
diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/gshadow b/tests/passwd/02_passwd_-S_root_valid_account/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/gshadow
rename to tests/passwd/02_passwd_-S_root_valid_account/config/etc/gshadow
diff --git a/tests/tests/passwd/02_passwd_-S_root_valid_account/config/etc/passwd b/tests/passwd/02_passwd_-S_root_valid_account/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/02_passwd_-S_root_valid_account/config/etc/passwd
rename to tests/passwd/02_passwd_-S_root_valid_account/config/etc/passwd
diff --git a/tests/tests/passwd/02_passwd_-S_root_valid_account/config/etc/shadow b/tests/passwd/02_passwd_-S_root_valid_account/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/02_passwd_-S_root_valid_account/config/etc/shadow
rename to tests/passwd/02_passwd_-S_root_valid_account/config/etc/shadow
diff --git a/tests/tests/passwd/02_passwd_-S_root_valid_account/data/passwd.out b/tests/passwd/02_passwd_-S_root_valid_account/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/02_passwd_-S_root_valid_account/data/passwd.out
rename to tests/passwd/02_passwd_-S_root_valid_account/data/passwd.out
diff --git a/tests/tests/passwd/02_passwd_-S_root_valid_account/passwd.test b/tests/passwd/02_passwd_-S_root_valid_account/passwd.test
similarity index 100%
rename from tests/tests/passwd/02_passwd_-S_root_valid_account/passwd.test
rename to tests/passwd/02_passwd_-S_root_valid_account/passwd.test
diff --git a/tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/group b/tests/passwd/03_passwd_-S_root_empty_password/config/etc/group
similarity index 100%
rename from tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/group
rename to tests/passwd/03_passwd_-S_root_empty_password/config/etc/group
diff --git a/tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/gshadow b/tests/passwd/03_passwd_-S_root_empty_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/gshadow
rename to tests/passwd/03_passwd_-S_root_empty_password/config/etc/gshadow
diff --git a/tests/tests/passwd/03_passwd_-S_root_empty_password/config/etc/passwd b/tests/passwd/03_passwd_-S_root_empty_password/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/03_passwd_-S_root_empty_password/config/etc/passwd
rename to tests/passwd/03_passwd_-S_root_empty_password/config/etc/passwd
diff --git a/tests/tests/passwd/03_passwd_-S_root_empty_password/config/etc/shadow b/tests/passwd/03_passwd_-S_root_empty_password/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/03_passwd_-S_root_empty_password/config/etc/shadow
rename to tests/passwd/03_passwd_-S_root_empty_password/config/etc/shadow
diff --git a/tests/tests/passwd/03_passwd_-S_root_empty_password/data/passwd.out b/tests/passwd/03_passwd_-S_root_empty_password/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/03_passwd_-S_root_empty_password/data/passwd.out
rename to tests/passwd/03_passwd_-S_root_empty_password/data/passwd.out
diff --git a/tests/tests/passwd/03_passwd_-S_root_empty_password/passwd.test b/tests/passwd/03_passwd_-S_root_empty_password/passwd.test
similarity index 100%
rename from tests/tests/passwd/03_passwd_-S_root_empty_password/passwd.test
rename to tests/passwd/03_passwd_-S_root_empty_password/passwd.test
diff --git a/tests/tests/passwd/01_passwd_-S_root_locked_account/config/etc/group b/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/passwd/01_passwd_-S_root_locked_account/config/etc/group
rename to tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/group
diff --git a/tests/tests/passwd/01_passwd_-S_root_locked_account/config/etc/gshadow b/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/01_passwd_-S_root_locked_account/config/etc/gshadow
rename to tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/passwd b/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/passwd
rename to tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/shadow b/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/shadow
rename to tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/data/passwd.out b/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/data/passwd.out
rename to tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/data/passwd.out
diff --git a/tests/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/passwd.test b/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/passwd.test
similarity index 100%
rename from tests/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/passwd.test
rename to tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/passwd.test
diff --git a/tests/tests/passwd/02_passwd_-S_root_valid_account/config/etc/group b/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/passwd/02_passwd_-S_root_valid_account/config/etc/group
rename to tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/group
diff --git a/tests/tests/passwd/02_passwd_-S_root_valid_account/config/etc/gshadow b/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/02_passwd_-S_root_valid_account/config/etc/gshadow
rename to tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/passwd b/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/passwd
rename to tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/log/lastlog/16_lastlog_extra_arg/config/etc/shadow b/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/16_lastlog_extra_arg/config/etc/shadow
rename to tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/data/passwd.out b/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/data/passwd.out
rename to tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/data/passwd.out
diff --git a/tests/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/passwd.test b/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/passwd.test
similarity index 100%
rename from tests/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/passwd.test
rename to tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/passwd.test
diff --git a/tests/tests/passwd/03_passwd_-S_root_empty_password/config/etc/group b/tests/passwd/06_passwd_-l_root_lock_account/config/etc/group
similarity index 100%
rename from tests/tests/passwd/03_passwd_-S_root_empty_password/config/etc/group
rename to tests/passwd/06_passwd_-l_root_lock_account/config/etc/group
diff --git a/tests/tests/passwd/03_passwd_-S_root_empty_password/config/etc/gshadow b/tests/passwd/06_passwd_-l_root_lock_account/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/03_passwd_-S_root_empty_password/config/etc/gshadow
rename to tests/passwd/06_passwd_-l_root_lock_account/config/etc/gshadow
diff --git a/tests/tests/passwd/06_passwd_-l_root_lock_account/config/etc/passwd b/tests/passwd/06_passwd_-l_root_lock_account/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/06_passwd_-l_root_lock_account/config/etc/passwd
rename to tests/passwd/06_passwd_-l_root_lock_account/config/etc/passwd
diff --git a/tests/tests/passwd/06_passwd_-l_root_lock_account/config/etc/shadow b/tests/passwd/06_passwd_-l_root_lock_account/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/06_passwd_-l_root_lock_account/config/etc/shadow
rename to tests/passwd/06_passwd_-l_root_lock_account/config/etc/shadow
diff --git a/tests/tests/passwd/06_passwd_-l_root_lock_account/data/passwd.out b/tests/passwd/06_passwd_-l_root_lock_account/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/06_passwd_-l_root_lock_account/data/passwd.out
rename to tests/passwd/06_passwd_-l_root_lock_account/data/passwd.out
diff --git a/tests/tests/passwd/06_passwd_-l_root_lock_account/data/shadow b/tests/passwd/06_passwd_-l_root_lock_account/data/shadow
similarity index 100%
rename from tests/tests/passwd/06_passwd_-l_root_lock_account/data/shadow
rename to tests/passwd/06_passwd_-l_root_lock_account/data/shadow
diff --git a/tests/tests/passwd/06_passwd_-l_root_lock_account/passwd.test b/tests/passwd/06_passwd_-l_root_lock_account/passwd.test
similarity index 100%
rename from tests/tests/passwd/06_passwd_-l_root_lock_account/passwd.test
rename to tests/passwd/06_passwd_-l_root_lock_account/passwd.test
diff --git a/tests/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/group b/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/group
rename to tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/group
diff --git a/tests/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/gshadow b/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/04_passwd_-S_root_valid_account_no_shadow_file/config/etc/gshadow
rename to tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/passwd b/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/passwd
rename to tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/shadow b/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/shadow
rename to tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/data/passwd b/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/data/passwd
similarity index 100%
rename from tests/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/data/passwd
rename to tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/data/passwd
diff --git a/tests/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/data/passwd.out b/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/data/passwd.out
rename to tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/data/passwd.out
diff --git a/tests/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/passwd.test b/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/passwd.test
similarity index 100%
rename from tests/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/passwd.test
rename to tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/passwd.test
diff --git a/tests/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/group b/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/group
similarity index 100%
rename from tests/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/group
rename to tests/passwd/08_passwd_-u_root_unlock_account/config/etc/group
diff --git a/tests/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/gshadow b/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/config/etc/gshadow
rename to tests/passwd/08_passwd_-u_root_unlock_account/config/etc/gshadow
diff --git a/tests/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/passwd b/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/passwd
rename to tests/passwd/08_passwd_-u_root_unlock_account/config/etc/passwd
diff --git a/tests/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/shadow b/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/shadow
rename to tests/passwd/08_passwd_-u_root_unlock_account/config/etc/shadow
diff --git a/tests/tests/passwd/08_passwd_-u_root_unlock_account/data/passwd.out b/tests/passwd/08_passwd_-u_root_unlock_account/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/08_passwd_-u_root_unlock_account/data/passwd.out
rename to tests/passwd/08_passwd_-u_root_unlock_account/data/passwd.out
diff --git a/tests/tests/passwd/08_passwd_-u_root_unlock_account/data/shadow b/tests/passwd/08_passwd_-u_root_unlock_account/data/shadow
similarity index 100%
rename from tests/tests/passwd/08_passwd_-u_root_unlock_account/data/shadow
rename to tests/passwd/08_passwd_-u_root_unlock_account/data/shadow
diff --git a/tests/tests/passwd/08_passwd_-u_root_unlock_account/passwd.test b/tests/passwd/08_passwd_-u_root_unlock_account/passwd.test
similarity index 100%
rename from tests/tests/passwd/08_passwd_-u_root_unlock_account/passwd.test
rename to tests/passwd/08_passwd_-u_root_unlock_account/passwd.test
diff --git a/tests/tests/passwd/06_passwd_-l_root_lock_account/config/etc/group b/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/group
similarity index 100%
rename from tests/tests/passwd/06_passwd_-l_root_lock_account/config/etc/group
rename to tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/group
diff --git a/tests/tests/passwd/06_passwd_-l_root_lock_account/config/etc/gshadow b/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/06_passwd_-l_root_lock_account/config/etc/gshadow
rename to tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/gshadow
diff --git a/tests/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/passwd b/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/passwd
rename to tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/shadow b/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/shadow
rename to tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/shadow
diff --git a/tests/tests/passwd/09_passwd_-u_root_unlock_to_empty/data/passwd.err b/tests/passwd/09_passwd_-u_root_unlock_to_empty/data/passwd.err
similarity index 100%
rename from tests/tests/passwd/09_passwd_-u_root_unlock_to_empty/data/passwd.err
rename to tests/passwd/09_passwd_-u_root_unlock_to_empty/data/passwd.err
diff --git a/tests/tests/passwd/09_passwd_-u_root_unlock_to_empty/passwd.test b/tests/passwd/09_passwd_-u_root_unlock_to_empty/passwd.test
similarity index 100%
rename from tests/tests/passwd/09_passwd_-u_root_unlock_to_empty/passwd.test
rename to tests/passwd/09_passwd_-u_root_unlock_to_empty/passwd.test
diff --git a/tests/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/group b/tests/passwd/10_passwd_-d_root/config/etc/group
similarity index 100%
rename from tests/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/group
rename to tests/passwd/10_passwd_-d_root/config/etc/group
diff --git a/tests/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/gshadow b/tests/passwd/10_passwd_-d_root/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/gshadow
rename to tests/passwd/10_passwd_-d_root/config/etc/gshadow
diff --git a/tests/tests/passwd/10_passwd_-d_root/config/etc/passwd b/tests/passwd/10_passwd_-d_root/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/10_passwd_-d_root/config/etc/passwd
rename to tests/passwd/10_passwd_-d_root/config/etc/passwd
diff --git a/tests/tests/passwd/10_passwd_-d_root/config/etc/shadow b/tests/passwd/10_passwd_-d_root/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/10_passwd_-d_root/config/etc/shadow
rename to tests/passwd/10_passwd_-d_root/config/etc/shadow
diff --git a/tests/tests/passwd/10_passwd_-d_root/data/passwd.out b/tests/passwd/10_passwd_-d_root/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/10_passwd_-d_root/data/passwd.out
rename to tests/passwd/10_passwd_-d_root/data/passwd.out
diff --git a/tests/tests/passwd/10_passwd_-d_root/data/shadow b/tests/passwd/10_passwd_-d_root/data/shadow
similarity index 100%
rename from tests/tests/passwd/10_passwd_-d_root/data/shadow
rename to tests/passwd/10_passwd_-d_root/data/shadow
diff --git a/tests/tests/passwd/10_passwd_-d_root/passwd.test b/tests/passwd/10_passwd_-d_root/passwd.test
similarity index 100%
rename from tests/tests/passwd/10_passwd_-d_root/passwd.test
rename to tests/passwd/10_passwd_-d_root/passwd.test
diff --git a/tests/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/group b/tests/passwd/11_passwd_--mindays_root/config/etc/group
similarity index 100%
rename from tests/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/group
rename to tests/passwd/11_passwd_--mindays_root/config/etc/group
diff --git a/tests/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/gshadow b/tests/passwd/11_passwd_--mindays_root/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/gshadow
rename to tests/passwd/11_passwd_--mindays_root/config/etc/gshadow
diff --git a/tests/tests/passwd/11_passwd_--mindays_root/config/etc/passwd b/tests/passwd/11_passwd_--mindays_root/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/11_passwd_--mindays_root/config/etc/passwd
rename to tests/passwd/11_passwd_--mindays_root/config/etc/passwd
diff --git a/tests/tests/passwd/11_passwd_--mindays_root/config/etc/shadow b/tests/passwd/11_passwd_--mindays_root/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/11_passwd_--mindays_root/config/etc/shadow
rename to tests/passwd/11_passwd_--mindays_root/config/etc/shadow
diff --git a/tests/tests/passwd/11_passwd_--mindays_root/data/passwd.out b/tests/passwd/11_passwd_--mindays_root/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/11_passwd_--mindays_root/data/passwd.out
rename to tests/passwd/11_passwd_--mindays_root/data/passwd.out
diff --git a/tests/tests/passwd/11_passwd_--mindays_root/data/shadow b/tests/passwd/11_passwd_--mindays_root/data/shadow
similarity index 100%
rename from tests/tests/passwd/11_passwd_--mindays_root/data/shadow
rename to tests/passwd/11_passwd_--mindays_root/data/shadow
diff --git a/tests/tests/passwd/11_passwd_--mindays_root/passwd.test b/tests/passwd/11_passwd_--mindays_root/passwd.test
similarity index 100%
rename from tests/tests/passwd/11_passwd_--mindays_root/passwd.test
rename to tests/passwd/11_passwd_--mindays_root/passwd.test
diff --git a/tests/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/group b/tests/passwd/12_passwd_--maxdays_root/config/etc/group
similarity index 100%
rename from tests/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/group
rename to tests/passwd/12_passwd_--maxdays_root/config/etc/group
diff --git a/tests/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/gshadow b/tests/passwd/12_passwd_--maxdays_root/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/gshadow
rename to tests/passwd/12_passwd_--maxdays_root/config/etc/gshadow
diff --git a/tests/tests/passwd/12_passwd_--maxdays_root/config/etc/passwd b/tests/passwd/12_passwd_--maxdays_root/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/12_passwd_--maxdays_root/config/etc/passwd
rename to tests/passwd/12_passwd_--maxdays_root/config/etc/passwd
diff --git a/tests/tests/passwd/12_passwd_--maxdays_root/config/etc/shadow b/tests/passwd/12_passwd_--maxdays_root/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/12_passwd_--maxdays_root/config/etc/shadow
rename to tests/passwd/12_passwd_--maxdays_root/config/etc/shadow
diff --git a/tests/tests/passwd/12_passwd_--maxdays_root/data/passwd.out b/tests/passwd/12_passwd_--maxdays_root/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/12_passwd_--maxdays_root/data/passwd.out
rename to tests/passwd/12_passwd_--maxdays_root/data/passwd.out
diff --git a/tests/tests/passwd/12_passwd_--maxdays_root/data/shadow b/tests/passwd/12_passwd_--maxdays_root/data/shadow
similarity index 100%
rename from tests/tests/passwd/12_passwd_--maxdays_root/data/shadow
rename to tests/passwd/12_passwd_--maxdays_root/data/shadow
diff --git a/tests/tests/passwd/12_passwd_--maxdays_root/passwd.test b/tests/passwd/12_passwd_--maxdays_root/passwd.test
similarity index 100%
rename from tests/tests/passwd/12_passwd_--maxdays_root/passwd.test
rename to tests/passwd/12_passwd_--maxdays_root/passwd.test
diff --git a/tests/tests/passwd/10_passwd_-d_root/config/etc/group b/tests/passwd/13_passwd_--warndays_root/config/etc/group
similarity index 100%
rename from tests/tests/passwd/10_passwd_-d_root/config/etc/group
rename to tests/passwd/13_passwd_--warndays_root/config/etc/group
diff --git a/tests/tests/passwd/10_passwd_-d_root/config/etc/gshadow b/tests/passwd/13_passwd_--warndays_root/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/10_passwd_-d_root/config/etc/gshadow
rename to tests/passwd/13_passwd_--warndays_root/config/etc/gshadow
diff --git a/tests/tests/passwd/13_passwd_--warndays_root/config/etc/passwd b/tests/passwd/13_passwd_--warndays_root/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/13_passwd_--warndays_root/config/etc/passwd
rename to tests/passwd/13_passwd_--warndays_root/config/etc/passwd
diff --git a/tests/tests/passwd/13_passwd_--warndays_root/config/etc/shadow b/tests/passwd/13_passwd_--warndays_root/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/13_passwd_--warndays_root/config/etc/shadow
rename to tests/passwd/13_passwd_--warndays_root/config/etc/shadow
diff --git a/tests/tests/passwd/13_passwd_--warndays_root/data/passwd.out b/tests/passwd/13_passwd_--warndays_root/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/13_passwd_--warndays_root/data/passwd.out
rename to tests/passwd/13_passwd_--warndays_root/data/passwd.out
diff --git a/tests/tests/passwd/13_passwd_--warndays_root/data/shadow b/tests/passwd/13_passwd_--warndays_root/data/shadow
similarity index 100%
rename from tests/tests/passwd/13_passwd_--warndays_root/data/shadow
rename to tests/passwd/13_passwd_--warndays_root/data/shadow
diff --git a/tests/tests/passwd/13_passwd_--warndays_root/passwd.test b/tests/passwd/13_passwd_--warndays_root/passwd.test
similarity index 100%
rename from tests/tests/passwd/13_passwd_--warndays_root/passwd.test
rename to tests/passwd/13_passwd_--warndays_root/passwd.test
diff --git a/tests/tests/passwd/11_passwd_--mindays_root/config/etc/group b/tests/passwd/14_passwd_--inactive_root/config/etc/group
similarity index 100%
rename from tests/tests/passwd/11_passwd_--mindays_root/config/etc/group
rename to tests/passwd/14_passwd_--inactive_root/config/etc/group
diff --git a/tests/tests/passwd/11_passwd_--mindays_root/config/etc/gshadow b/tests/passwd/14_passwd_--inactive_root/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/11_passwd_--mindays_root/config/etc/gshadow
rename to tests/passwd/14_passwd_--inactive_root/config/etc/gshadow
diff --git a/tests/tests/passwd/14_passwd_--inactive_root/config/etc/passwd b/tests/passwd/14_passwd_--inactive_root/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/14_passwd_--inactive_root/config/etc/passwd
rename to tests/passwd/14_passwd_--inactive_root/config/etc/passwd
diff --git a/tests/tests/passwd/14_passwd_--inactive_root/config/etc/shadow b/tests/passwd/14_passwd_--inactive_root/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/14_passwd_--inactive_root/config/etc/shadow
rename to tests/passwd/14_passwd_--inactive_root/config/etc/shadow
diff --git a/tests/tests/passwd/14_passwd_--inactive_root/data/passwd.out b/tests/passwd/14_passwd_--inactive_root/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/14_passwd_--inactive_root/data/passwd.out
rename to tests/passwd/14_passwd_--inactive_root/data/passwd.out
diff --git a/tests/tests/passwd/14_passwd_--inactive_root/data/shadow b/tests/passwd/14_passwd_--inactive_root/data/shadow
similarity index 100%
rename from tests/tests/passwd/14_passwd_--inactive_root/data/shadow
rename to tests/passwd/14_passwd_--inactive_root/data/shadow
diff --git a/tests/tests/passwd/14_passwd_--inactive_root/passwd.test b/tests/passwd/14_passwd_--inactive_root/passwd.test
similarity index 100%
rename from tests/tests/passwd/14_passwd_--inactive_root/passwd.test
rename to tests/passwd/14_passwd_--inactive_root/passwd.test
diff --git a/tests/tests/passwd/12_passwd_--maxdays_root/config/etc/group b/tests/passwd/15_passwd_--expire_root/config/etc/group
similarity index 100%
rename from tests/tests/passwd/12_passwd_--maxdays_root/config/etc/group
rename to tests/passwd/15_passwd_--expire_root/config/etc/group
diff --git a/tests/tests/passwd/12_passwd_--maxdays_root/config/etc/gshadow b/tests/passwd/15_passwd_--expire_root/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/12_passwd_--maxdays_root/config/etc/gshadow
rename to tests/passwd/15_passwd_--expire_root/config/etc/gshadow
diff --git a/tests/tests/passwd/15_passwd_--expire_root/config/etc/passwd b/tests/passwd/15_passwd_--expire_root/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/15_passwd_--expire_root/config/etc/passwd
rename to tests/passwd/15_passwd_--expire_root/config/etc/passwd
diff --git a/tests/tests/passwd/15_passwd_--expire_root/config/etc/shadow b/tests/passwd/15_passwd_--expire_root/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/15_passwd_--expire_root/config/etc/shadow
rename to tests/passwd/15_passwd_--expire_root/config/etc/shadow
diff --git a/tests/tests/passwd/15_passwd_--expire_root/data/passwd.out b/tests/passwd/15_passwd_--expire_root/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/15_passwd_--expire_root/data/passwd.out
rename to tests/passwd/15_passwd_--expire_root/data/passwd.out
diff --git a/tests/tests/passwd/15_passwd_--expire_root/data/shadow b/tests/passwd/15_passwd_--expire_root/data/shadow
similarity index 100%
rename from tests/tests/passwd/15_passwd_--expire_root/data/shadow
rename to tests/passwd/15_passwd_--expire_root/data/shadow
diff --git a/tests/tests/passwd/15_passwd_--expire_root/passwd.test b/tests/passwd/15_passwd_--expire_root/passwd.test
similarity index 100%
rename from tests/tests/passwd/15_passwd_--expire_root/passwd.test
rename to tests/passwd/15_passwd_--expire_root/passwd.test
diff --git a/tests/tests/passwd/13_passwd_--warndays_root/config/etc/group b/tests/passwd/16_passwd_-S-a_root/config/etc/group
similarity index 100%
rename from tests/tests/passwd/13_passwd_--warndays_root/config/etc/group
rename to tests/passwd/16_passwd_-S-a_root/config/etc/group
diff --git a/tests/tests/passwd/13_passwd_--warndays_root/config/etc/gshadow b/tests/passwd/16_passwd_-S-a_root/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/13_passwd_--warndays_root/config/etc/gshadow
rename to tests/passwd/16_passwd_-S-a_root/config/etc/gshadow
diff --git a/tests/tests/passwd/16_passwd_-S-a_root/config/etc/passwd b/tests/passwd/16_passwd_-S-a_root/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/16_passwd_-S-a_root/config/etc/passwd
rename to tests/passwd/16_passwd_-S-a_root/config/etc/passwd
diff --git a/tests/tests/passwd/16_passwd_-S-a_root/config/etc/shadow b/tests/passwd/16_passwd_-S-a_root/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/16_passwd_-S-a_root/config/etc/shadow
rename to tests/passwd/16_passwd_-S-a_root/config/etc/shadow
diff --git a/tests/tests/passwd/16_passwd_-S-a_root/data/passwd.out b/tests/passwd/16_passwd_-S-a_root/data/passwd.out
similarity index 100%
rename from tests/tests/passwd/16_passwd_-S-a_root/data/passwd.out
rename to tests/passwd/16_passwd_-S-a_root/data/passwd.out
diff --git a/tests/tests/passwd/16_passwd_-S-a_root/passwd.test b/tests/passwd/16_passwd_-S-a_root/passwd.test
similarity index 100%
rename from tests/tests/passwd/16_passwd_-S-a_root/passwd.test
rename to tests/passwd/16_passwd_-S-a_root/passwd.test
diff --git a/tests/tests/passwd/14_passwd_--inactive_root/config/etc/group b/tests/passwd/17_passwd_root_change_password/config/etc/group
similarity index 100%
rename from tests/tests/passwd/14_passwd_--inactive_root/config/etc/group
rename to tests/passwd/17_passwd_root_change_password/config/etc/group
diff --git a/tests/tests/passwd/14_passwd_--inactive_root/config/etc/gshadow b/tests/passwd/17_passwd_root_change_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/14_passwd_--inactive_root/config/etc/gshadow
rename to tests/passwd/17_passwd_root_change_password/config/etc/gshadow
diff --git a/tests/tests/passwd/17_passwd_root_change_password/config/etc/pam.d/common-password b/tests/passwd/17_passwd_root_change_password/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/passwd/17_passwd_root_change_password/config/etc/pam.d/common-password
rename to tests/passwd/17_passwd_root_change_password/config/etc/pam.d/common-password
diff --git a/tests/tests/passwd/17_passwd_root_change_password/config/etc/passwd b/tests/passwd/17_passwd_root_change_password/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/17_passwd_root_change_password/config/etc/passwd
rename to tests/passwd/17_passwd_root_change_password/config/etc/passwd
diff --git a/tests/tests/passwd/17_passwd_root_change_password/config/etc/shadow b/tests/passwd/17_passwd_root_change_password/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/17_passwd_root_change_password/config/etc/shadow
rename to tests/passwd/17_passwd_root_change_password/config/etc/shadow
diff --git a/tests/tests/passwd/17_passwd_root_change_password/data/shadow b/tests/passwd/17_passwd_root_change_password/data/shadow
similarity index 100%
rename from tests/tests/passwd/17_passwd_root_change_password/data/shadow
rename to tests/passwd/17_passwd_root_change_password/data/shadow
diff --git a/tests/tests/passwd/17_passwd_root_change_password/passwd.exp b/tests/passwd/17_passwd_root_change_password/passwd.exp
similarity index 100%
rename from tests/tests/passwd/17_passwd_root_change_password/passwd.exp
rename to tests/passwd/17_passwd_root_change_password/passwd.exp
diff --git a/tests/tests/passwd/17_passwd_root_change_password/passwd.test b/tests/passwd/17_passwd_root_change_password/passwd.test
similarity index 100%
rename from tests/tests/passwd/17_passwd_root_change_password/passwd.test
rename to tests/passwd/17_passwd_root_change_password/passwd.test
diff --git a/tests/tests/passwd/15_passwd_--expire_root/config/etc/group b/tests/passwd/18_passwd_root_change_password_user/config/etc/group
similarity index 100%
rename from tests/tests/passwd/15_passwd_--expire_root/config/etc/group
rename to tests/passwd/18_passwd_root_change_password_user/config/etc/group
diff --git a/tests/tests/passwd/15_passwd_--expire_root/config/etc/gshadow b/tests/passwd/18_passwd_root_change_password_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/15_passwd_--expire_root/config/etc/gshadow
rename to tests/passwd/18_passwd_root_change_password_user/config/etc/gshadow
diff --git a/tests/tests/passwd/18_passwd_root_change_password_user/config/etc/pam.d/common-password b/tests/passwd/18_passwd_root_change_password_user/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/passwd/18_passwd_root_change_password_user/config/etc/pam.d/common-password
rename to tests/passwd/18_passwd_root_change_password_user/config/etc/pam.d/common-password
diff --git a/tests/tests/passwd/18_passwd_root_change_password_user/config/etc/passwd b/tests/passwd/18_passwd_root_change_password_user/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/18_passwd_root_change_password_user/config/etc/passwd
rename to tests/passwd/18_passwd_root_change_password_user/config/etc/passwd
diff --git a/tests/tests/passwd/18_passwd_root_change_password_user/config/etc/shadow b/tests/passwd/18_passwd_root_change_password_user/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/18_passwd_root_change_password_user/config/etc/shadow
rename to tests/passwd/18_passwd_root_change_password_user/config/etc/shadow
diff --git a/tests/tests/passwd/18_passwd_root_change_password_user/data/shadow b/tests/passwd/18_passwd_root_change_password_user/data/shadow
similarity index 100%
rename from tests/tests/passwd/18_passwd_root_change_password_user/data/shadow
rename to tests/passwd/18_passwd_root_change_password_user/data/shadow
diff --git a/tests/tests/passwd/18_passwd_root_change_password_user/passwd.exp b/tests/passwd/18_passwd_root_change_password_user/passwd.exp
similarity index 100%
rename from tests/tests/passwd/18_passwd_root_change_password_user/passwd.exp
rename to tests/passwd/18_passwd_root_change_password_user/passwd.exp
diff --git a/tests/tests/passwd/18_passwd_root_change_password_user/passwd.test b/tests/passwd/18_passwd_root_change_password_user/passwd.test
similarity index 100%
rename from tests/tests/passwd/18_passwd_root_change_password_user/passwd.test
rename to tests/passwd/18_passwd_root_change_password_user/passwd.test
diff --git a/tests/tests/passwd/16_passwd_-S-a_root/config/etc/group b/tests/passwd/19_passwd_user_change_password/config/etc/group
similarity index 100%
rename from tests/tests/passwd/16_passwd_-S-a_root/config/etc/group
rename to tests/passwd/19_passwd_user_change_password/config/etc/group
diff --git a/tests/tests/passwd/16_passwd_-S-a_root/config/etc/gshadow b/tests/passwd/19_passwd_user_change_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/16_passwd_-S-a_root/config/etc/gshadow
rename to tests/passwd/19_passwd_user_change_password/config/etc/gshadow
diff --git a/tests/tests/passwd/19_passwd_user_change_password/config/etc/pam.d/common-password b/tests/passwd/19_passwd_user_change_password/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/passwd/19_passwd_user_change_password/config/etc/pam.d/common-password
rename to tests/passwd/19_passwd_user_change_password/config/etc/pam.d/common-password
diff --git a/tests/tests/passwd/19_passwd_user_change_password/config/etc/passwd b/tests/passwd/19_passwd_user_change_password/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/19_passwd_user_change_password/config/etc/passwd
rename to tests/passwd/19_passwd_user_change_password/config/etc/passwd
diff --git a/tests/tests/passwd/19_passwd_user_change_password/config/etc/shadow b/tests/passwd/19_passwd_user_change_password/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/19_passwd_user_change_password/config/etc/shadow
rename to tests/passwd/19_passwd_user_change_password/config/etc/shadow
diff --git a/tests/tests/passwd/19_passwd_user_change_password/data/shadow b/tests/passwd/19_passwd_user_change_password/data/shadow
similarity index 100%
rename from tests/tests/passwd/19_passwd_user_change_password/data/shadow
rename to tests/passwd/19_passwd_user_change_password/data/shadow
diff --git a/tests/tests/passwd/19_passwd_user_change_password/passwd.exp b/tests/passwd/19_passwd_user_change_password/passwd.exp
similarity index 100%
rename from tests/tests/passwd/19_passwd_user_change_password/passwd.exp
rename to tests/passwd/19_passwd_user_change_password/passwd.exp
diff --git a/tests/tests/passwd/19_passwd_user_change_password/passwd.test b/tests/passwd/19_passwd_user_change_password/passwd.test
similarity index 100%
rename from tests/tests/passwd/19_passwd_user_change_password/passwd.test
rename to tests/passwd/19_passwd_user_change_password/passwd.test
diff --git a/tests/tests/passwd/17_passwd_root_change_password/config/etc/group b/tests/passwd/20_passwd_user_change_password_same_user/config/etc/group
similarity index 100%
rename from tests/tests/passwd/17_passwd_root_change_password/config/etc/group
rename to tests/passwd/20_passwd_user_change_password_same_user/config/etc/group
diff --git a/tests/tests/passwd/17_passwd_root_change_password/config/etc/gshadow b/tests/passwd/20_passwd_user_change_password_same_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/17_passwd_root_change_password/config/etc/gshadow
rename to tests/passwd/20_passwd_user_change_password_same_user/config/etc/gshadow
diff --git a/tests/tests/passwd/20_passwd_user_change_password_same_user/config/etc/pam.d/common-password b/tests/passwd/20_passwd_user_change_password_same_user/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/passwd/20_passwd_user_change_password_same_user/config/etc/pam.d/common-password
rename to tests/passwd/20_passwd_user_change_password_same_user/config/etc/pam.d/common-password
diff --git a/tests/tests/passwd/20_passwd_user_change_password_same_user/config/etc/passwd b/tests/passwd/20_passwd_user_change_password_same_user/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/20_passwd_user_change_password_same_user/config/etc/passwd
rename to tests/passwd/20_passwd_user_change_password_same_user/config/etc/passwd
diff --git a/tests/tests/passwd/20_passwd_user_change_password_same_user/config/etc/shadow b/tests/passwd/20_passwd_user_change_password_same_user/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/20_passwd_user_change_password_same_user/config/etc/shadow
rename to tests/passwd/20_passwd_user_change_password_same_user/config/etc/shadow
diff --git a/tests/tests/passwd/20_passwd_user_change_password_same_user/data/shadow b/tests/passwd/20_passwd_user_change_password_same_user/data/shadow
similarity index 100%
rename from tests/tests/passwd/20_passwd_user_change_password_same_user/data/shadow
rename to tests/passwd/20_passwd_user_change_password_same_user/data/shadow
diff --git a/tests/tests/passwd/20_passwd_user_change_password_same_user/passwd.exp b/tests/passwd/20_passwd_user_change_password_same_user/passwd.exp
similarity index 100%
rename from tests/tests/passwd/20_passwd_user_change_password_same_user/passwd.exp
rename to tests/passwd/20_passwd_user_change_password_same_user/passwd.exp
diff --git a/tests/tests/passwd/20_passwd_user_change_password_same_user/passwd.test b/tests/passwd/20_passwd_user_change_password_same_user/passwd.test
similarity index 100%
rename from tests/tests/passwd/20_passwd_user_change_password_same_user/passwd.test
rename to tests/passwd/20_passwd_user_change_password_same_user/passwd.test
diff --git a/tests/tests/passwd/21_passwd_user_change_password_other_user/config/etc/group b/tests/passwd/21_passwd_user_change_password_other_user/config/etc/group
similarity index 100%
rename from tests/tests/passwd/21_passwd_user_change_password_other_user/config/etc/group
rename to tests/passwd/21_passwd_user_change_password_other_user/config/etc/group
diff --git a/tests/tests/passwd/21_passwd_user_change_password_other_user/config/etc/gshadow b/tests/passwd/21_passwd_user_change_password_other_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/21_passwd_user_change_password_other_user/config/etc/gshadow
rename to tests/passwd/21_passwd_user_change_password_other_user/config/etc/gshadow
diff --git a/tests/tests/passwd/21_passwd_user_change_password_other_user/config/etc/passwd b/tests/passwd/21_passwd_user_change_password_other_user/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/21_passwd_user_change_password_other_user/config/etc/passwd
rename to tests/passwd/21_passwd_user_change_password_other_user/config/etc/passwd
diff --git a/tests/tests/passwd/21_passwd_user_change_password_other_user/config/etc/shadow b/tests/passwd/21_passwd_user_change_password_other_user/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/21_passwd_user_change_password_other_user/config/etc/shadow
rename to tests/passwd/21_passwd_user_change_password_other_user/config/etc/shadow
diff --git a/tests/tests/passwd/21_passwd_user_change_password_other_user/data/passwd.err b/tests/passwd/21_passwd_user_change_password_other_user/data/passwd.err
similarity index 100%
rename from tests/tests/passwd/21_passwd_user_change_password_other_user/data/passwd.err
rename to tests/passwd/21_passwd_user_change_password_other_user/data/passwd.err
diff --git a/tests/tests/passwd/21_passwd_user_change_password_other_user/passwd.test b/tests/passwd/21_passwd_user_change_password_other_user/passwd.test
similarity index 100%
rename from tests/tests/passwd/21_passwd_user_change_password_other_user/passwd.test
rename to tests/passwd/21_passwd_user_change_password_other_user/passwd.test
diff --git a/tests/tests/passwd/22_passwd_usage/config.txt b/tests/passwd/22_passwd_usage/config.txt
similarity index 100%
rename from tests/tests/passwd/22_passwd_usage/config.txt
rename to tests/passwd/22_passwd_usage/config.txt
diff --git a/tests/tests/newusers/59_no_gshadow_file/config/etc/group b/tests/passwd/22_passwd_usage/config/etc/group
similarity index 100%
rename from tests/tests/newusers/59_no_gshadow_file/config/etc/group
rename to tests/passwd/22_passwd_usage/config/etc/group
diff --git a/tests/tests/newusers/61_update_no_shell/config/etc/gshadow b/tests/passwd/22_passwd_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/61_update_no_shell/config/etc/gshadow
rename to tests/passwd/22_passwd_usage/config/etc/gshadow
diff --git a/tests/tests/newusers/59_no_gshadow_file/config/etc/passwd b/tests/passwd/22_passwd_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/newusers/59_no_gshadow_file/config/etc/passwd
rename to tests/passwd/22_passwd_usage/config/etc/passwd
diff --git a/tests/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/shadow b/tests/passwd/22_passwd_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/07_passwd_-l_root_lock_account_no_shadow_entry/config/etc/shadow
rename to tests/passwd/22_passwd_usage/config/etc/shadow
diff --git a/tests/tests/passwd/22_passwd_usage/data/usage.out b/tests/passwd/22_passwd_usage/data/usage.out
similarity index 100%
rename from tests/tests/passwd/22_passwd_usage/data/usage.out
rename to tests/passwd/22_passwd_usage/data/usage.out
diff --git a/tests/tests/passwd/22_passwd_usage/passwd.test b/tests/passwd/22_passwd_usage/passwd.test
similarity index 100%
rename from tests/tests/passwd/22_passwd_usage/passwd.test
rename to tests/passwd/22_passwd_usage/passwd.test
diff --git a/tests/tests/run_all b/tests/run_all
similarity index 99%
rename from tests/tests/run_all
rename to tests/run_all
index ba6993aa..584e1bd3 100755
--- a/tests/tests/run_all
+++ b/tests/run_all
@@ -233,17 +233,6 @@ run_test ./convtools/31_pwconv_usage/pwconv.test
 run_test ./convtools/32_pwconv_usage_extra_arg/pwconv.test
 run_test ./convtools/33_grpunconv_usage/grpunconv.test
 run_test ./convtools/34_grpunconv_usage_extra_arg/grpunconv.test
-run_test ./cptools/02_cppw_usage/cppw.test
-run_test ./cptools/03_cppw_usage_invalid_option/cppw.test
-run_test ./cptools/04_cppw_no_file_argument/cppw.test
-run_test ./cptools/05_cppw_2_files/cppw.test
-run_test ./cptools/06_cppw_no_file/cppw.test
-run_test ./cptools/07_cppw_locked_passwd/cppw.test
-run_test ./cptools/08_cppw-p/cppw.test
-run_test ./cptools/09_cppw-g/cppw.test
-run_test ./cptools/10_cppw-g-s/cppw.test
-run_test ./cptools/11_cppw-p-s/cppw.test
-run_test ./cptools/12_cppw-s_no_shadow_file/cppw.test
 run_test ./debian/01/run
 run_test ./grouptools/chgpasswd/01_chgpasswd_invalid_group/chgpasswd.test
 run_test ./grouptools/chgpasswd/02_chgpasswd_multiple_groups/chgpasswd.test
@@ -845,10 +834,6 @@ run_test ./usertools/usermod/49_usermod_change_gid+move_homedir_other_device/use
 run_test ./usertools/usermod/50_usermod_change_uid+move_homedir/usermod.test
 run_test ./usertools/usermod/51_usermod_change_gid+move_homedir/usermod.test
 run_test ./usertools/usermod/52_usermod_move_homedir_symlink/usermod.test
-run_test ./cptools/01/run1
-run_test ./cptools/01/run2
-run_test ./cptools/01/run3
-run_test ./cptools/01/run4
 run_test ./cktools/01/run1
 run_test ./cktools/01/run2
 run_test ./cktools/02_pwck_sort/pwck.test
@@ -1060,9 +1045,6 @@ if [ "$USE_PAM" = "yes" ]; then
 fi
 run_test ./failures/chsh/01_chsh_open_passwd_failure/chsh.test
 run_test ./failures/chsh/02_chsh_rename_passwd_failure/chsh.test
-run_test ./failures/cppw/01_cppw_open_passwd_in_failure/cppw.test
-run_test ./failures/cppw/02_cppw_open_passwd_backup_failure/cppw.test
-run_test ./failures/cppw/03_cppw_rename_passwd_failure/cppw.test
 run_test ./failures/gpasswd/01_gpasswd_group_open_failure/gpasswd.test
 run_test ./failures/gpasswd/02_gpasswd_gshadow_open_failure/gpasswd.test
 run_test ./failures/gpasswd/03_gpasswd-a_group_open_failure/gpasswd.test
diff --git a/tests/tests/run_all.coverage b/tests/run_all.coverage
similarity index 99%
rename from tests/tests/run_all.coverage
rename to tests/run_all.coverage
index d865c0eb..94fe7fa4 100755
--- a/tests/tests/run_all.coverage
+++ b/tests/run_all.coverage
@@ -249,17 +249,6 @@ run_test ./convtools/31_pwconv_usage/pwconv.test
 run_test ./convtools/32_pwconv_usage_extra_arg/pwconv.test
 run_test ./convtools/33_grpunconv_usage/grpunconv.test
 run_test ./convtools/34_grpunconv_usage_extra_arg/grpunconv.test
-run_test ./cptools/02_cppw_usage/cppw.test
-run_test ./cptools/03_cppw_usage_invalid_option/cppw.test
-run_test ./cptools/04_cppw_no_file_argument/cppw.test
-run_test ./cptools/05_cppw_2_files/cppw.test
-run_test ./cptools/06_cppw_no_file/cppw.test
-run_test ./cptools/07_cppw_locked_passwd/cppw.test
-run_test ./cptools/08_cppw-p/cppw.test
-run_test ./cptools/09_cppw-g/cppw.test
-run_test ./cptools/10_cppw-g-s/cppw.test
-run_test ./cptools/11_cppw-p-s/cppw.test
-run_test ./cptools/12_cppw-s_no_shadow_file/cppw.test
 run_test ./debian/01/run
 run_test ./grouptools/chgpasswd/01_chgpasswd_invalid_group/chgpasswd.test
 run_test ./grouptools/chgpasswd/02_chgpasswd_multiple_groups/chgpasswd.test
@@ -861,10 +850,6 @@ run_test ./usertools/usermod/49_usermod_change_gid+move_homedir_other_device/use
 run_test ./usertools/usermod/50_usermod_change_uid+move_homedir/usermod.test
 run_test ./usertools/usermod/51_usermod_change_gid+move_homedir/usermod.test
 run_test ./usertools/usermod/52_usermod_move_homedir_symlink/usermod.test
-run_test ./cptools/01/run1
-run_test ./cptools/01/run2
-run_test ./cptools/01/run3
-run_test ./cptools/01/run4
 run_test ./cktools/01/run1
 run_test ./cktools/01/run2
 run_test ./cktools/02_pwck_sort/pwck.test
@@ -1076,9 +1061,6 @@ if [ "$USE_PAM" = "yes" ]; then
 fi
 run_test ./failures/chsh/01_chsh_open_passwd_failure/chsh.test
 run_test ./failures/chsh/02_chsh_rename_passwd_failure/chsh.test
-run_test ./failures/cppw/01_cppw_open_passwd_in_failure/cppw.test
-run_test ./failures/cppw/02_cppw_open_passwd_backup_failure/cppw.test
-run_test ./failures/cppw/03_cppw_rename_passwd_failure/cppw.test
 run_test ./failures/gpasswd/01_gpasswd_group_open_failure/gpasswd.test
 run_test ./failures/gpasswd/02_gpasswd_gshadow_open_failure/gpasswd.test
 run_test ./failures/gpasswd/03_gpasswd-a_group_open_failure/gpasswd.test
diff --git a/tests/tests/run_some b/tests/run_some
similarity index 92%
rename from tests/tests/run_some
rename to tests/run_some
index 91f5626b..c58f59b0 100755
--- a/tests/tests/run_some
+++ b/tests/run_some
@@ -7,6 +7,22 @@ unset LANG
 unset LANGUAGE
 . common/config.sh
 
+# When we unshare -Ur, we must be able to descend the build path.
+# But $HOME might not be world x.  Fix that.
+fixup_home_perms() {
+       p="${build_path}"
+       d=""
+       echo "$p" | tr '/' '\n' | while read f; do
+               if [ -z "$f" ]; then
+                       continue
+               fi
+               d="$d/$f"
+               chmod ugo+x "$d"
+       done
+}
+
+fixup_home_perms
+
 USE_PAM="yes"
 FAILURE_TESTS="yes"
 
diff --git a/tests/tests/split_groups/01_useradd_split_group/config.txt b/tests/split_groups/01_useradd_split_group/config.txt
similarity index 100%
rename from tests/tests/split_groups/01_useradd_split_group/config.txt
rename to tests/split_groups/01_useradd_split_group/config.txt
diff --git a/tests/tests/split_groups/01_useradd_split_group/config/etc/default/useradd b/tests/split_groups/01_useradd_split_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/split_groups/01_useradd_split_group/config/etc/default/useradd
rename to tests/split_groups/01_useradd_split_group/config/etc/default/useradd
diff --git a/tests/tests/split_groups/01_useradd_split_group/config/etc/group b/tests/split_groups/01_useradd_split_group/config/etc/group
similarity index 100%
rename from tests/tests/split_groups/01_useradd_split_group/config/etc/group
rename to tests/split_groups/01_useradd_split_group/config/etc/group
diff --git a/tests/tests/split_groups/01_useradd_split_group/config/etc/gshadow b/tests/split_groups/01_useradd_split_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/split_groups/01_useradd_split_group/config/etc/gshadow
rename to tests/split_groups/01_useradd_split_group/config/etc/gshadow
diff --git a/tests/tests/split_groups/01_useradd_split_group/config/etc/login.defs b/tests/split_groups/01_useradd_split_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/split_groups/01_useradd_split_group/config/etc/login.defs
rename to tests/split_groups/01_useradd_split_group/config/etc/login.defs
diff --git a/tests/tests/split_groups/01_useradd_split_group/config/etc/passwd b/tests/split_groups/01_useradd_split_group/config/etc/passwd
similarity index 100%
rename from tests/tests/split_groups/01_useradd_split_group/config/etc/passwd
rename to tests/split_groups/01_useradd_split_group/config/etc/passwd
diff --git a/tests/tests/split_groups/01_useradd_split_group/config/etc/shadow b/tests/split_groups/01_useradd_split_group/config/etc/shadow
similarity index 100%
rename from tests/tests/split_groups/01_useradd_split_group/config/etc/shadow
rename to tests/split_groups/01_useradd_split_group/config/etc/shadow
diff --git a/tests/tests/split_groups/01_useradd_split_group/data/group b/tests/split_groups/01_useradd_split_group/data/group
similarity index 100%
rename from tests/tests/split_groups/01_useradd_split_group/data/group
rename to tests/split_groups/01_useradd_split_group/data/group
diff --git a/tests/tests/split_groups/01_useradd_split_group/data/gshadow b/tests/split_groups/01_useradd_split_group/data/gshadow
similarity index 100%
rename from tests/tests/split_groups/01_useradd_split_group/data/gshadow
rename to tests/split_groups/01_useradd_split_group/data/gshadow
diff --git a/tests/tests/split_groups/01_useradd_split_group/data/passwd b/tests/split_groups/01_useradd_split_group/data/passwd
similarity index 100%
rename from tests/tests/split_groups/01_useradd_split_group/data/passwd
rename to tests/split_groups/01_useradd_split_group/data/passwd
diff --git a/tests/tests/split_groups/01_useradd_split_group/data/shadow b/tests/split_groups/01_useradd_split_group/data/shadow
similarity index 100%
rename from tests/tests/split_groups/01_useradd_split_group/data/shadow
rename to tests/split_groups/01_useradd_split_group/data/shadow
diff --git a/tests/tests/split_groups/01_useradd_split_group/useradd.test b/tests/split_groups/01_useradd_split_group/useradd.test
similarity index 100%
rename from tests/tests/split_groups/01_useradd_split_group/useradd.test
rename to tests/split_groups/01_useradd_split_group/useradd.test
diff --git a/tests/tests/split_groups/02_useradd_no_split_group/config.txt b/tests/split_groups/02_useradd_no_split_group/config.txt
similarity index 100%
rename from tests/tests/split_groups/02_useradd_no_split_group/config.txt
rename to tests/split_groups/02_useradd_no_split_group/config.txt
diff --git a/tests/tests/split_groups/02_useradd_no_split_group/config/etc/default/useradd b/tests/split_groups/02_useradd_no_split_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/split_groups/02_useradd_no_split_group/config/etc/default/useradd
rename to tests/split_groups/02_useradd_no_split_group/config/etc/default/useradd
diff --git a/tests/tests/split_groups/02_useradd_no_split_group/config/etc/group b/tests/split_groups/02_useradd_no_split_group/config/etc/group
similarity index 100%
rename from tests/tests/split_groups/02_useradd_no_split_group/config/etc/group
rename to tests/split_groups/02_useradd_no_split_group/config/etc/group
diff --git a/tests/tests/split_groups/02_useradd_no_split_group/config/etc/gshadow b/tests/split_groups/02_useradd_no_split_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/split_groups/02_useradd_no_split_group/config/etc/gshadow
rename to tests/split_groups/02_useradd_no_split_group/config/etc/gshadow
diff --git a/tests/tests/split_groups/02_useradd_no_split_group/config/etc/login.defs b/tests/split_groups/02_useradd_no_split_group/config/etc/login.defs
similarity index 100%
rename from tests/tests/split_groups/02_useradd_no_split_group/config/etc/login.defs
rename to tests/split_groups/02_useradd_no_split_group/config/etc/login.defs
diff --git a/tests/tests/split_groups/02_useradd_no_split_group/config/etc/passwd b/tests/split_groups/02_useradd_no_split_group/config/etc/passwd
similarity index 100%
rename from tests/tests/split_groups/02_useradd_no_split_group/config/etc/passwd
rename to tests/split_groups/02_useradd_no_split_group/config/etc/passwd
diff --git a/tests/tests/split_groups/02_useradd_no_split_group/config/etc/shadow b/tests/split_groups/02_useradd_no_split_group/config/etc/shadow
similarity index 100%
rename from tests/tests/split_groups/02_useradd_no_split_group/config/etc/shadow
rename to tests/split_groups/02_useradd_no_split_group/config/etc/shadow
diff --git a/tests/tests/split_groups/02_useradd_no_split_group/data/group b/tests/split_groups/02_useradd_no_split_group/data/group
similarity index 100%
rename from tests/tests/split_groups/02_useradd_no_split_group/data/group
rename to tests/split_groups/02_useradd_no_split_group/data/group
diff --git a/tests/tests/split_groups/02_useradd_no_split_group/data/gshadow b/tests/split_groups/02_useradd_no_split_group/data/gshadow
similarity index 100%
rename from tests/tests/split_groups/02_useradd_no_split_group/data/gshadow
rename to tests/split_groups/02_useradd_no_split_group/data/gshadow
diff --git a/tests/tests/split_groups/02_useradd_no_split_group/data/passwd b/tests/split_groups/02_useradd_no_split_group/data/passwd
similarity index 100%
rename from tests/tests/split_groups/02_useradd_no_split_group/data/passwd
rename to tests/split_groups/02_useradd_no_split_group/data/passwd
diff --git a/tests/tests/split_groups/02_useradd_no_split_group/data/shadow b/tests/split_groups/02_useradd_no_split_group/data/shadow
similarity index 100%
rename from tests/tests/split_groups/02_useradd_no_split_group/data/shadow
rename to tests/split_groups/02_useradd_no_split_group/data/shadow
diff --git a/tests/tests/split_groups/02_useradd_no_split_group/useradd.test b/tests/split_groups/02_useradd_no_split_group/useradd.test
similarity index 100%
rename from tests/tests/split_groups/02_useradd_no_split_group/useradd.test
rename to tests/split_groups/02_useradd_no_split_group/useradd.test
diff --git a/tests/tests/split_groups/03_useradd_split_group_already_split/config.txt b/tests/split_groups/03_useradd_split_group_already_split/config.txt
similarity index 100%
rename from tests/tests/split_groups/03_useradd_split_group_already_split/config.txt
rename to tests/split_groups/03_useradd_split_group_already_split/config.txt
diff --git a/tests/tests/split_groups/03_useradd_split_group_already_split/config/etc/default/useradd b/tests/split_groups/03_useradd_split_group_already_split/config/etc/default/useradd
similarity index 100%
rename from tests/tests/split_groups/03_useradd_split_group_already_split/config/etc/default/useradd
rename to tests/split_groups/03_useradd_split_group_already_split/config/etc/default/useradd
diff --git a/tests/tests/split_groups/03_useradd_split_group_already_split/config/etc/group b/tests/split_groups/03_useradd_split_group_already_split/config/etc/group
similarity index 100%
rename from tests/tests/split_groups/03_useradd_split_group_already_split/config/etc/group
rename to tests/split_groups/03_useradd_split_group_already_split/config/etc/group
diff --git a/tests/tests/split_groups/03_useradd_split_group_already_split/config/etc/gshadow b/tests/split_groups/03_useradd_split_group_already_split/config/etc/gshadow
similarity index 100%
rename from tests/tests/split_groups/03_useradd_split_group_already_split/config/etc/gshadow
rename to tests/split_groups/03_useradd_split_group_already_split/config/etc/gshadow
diff --git a/tests/tests/split_groups/03_useradd_split_group_already_split/config/etc/login.defs b/tests/split_groups/03_useradd_split_group_already_split/config/etc/login.defs
similarity index 100%
rename from tests/tests/split_groups/03_useradd_split_group_already_split/config/etc/login.defs
rename to tests/split_groups/03_useradd_split_group_already_split/config/etc/login.defs
diff --git a/tests/tests/split_groups/03_useradd_split_group_already_split/config/etc/passwd b/tests/split_groups/03_useradd_split_group_already_split/config/etc/passwd
similarity index 100%
rename from tests/tests/split_groups/03_useradd_split_group_already_split/config/etc/passwd
rename to tests/split_groups/03_useradd_split_group_already_split/config/etc/passwd
diff --git a/tests/tests/split_groups/03_useradd_split_group_already_split/config/etc/shadow b/tests/split_groups/03_useradd_split_group_already_split/config/etc/shadow
similarity index 100%
rename from tests/tests/split_groups/03_useradd_split_group_already_split/config/etc/shadow
rename to tests/split_groups/03_useradd_split_group_already_split/config/etc/shadow
diff --git a/tests/tests/split_groups/03_useradd_split_group_already_split/data/group b/tests/split_groups/03_useradd_split_group_already_split/data/group
similarity index 100%
rename from tests/tests/split_groups/03_useradd_split_group_already_split/data/group
rename to tests/split_groups/03_useradd_split_group_already_split/data/group
diff --git a/tests/tests/split_groups/03_useradd_split_group_already_split/data/gshadow b/tests/split_groups/03_useradd_split_group_already_split/data/gshadow
similarity index 100%
rename from tests/tests/split_groups/03_useradd_split_group_already_split/data/gshadow
rename to tests/split_groups/03_useradd_split_group_already_split/data/gshadow
diff --git a/tests/tests/split_groups/03_useradd_split_group_already_split/data/passwd b/tests/split_groups/03_useradd_split_group_already_split/data/passwd
similarity index 100%
rename from tests/tests/split_groups/03_useradd_split_group_already_split/data/passwd
rename to tests/split_groups/03_useradd_split_group_already_split/data/passwd
diff --git a/tests/tests/split_groups/03_useradd_split_group_already_split/data/shadow b/tests/split_groups/03_useradd_split_group_already_split/data/shadow
similarity index 100%
rename from tests/tests/split_groups/03_useradd_split_group_already_split/data/shadow
rename to tests/split_groups/03_useradd_split_group_already_split/data/shadow
diff --git a/tests/tests/split_groups/03_useradd_split_group_already_split/useradd.test b/tests/split_groups/03_useradd_split_group_already_split/useradd.test
similarity index 100%
rename from tests/tests/split_groups/03_useradd_split_group_already_split/useradd.test
rename to tests/split_groups/03_useradd_split_group_already_split/useradd.test
diff --git a/tests/tests/split_groups/04_useradd_split_group_already_full/config.txt b/tests/split_groups/04_useradd_split_group_already_full/config.txt
similarity index 100%
rename from tests/tests/split_groups/04_useradd_split_group_already_full/config.txt
rename to tests/split_groups/04_useradd_split_group_already_full/config.txt
diff --git a/tests/tests/split_groups/04_useradd_split_group_already_full/config/etc/default/useradd b/tests/split_groups/04_useradd_split_group_already_full/config/etc/default/useradd
similarity index 100%
rename from tests/tests/split_groups/04_useradd_split_group_already_full/config/etc/default/useradd
rename to tests/split_groups/04_useradd_split_group_already_full/config/etc/default/useradd
diff --git a/tests/tests/split_groups/04_useradd_split_group_already_full/config/etc/group b/tests/split_groups/04_useradd_split_group_already_full/config/etc/group
similarity index 100%
rename from tests/tests/split_groups/04_useradd_split_group_already_full/config/etc/group
rename to tests/split_groups/04_useradd_split_group_already_full/config/etc/group
diff --git a/tests/tests/split_groups/04_useradd_split_group_already_full/config/etc/gshadow b/tests/split_groups/04_useradd_split_group_already_full/config/etc/gshadow
similarity index 100%
rename from tests/tests/split_groups/04_useradd_split_group_already_full/config/etc/gshadow
rename to tests/split_groups/04_useradd_split_group_already_full/config/etc/gshadow
diff --git a/tests/tests/split_groups/04_useradd_split_group_already_full/config/etc/login.defs b/tests/split_groups/04_useradd_split_group_already_full/config/etc/login.defs
similarity index 100%
rename from tests/tests/split_groups/04_useradd_split_group_already_full/config/etc/login.defs
rename to tests/split_groups/04_useradd_split_group_already_full/config/etc/login.defs
diff --git a/tests/tests/split_groups/04_useradd_split_group_already_full/config/etc/passwd b/tests/split_groups/04_useradd_split_group_already_full/config/etc/passwd
similarity index 100%
rename from tests/tests/split_groups/04_useradd_split_group_already_full/config/etc/passwd
rename to tests/split_groups/04_useradd_split_group_already_full/config/etc/passwd
diff --git a/tests/tests/split_groups/04_useradd_split_group_already_full/config/etc/shadow b/tests/split_groups/04_useradd_split_group_already_full/config/etc/shadow
similarity index 100%
rename from tests/tests/split_groups/04_useradd_split_group_already_full/config/etc/shadow
rename to tests/split_groups/04_useradd_split_group_already_full/config/etc/shadow
diff --git a/tests/tests/split_groups/04_useradd_split_group_already_full/data/group b/tests/split_groups/04_useradd_split_group_already_full/data/group
similarity index 100%
rename from tests/tests/split_groups/04_useradd_split_group_already_full/data/group
rename to tests/split_groups/04_useradd_split_group_already_full/data/group
diff --git a/tests/tests/split_groups/04_useradd_split_group_already_full/data/gshadow b/tests/split_groups/04_useradd_split_group_already_full/data/gshadow
similarity index 100%
rename from tests/tests/split_groups/04_useradd_split_group_already_full/data/gshadow
rename to tests/split_groups/04_useradd_split_group_already_full/data/gshadow
diff --git a/tests/tests/split_groups/04_useradd_split_group_already_full/data/passwd b/tests/split_groups/04_useradd_split_group_already_full/data/passwd
similarity index 100%
rename from tests/tests/split_groups/04_useradd_split_group_already_full/data/passwd
rename to tests/split_groups/04_useradd_split_group_already_full/data/passwd
diff --git a/tests/tests/split_groups/04_useradd_split_group_already_full/data/shadow b/tests/split_groups/04_useradd_split_group_already_full/data/shadow
similarity index 100%
rename from tests/tests/split_groups/04_useradd_split_group_already_full/data/shadow
rename to tests/split_groups/04_useradd_split_group_already_full/data/shadow
diff --git a/tests/tests/split_groups/04_useradd_split_group_already_full/useradd.test b/tests/split_groups/04_useradd_split_group_already_full/useradd.test
similarity index 100%
rename from tests/tests/split_groups/04_useradd_split_group_already_full/useradd.test
rename to tests/split_groups/04_useradd_split_group_already_full/useradd.test
diff --git a/tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config.txt b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config.txt
similarity index 100%
rename from tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config.txt
rename to tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config.txt
diff --git a/tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/group b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/group
similarity index 100%
rename from tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/group
rename to tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/group
diff --git a/tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/gshadow b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/gshadow
similarity index 100%
rename from tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/gshadow
rename to tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/gshadow
diff --git a/tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/login.defs b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/login.defs
similarity index 100%
rename from tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/login.defs
rename to tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/login.defs
diff --git a/tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/passwd b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/passwd
similarity index 100%
rename from tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/passwd
rename to tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/passwd
diff --git a/tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/shadow b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/shadow
similarity index 100%
rename from tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/shadow
rename to tests/split_groups/05_useradd_split_group_already_split_passwd_differ/config/etc/shadow
diff --git a/tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/useradd.err b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/useradd.err
similarity index 100%
rename from tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/useradd.err
rename to tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/useradd.err
diff --git a/tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/useradd.test b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/useradd.test
similarity index 100%
rename from tests/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/useradd.test
rename to tests/split_groups/05_useradd_split_group_already_split_passwd_differ/useradd.test
diff --git a/tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config.txt b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config.txt
similarity index 100%
rename from tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config.txt
rename to tests/split_groups/06_useradd_split_group_already_split_GID_differ/config.txt
diff --git a/tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/group b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/group
similarity index 100%
rename from tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/group
rename to tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/group
diff --git a/tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/gshadow b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/gshadow
similarity index 100%
rename from tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/gshadow
rename to tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/gshadow
diff --git a/tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/login.defs b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/login.defs
similarity index 100%
rename from tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/login.defs
rename to tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/login.defs
diff --git a/tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/passwd b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/passwd
similarity index 100%
rename from tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/passwd
rename to tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/passwd
diff --git a/tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/shadow b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/shadow
similarity index 100%
rename from tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/shadow
rename to tests/split_groups/06_useradd_split_group_already_split_GID_differ/config/etc/shadow
diff --git a/tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/useradd.err b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/useradd.err
similarity index 100%
rename from tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/useradd.err
rename to tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/useradd.err
diff --git a/tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/useradd.test b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/useradd.test
similarity index 100%
rename from tests/tests/split_groups/06_useradd_split_group_already_split_GID_differ/useradd.test
rename to tests/split_groups/06_useradd_split_group_already_split_GID_differ/useradd.test
diff --git a/tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config.txt b/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config.txt
similarity index 100%
rename from tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config.txt
rename to tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config.txt
diff --git a/tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/default/useradd b/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/default/useradd
similarity index 100%
rename from tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/default/useradd
rename to tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/default/useradd
diff --git a/tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/group b/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/group
similarity index 100%
rename from tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/group
rename to tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/group
diff --git a/tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/gshadow b/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/gshadow
similarity index 100%
rename from tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/gshadow
rename to tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/gshadow
diff --git a/tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/login.defs b/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/login.defs
similarity index 100%
rename from tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/login.defs
rename to tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/login.defs
diff --git a/tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/passwd b/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/passwd
similarity index 100%
rename from tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/passwd
rename to tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/passwd
diff --git a/tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/shadow b/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/shadow
similarity index 100%
rename from tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/shadow
rename to tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/config/etc/shadow
diff --git a/tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/group b/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/group
similarity index 100%
rename from tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/group
rename to tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/group
diff --git a/tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/gshadow b/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/gshadow
similarity index 100%
rename from tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/gshadow
rename to tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/gshadow
diff --git a/tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/passwd b/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/passwd
similarity index 100%
rename from tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/passwd
rename to tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/passwd
diff --git a/tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/shadow b/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/shadow
similarity index 100%
rename from tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/shadow
rename to tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/data/shadow
diff --git a/tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/useradd.test b/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/useradd.test
similarity index 100%
rename from tests/tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/useradd.test
rename to tests/split_groups/07_useradd_split_group_already_split_user_in_both_lines/useradd.test
diff --git a/tests/tests/split_groups/08_useradd_no_split_group_already_split/config.txt b/tests/split_groups/08_useradd_no_split_group_already_split/config.txt
similarity index 100%
rename from tests/tests/split_groups/08_useradd_no_split_group_already_split/config.txt
rename to tests/split_groups/08_useradd_no_split_group_already_split/config.txt
diff --git a/tests/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/group b/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/group
similarity index 100%
rename from tests/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/group
rename to tests/split_groups/08_useradd_no_split_group_already_split/config/etc/group
diff --git a/tests/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/gshadow b/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/gshadow
similarity index 100%
rename from tests/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/gshadow
rename to tests/split_groups/08_useradd_no_split_group_already_split/config/etc/gshadow
diff --git a/tests/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/login.defs b/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/login.defs
similarity index 100%
rename from tests/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/login.defs
rename to tests/split_groups/08_useradd_no_split_group_already_split/config/etc/login.defs
diff --git a/tests/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/passwd b/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/passwd
similarity index 100%
rename from tests/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/passwd
rename to tests/split_groups/08_useradd_no_split_group_already_split/config/etc/passwd
diff --git a/tests/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/shadow b/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/shadow
similarity index 100%
rename from tests/tests/split_groups/08_useradd_no_split_group_already_split/config/etc/shadow
rename to tests/split_groups/08_useradd_no_split_group_already_split/config/etc/shadow
diff --git a/tests/tests/split_groups/08_useradd_no_split_group_already_split/data/useradd.err b/tests/split_groups/08_useradd_no_split_group_already_split/data/useradd.err
similarity index 100%
rename from tests/tests/split_groups/08_useradd_no_split_group_already_split/data/useradd.err
rename to tests/split_groups/08_useradd_no_split_group_already_split/data/useradd.err
diff --git a/tests/tests/split_groups/08_useradd_no_split_group_already_split/useradd.test b/tests/split_groups/08_useradd_no_split_group_already_split/useradd.test
similarity index 100%
rename from tests/tests/split_groups/08_useradd_no_split_group_already_split/useradd.test
rename to tests/split_groups/08_useradd_no_split_group_already_split/useradd.test
diff --git a/tests/tests/split_groups/09_groupdel_split_group_already_split/config.txt b/tests/split_groups/09_groupdel_split_group_already_split/config.txt
similarity index 100%
rename from tests/tests/split_groups/09_groupdel_split_group_already_split/config.txt
rename to tests/split_groups/09_groupdel_split_group_already_split/config.txt
diff --git a/tests/tests/split_groups/09_groupdel_split_group_already_split/config/etc/group b/tests/split_groups/09_groupdel_split_group_already_split/config/etc/group
similarity index 100%
rename from tests/tests/split_groups/09_groupdel_split_group_already_split/config/etc/group
rename to tests/split_groups/09_groupdel_split_group_already_split/config/etc/group
diff --git a/tests/tests/split_groups/09_groupdel_split_group_already_split/config/etc/gshadow b/tests/split_groups/09_groupdel_split_group_already_split/config/etc/gshadow
similarity index 100%
rename from tests/tests/split_groups/09_groupdel_split_group_already_split/config/etc/gshadow
rename to tests/split_groups/09_groupdel_split_group_already_split/config/etc/gshadow
diff --git a/tests/tests/split_groups/09_groupdel_split_group_already_split/config/etc/login.defs b/tests/split_groups/09_groupdel_split_group_already_split/config/etc/login.defs
similarity index 100%
rename from tests/tests/split_groups/09_groupdel_split_group_already_split/config/etc/login.defs
rename to tests/split_groups/09_groupdel_split_group_already_split/config/etc/login.defs
diff --git a/tests/tests/split_groups/09_groupdel_split_group_already_split/config/etc/passwd b/tests/split_groups/09_groupdel_split_group_already_split/config/etc/passwd
similarity index 100%
rename from tests/tests/split_groups/09_groupdel_split_group_already_split/config/etc/passwd
rename to tests/split_groups/09_groupdel_split_group_already_split/config/etc/passwd
diff --git a/tests/tests/split_groups/09_groupdel_split_group_already_split/config/etc/shadow b/tests/split_groups/09_groupdel_split_group_already_split/config/etc/shadow
similarity index 100%
rename from tests/tests/split_groups/09_groupdel_split_group_already_split/config/etc/shadow
rename to tests/split_groups/09_groupdel_split_group_already_split/config/etc/shadow
diff --git a/tests/tests/split_groups/09_groupdel_split_group_already_split/data/group b/tests/split_groups/09_groupdel_split_group_already_split/data/group
similarity index 100%
rename from tests/tests/split_groups/09_groupdel_split_group_already_split/data/group
rename to tests/split_groups/09_groupdel_split_group_already_split/data/group
diff --git a/tests/tests/split_groups/09_groupdel_split_group_already_split/data/gshadow b/tests/split_groups/09_groupdel_split_group_already_split/data/gshadow
similarity index 100%
rename from tests/tests/split_groups/09_groupdel_split_group_already_split/data/gshadow
rename to tests/split_groups/09_groupdel_split_group_already_split/data/gshadow
diff --git a/tests/tests/split_groups/09_groupdel_split_group_already_split/groupdel.test b/tests/split_groups/09_groupdel_split_group_already_split/groupdel.test
similarity index 100%
rename from tests/tests/split_groups/09_groupdel_split_group_already_split/groupdel.test
rename to tests/split_groups/09_groupdel_split_group_already_split/groupdel.test
diff --git a/tests/tests/split_groups/10_groupdel_no_split_group_already_split/config.txt b/tests/split_groups/10_groupdel_no_split_group_already_split/config.txt
similarity index 100%
rename from tests/tests/split_groups/10_groupdel_no_split_group_already_split/config.txt
rename to tests/split_groups/10_groupdel_no_split_group_already_split/config.txt
diff --git a/tests/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/group b/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/group
similarity index 100%
rename from tests/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/group
rename to tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/group
diff --git a/tests/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/gshadow b/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/gshadow
similarity index 100%
rename from tests/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/gshadow
rename to tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/gshadow
diff --git a/tests/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/login.defs b/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/login.defs
similarity index 100%
rename from tests/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/login.defs
rename to tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/login.defs
diff --git a/tests/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/passwd b/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/passwd
similarity index 100%
rename from tests/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/passwd
rename to tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/passwd
diff --git a/tests/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/shadow b/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/shadow
similarity index 100%
rename from tests/tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/shadow
rename to tests/split_groups/10_groupdel_no_split_group_already_split/config/etc/shadow
diff --git a/tests/tests/split_groups/10_groupdel_no_split_group_already_split/data/groupdel.err b/tests/split_groups/10_groupdel_no_split_group_already_split/data/groupdel.err
similarity index 100%
rename from tests/tests/split_groups/10_groupdel_no_split_group_already_split/data/groupdel.err
rename to tests/split_groups/10_groupdel_no_split_group_already_split/data/groupdel.err
diff --git a/tests/tests/split_groups/10_groupdel_no_split_group_already_split/groupdel.test b/tests/split_groups/10_groupdel_no_split_group_already_split/groupdel.test
similarity index 100%
rename from tests/tests/split_groups/10_groupdel_no_split_group_already_split/groupdel.test
rename to tests/split_groups/10_groupdel_no_split_group_already_split/groupdel.test
diff --git a/tests/tests/su/01/config.txt b/tests/su/01/config.txt
similarity index 100%
rename from tests/tests/su/01/config.txt
rename to tests/su/01/config.txt
diff --git a/tests/tests/newusers/58_invalid_input_file/config/etc/group b/tests/su/01/config/etc/group
similarity index 100%
rename from tests/tests/newusers/58_invalid_input_file/config/etc/group
rename to tests/su/01/config/etc/group
diff --git a/tests/tests/newusers/58_invalid_input_file/config/etc/gshadow b/tests/su/01/config/etc/gshadow
similarity index 100%
rename from tests/tests/newusers/58_invalid_input_file/config/etc/gshadow
rename to tests/su/01/config/etc/gshadow
diff --git a/tests/tests/su/01/config/etc/passwd b/tests/su/01/config/etc/passwd
similarity index 100%
rename from tests/tests/su/01/config/etc/passwd
rename to tests/su/01/config/etc/passwd
diff --git a/tests/tests/su/01/config/etc/shadow b/tests/su/01/config/etc/shadow
similarity index 100%
rename from tests/tests/su/01/config/etc/shadow
rename to tests/su/01/config/etc/shadow
diff --git a/tests/tests/su/01/run_su.exp b/tests/su/01/run_su.exp
similarity index 100%
rename from tests/tests/su/01/run_su.exp
rename to tests/su/01/run_su.exp
diff --git a/tests/tests/su/01/su_root.test b/tests/su/01/su_root.test
similarity index 100%
rename from tests/tests/su/01/su_root.test
rename to tests/su/01/su_root.test
diff --git a/tests/tests/su/01/su_user.test b/tests/su/01/su_user.test
similarity index 100%
rename from tests/tests/su/01/su_user.test
rename to tests/su/01/su_user.test
diff --git a/tests/tests/su/02/config.txt b/tests/su/02/config.txt
similarity index 100%
rename from tests/tests/su/02/config.txt
rename to tests/su/02/config.txt
diff --git a/tests/tests/su/01/config/etc/group b/tests/su/02/config/etc/group
similarity index 100%
rename from tests/tests/su/01/config/etc/group
rename to tests/su/02/config/etc/group
diff --git a/tests/tests/su/01/config/etc/gshadow b/tests/su/02/config/etc/gshadow
similarity index 100%
rename from tests/tests/su/01/config/etc/gshadow
rename to tests/su/02/config/etc/gshadow
diff --git a/tests/tests/su/02/config/etc/passwd b/tests/su/02/config/etc/passwd
similarity index 100%
rename from tests/tests/su/02/config/etc/passwd
rename to tests/su/02/config/etc/passwd
diff --git a/tests/tests/su/02/config/etc/profile b/tests/su/02/config/etc/profile
similarity index 100%
rename from tests/tests/su/02/config/etc/profile
rename to tests/su/02/config/etc/profile
diff --git a/tests/tests/su/02/config/etc/shadow b/tests/su/02/config/etc/shadow
similarity index 100%
rename from tests/tests/su/02/config/etc/shadow
rename to tests/su/02/config/etc/shadow
diff --git a/tests/tests/su/02/env_FOO-options_ b/tests/su/02/env_FOO-options_
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_
rename to tests/su/02/env_FOO-options_
diff --git a/tests/tests/su/02/env_FOO-options_- b/tests/su/02/env_FOO-options_-
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-
rename to tests/su/02/env_FOO-options_-
diff --git a/tests/tests/su/02/env_FOO-options_--login b/tests/su/02/env_FOO-options_--login
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_--login
rename to tests/su/02/env_FOO-options_--login
diff --git a/tests/tests/su/02/env_FOO-options_--login.exp b/tests/su/02/env_FOO-options_--login.exp
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_--login.exp
rename to tests/su/02/env_FOO-options_--login.exp
diff --git a/tests/tests/su/02/env_FOO-options_--login_bash b/tests/su/02/env_FOO-options_--login_bash
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_--login_bash
rename to tests/su/02/env_FOO-options_--login_bash
diff --git a/tests/tests/su/02/env_FOO-options_--preserve-environment b/tests/su/02/env_FOO-options_--preserve-environment
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_--preserve-environment
rename to tests/su/02/env_FOO-options_--preserve-environment
diff --git a/tests/tests/su/02/env_FOO-options_--preserve-environment.exp b/tests/su/02/env_FOO-options_--preserve-environment.exp
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_--preserve-environment.exp
rename to tests/su/02/env_FOO-options_--preserve-environment.exp
diff --git a/tests/tests/su/02/env_FOO-options_--preserve-environment_bash b/tests/su/02/env_FOO-options_--preserve-environment_bash
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_--preserve-environment_bash
rename to tests/su/02/env_FOO-options_--preserve-environment_bash
diff --git a/tests/tests/su/02/env_FOO-options_-.exp b/tests/su/02/env_FOO-options_-.exp
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-.exp
rename to tests/su/02/env_FOO-options_-.exp
diff --git a/tests/tests/su/02/env_FOO-options_-_bash b/tests/su/02/env_FOO-options_-_bash
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-_bash
rename to tests/su/02/env_FOO-options_-_bash
diff --git a/tests/tests/su/02/env_FOO-options_-l b/tests/su/02/env_FOO-options_-l
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-l
rename to tests/su/02/env_FOO-options_-l
diff --git a/tests/tests/su/02/env_FOO-options_-l-m b/tests/su/02/env_FOO-options_-l-m
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-l-m
rename to tests/su/02/env_FOO-options_-l-m
diff --git a/tests/tests/su/02/env_FOO-options_-l-m.exp b/tests/su/02/env_FOO-options_-l-m.exp
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-l-m.exp
rename to tests/su/02/env_FOO-options_-l-m.exp
diff --git a/tests/tests/su/02/env_FOO-options_-l-m_bash b/tests/su/02/env_FOO-options_-l-m_bash
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-l-m_bash
rename to tests/su/02/env_FOO-options_-l-m_bash
diff --git a/tests/tests/su/02/env_FOO-options_-l.exp b/tests/su/02/env_FOO-options_-l.exp
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-l.exp
rename to tests/su/02/env_FOO-options_-l.exp
diff --git a/tests/tests/su/02/env_FOO-options_-l_bash b/tests/su/02/env_FOO-options_-l_bash
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-l_bash
rename to tests/su/02/env_FOO-options_-l_bash
diff --git a/tests/tests/su/02/env_FOO-options_-m b/tests/su/02/env_FOO-options_-m
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-m
rename to tests/su/02/env_FOO-options_-m
diff --git a/tests/tests/su/02/env_FOO-options_-m.exp b/tests/su/02/env_FOO-options_-m.exp
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-m.exp
rename to tests/su/02/env_FOO-options_-m.exp
diff --git a/tests/tests/su/02/env_FOO-options_-m_bash b/tests/su/02/env_FOO-options_-m_bash
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-m_bash
rename to tests/su/02/env_FOO-options_-m_bash
diff --git a/tests/tests/su/02/env_FOO-options_-p b/tests/su/02/env_FOO-options_-p
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-p
rename to tests/su/02/env_FOO-options_-p
diff --git a/tests/tests/su/02/env_FOO-options_-p- b/tests/su/02/env_FOO-options_-p-
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-p-
rename to tests/su/02/env_FOO-options_-p-
diff --git a/tests/tests/su/02/env_FOO-options_-p-.exp b/tests/su/02/env_FOO-options_-p-.exp
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-p-.exp
rename to tests/su/02/env_FOO-options_-p-.exp
diff --git a/tests/tests/su/02/env_FOO-options_-p-_bash b/tests/su/02/env_FOO-options_-p-_bash
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-p-_bash
rename to tests/su/02/env_FOO-options_-p-_bash
diff --git a/tests/tests/su/02/env_FOO-options_-p.exp b/tests/su/02/env_FOO-options_-p.exp
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-p.exp
rename to tests/su/02/env_FOO-options_-p.exp
diff --git a/tests/tests/su/02/env_FOO-options_-p_bash b/tests/su/02/env_FOO-options_-p_bash
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_-p_bash
rename to tests/su/02/env_FOO-options_-p_bash
diff --git a/tests/tests/su/02/env_FOO-options_.exp b/tests/su/02/env_FOO-options_.exp
similarity index 100%
rename from tests/tests/su/02/env_FOO-options_.exp
rename to tests/su/02/env_FOO-options_.exp
diff --git a/tests/tests/su/02/env_FOO-options__bash b/tests/su/02/env_FOO-options__bash
similarity index 100%
rename from tests/tests/su/02/env_FOO-options__bash
rename to tests/su/02/env_FOO-options__bash
diff --git a/tests/tests/su/02/env_special-options_ b/tests/su/02/env_special-options_
similarity index 100%
rename from tests/tests/su/02/env_special-options_
rename to tests/su/02/env_special-options_
diff --git a/tests/tests/su/02/env_special-options_-l b/tests/su/02/env_special-options_-l
similarity index 100%
rename from tests/tests/su/02/env_special-options_-l
rename to tests/su/02/env_special-options_-l
diff --git a/tests/tests/su/02/env_special-options_-l-p b/tests/su/02/env_special-options_-l-p
similarity index 100%
rename from tests/tests/su/02/env_special-options_-l-p
rename to tests/su/02/env_special-options_-l-p
diff --git a/tests/tests/su/02/env_special-options_-l-p.exp b/tests/su/02/env_special-options_-l-p.exp
similarity index 100%
rename from tests/tests/su/02/env_special-options_-l-p.exp
rename to tests/su/02/env_special-options_-l-p.exp
diff --git a/tests/tests/su/02/env_special-options_-l-p_bash b/tests/su/02/env_special-options_-l-p_bash
similarity index 100%
rename from tests/tests/su/02/env_special-options_-l-p_bash
rename to tests/su/02/env_special-options_-l-p_bash
diff --git a/tests/tests/su/02/env_special-options_-l.exp b/tests/su/02/env_special-options_-l.exp
similarity index 100%
rename from tests/tests/su/02/env_special-options_-l.exp
rename to tests/su/02/env_special-options_-l.exp
diff --git a/tests/tests/su/02/env_special-options_-l_bash b/tests/su/02/env_special-options_-l_bash
similarity index 100%
rename from tests/tests/su/02/env_special-options_-l_bash
rename to tests/su/02/env_special-options_-l_bash
diff --git a/tests/tests/su/02/env_special-options_-p b/tests/su/02/env_special-options_-p
similarity index 100%
rename from tests/tests/su/02/env_special-options_-p
rename to tests/su/02/env_special-options_-p
diff --git a/tests/tests/su/02/env_special-options_-p.exp b/tests/su/02/env_special-options_-p.exp
similarity index 100%
rename from tests/tests/su/02/env_special-options_-p.exp
rename to tests/su/02/env_special-options_-p.exp
diff --git a/tests/tests/su/02/env_special-options_-p_bash b/tests/su/02/env_special-options_-p_bash
similarity index 100%
rename from tests/tests/su/02/env_special-options_-p_bash
rename to tests/su/02/env_special-options_-p_bash
diff --git a/tests/tests/su/02/env_special-options_.exp b/tests/su/02/env_special-options_.exp
similarity index 100%
rename from tests/tests/su/02/env_special-options_.exp
rename to tests/su/02/env_special-options_.exp
diff --git a/tests/tests/su/02/env_special-options__bash b/tests/su/02/env_special-options__bash
similarity index 100%
rename from tests/tests/su/02/env_special-options__bash
rename to tests/su/02/env_special-options__bash
diff --git a/tests/tests/su/02/env_special_root-options_ b/tests/su/02/env_special_root-options_
similarity index 100%
rename from tests/tests/su/02/env_special_root-options_
rename to tests/su/02/env_special_root-options_
diff --git a/tests/tests/su/02/env_special_root-options_-l b/tests/su/02/env_special_root-options_-l
similarity index 100%
rename from tests/tests/su/02/env_special_root-options_-l
rename to tests/su/02/env_special_root-options_-l
diff --git a/tests/tests/su/02/env_special_root-options_-l-p b/tests/su/02/env_special_root-options_-l-p
similarity index 100%
rename from tests/tests/su/02/env_special_root-options_-l-p
rename to tests/su/02/env_special_root-options_-l-p
diff --git a/tests/tests/su/02/env_special_root-options_-l-p.exp b/tests/su/02/env_special_root-options_-l-p.exp
similarity index 100%
rename from tests/tests/su/02/env_special_root-options_-l-p.exp
rename to tests/su/02/env_special_root-options_-l-p.exp
diff --git a/tests/tests/su/02/env_special_root-options_-l-p_bash b/tests/su/02/env_special_root-options_-l-p_bash
similarity index 100%
rename from tests/tests/su/02/env_special_root-options_-l-p_bash
rename to tests/su/02/env_special_root-options_-l-p_bash
diff --git a/tests/tests/su/02/env_special_root-options_-l.exp b/tests/su/02/env_special_root-options_-l.exp
similarity index 100%
rename from tests/tests/su/02/env_special_root-options_-l.exp
rename to tests/su/02/env_special_root-options_-l.exp
diff --git a/tests/tests/su/02/env_special_root-options_-l_bash b/tests/su/02/env_special_root-options_-l_bash
similarity index 100%
rename from tests/tests/su/02/env_special_root-options_-l_bash
rename to tests/su/02/env_special_root-options_-l_bash
diff --git a/tests/tests/su/02/env_special_root-options_-p b/tests/su/02/env_special_root-options_-p
similarity index 100%
rename from tests/tests/su/02/env_special_root-options_-p
rename to tests/su/02/env_special_root-options_-p
diff --git a/tests/tests/su/02/env_special_root-options_-p.exp b/tests/su/02/env_special_root-options_-p.exp
similarity index 100%
rename from tests/tests/su/02/env_special_root-options_-p.exp
rename to tests/su/02/env_special_root-options_-p.exp
diff --git a/tests/tests/su/02/env_special_root-options_-p_bash b/tests/su/02/env_special_root-options_-p_bash
similarity index 100%
rename from tests/tests/su/02/env_special_root-options_-p_bash
rename to tests/su/02/env_special_root-options_-p_bash
diff --git a/tests/tests/su/02/env_special_root-options_.exp b/tests/su/02/env_special_root-options_.exp
similarity index 100%
rename from tests/tests/su/02/env_special_root-options_.exp
rename to tests/su/02/env_special_root-options_.exp
diff --git a/tests/tests/su/02/env_special_root-options__bash b/tests/su/02/env_special_root-options__bash
similarity index 100%
rename from tests/tests/su/02/env_special_root-options__bash
rename to tests/su/02/env_special_root-options__bash
diff --git a/tests/tests/su/02/run_env_test.sh b/tests/su/02/run_env_test.sh
similarity index 100%
rename from tests/tests/su/02/run_env_test.sh
rename to tests/su/02/run_env_test.sh
diff --git a/tests/tests/su/02/config/etc/group b/tests/su/03/config/etc/group
similarity index 100%
rename from tests/tests/su/02/config/etc/group
rename to tests/su/03/config/etc/group
diff --git a/tests/tests/su/02/config/etc/gshadow b/tests/su/03/config/etc/gshadow
similarity index 100%
rename from tests/tests/su/02/config/etc/gshadow
rename to tests/su/03/config/etc/gshadow
diff --git a/tests/tests/su/03/config/etc/passwd b/tests/su/03/config/etc/passwd
similarity index 100%
rename from tests/tests/su/03/config/etc/passwd
rename to tests/su/03/config/etc/passwd
diff --git a/tests/tests/su/03/config/etc/shadow b/tests/su/03/config/etc/shadow
similarity index 100%
rename from tests/tests/su/03/config/etc/shadow
rename to tests/su/03/config/etc/shadow
diff --git a/tests/tests/su/03/data/ls.out b/tests/su/03/data/ls.out
similarity index 100%
rename from tests/tests/su/03/data/ls.out
rename to tests/su/03/data/ls.out
diff --git a/tests/tests/su/03/su_run_command01.test b/tests/su/03/su_run_command01.test
similarity index 100%
rename from tests/tests/su/03/su_run_command01.test
rename to tests/su/03/su_run_command01.test
diff --git a/tests/tests/su/03/su_run_command02.test b/tests/su/03/su_run_command02.test
similarity index 100%
rename from tests/tests/su/03/su_run_command02.test
rename to tests/su/03/su_run_command02.test
diff --git a/tests/tests/su/03/su_run_command03.test b/tests/su/03/su_run_command03.test
similarity index 100%
rename from tests/tests/su/03/su_run_command03.test
rename to tests/su/03/su_run_command03.test
diff --git a/tests/tests/su/03/su_run_command04.test b/tests/su/03/su_run_command04.test
similarity index 100%
rename from tests/tests/su/03/su_run_command04.test
rename to tests/su/03/su_run_command04.test
diff --git a/tests/tests/su/03/su_run_command05.test b/tests/su/03/su_run_command05.test
similarity index 100%
rename from tests/tests/su/03/su_run_command05.test
rename to tests/su/03/su_run_command05.test
diff --git a/tests/tests/su/03/su_run_command06.test b/tests/su/03/su_run_command06.test
similarity index 100%
rename from tests/tests/su/03/su_run_command06.test
rename to tests/su/03/su_run_command06.test
diff --git a/tests/tests/su/03/su_run_command07.test b/tests/su/03/su_run_command07.test
similarity index 100%
rename from tests/tests/su/03/su_run_command07.test
rename to tests/su/03/su_run_command07.test
diff --git a/tests/tests/su/03/su_run_command08.test b/tests/su/03/su_run_command08.test
similarity index 100%
rename from tests/tests/su/03/su_run_command08.test
rename to tests/su/03/su_run_command08.test
diff --git a/tests/tests/su/03/su_run_command09.test b/tests/su/03/su_run_command09.test
similarity index 100%
rename from tests/tests/su/03/su_run_command09.test
rename to tests/su/03/su_run_command09.test
diff --git a/tests/tests/su/03/su_run_command10.test b/tests/su/03/su_run_command10.test
similarity index 100%
rename from tests/tests/su/03/su_run_command10.test
rename to tests/su/03/su_run_command10.test
diff --git a/tests/tests/su/03/su_run_command11.test b/tests/su/03/su_run_command11.test
similarity index 100%
rename from tests/tests/su/03/su_run_command11.test
rename to tests/su/03/su_run_command11.test
diff --git a/tests/tests/su/03/su_run_command12.test b/tests/su/03/su_run_command12.test
similarity index 100%
rename from tests/tests/su/03/su_run_command12.test
rename to tests/su/03/su_run_command12.test
diff --git a/tests/tests/su/03/su_run_command13.test b/tests/su/03/su_run_command13.test
similarity index 100%
rename from tests/tests/su/03/su_run_command13.test
rename to tests/su/03/su_run_command13.test
diff --git a/tests/tests/su/03/su_run_command14.test b/tests/su/03/su_run_command14.test
similarity index 100%
rename from tests/tests/su/03/su_run_command14.test
rename to tests/su/03/su_run_command14.test
diff --git a/tests/tests/su/03/su_run_command15.test b/tests/su/03/su_run_command15.test
similarity index 100%
rename from tests/tests/su/03/su_run_command15.test
rename to tests/su/03/su_run_command15.test
diff --git a/tests/tests/su/03/su_run_command16.test b/tests/su/03/su_run_command16.test
similarity index 100%
rename from tests/tests/su/03/su_run_command16.test
rename to tests/su/03/su_run_command16.test
diff --git a/tests/tests/su/03/su_run_command17.test b/tests/su/03/su_run_command17.test
similarity index 100%
rename from tests/tests/su/03/su_run_command17.test
rename to tests/su/03/su_run_command17.test
diff --git a/tests/tests/su/04/config.txt b/tests/su/04/config.txt
similarity index 100%
rename from tests/tests/su/04/config.txt
rename to tests/su/04/config.txt
diff --git a/tests/tests/su/03/config/etc/group b/tests/su/04/config/etc/group
similarity index 100%
rename from tests/tests/su/03/config/etc/group
rename to tests/su/04/config/etc/group
diff --git a/tests/tests/su/03/config/etc/gshadow b/tests/su/04/config/etc/gshadow
similarity index 100%
rename from tests/tests/su/03/config/etc/gshadow
rename to tests/su/04/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/login.defs b/tests/su/04/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config/etc/login.defs
rename to tests/su/04/config/etc/login.defs
diff --git a/tests/tests/su/04/config/etc/passwd b/tests/su/04/config/etc/passwd
similarity index 100%
rename from tests/tests/su/04/config/etc/passwd
rename to tests/su/04/config/etc/passwd
diff --git a/tests/tests/su/04/config/etc/shadow b/tests/su/04/config/etc/shadow
similarity index 100%
rename from tests/tests/su/04/config/etc/shadow
rename to tests/su/04/config/etc/shadow
diff --git a/tests/tests/su/04/config/var/log/auth.log b/tests/su/04/config/var/log/auth.log
similarity index 100%
rename from tests/tests/su/04/config/var/log/auth.log
rename to tests/su/04/config/var/log/auth.log
diff --git a/tests/tests/su/04/data/wrong_user.err b/tests/su/04/data/wrong_user.err
similarity index 100%
rename from tests/tests/su/04/data/wrong_user.err
rename to tests/su/04/data/wrong_user.err
diff --git a/tests/tests/su/04/run_su_failed.exp b/tests/su/04/run_su_failed.exp
similarity index 100%
rename from tests/tests/su/04/run_su_failed.exp
rename to tests/su/04/run_su_failed.exp
diff --git a/tests/tests/su/04/su_user_wrong_passwd.test b/tests/su/04/su_user_wrong_passwd.test
similarity index 100%
rename from tests/tests/su/04/su_user_wrong_passwd.test
rename to tests/su/04/su_user_wrong_passwd.test
diff --git a/tests/tests/su/04/su_user_wrong_passwd_syslog.test b/tests/su/04/su_user_wrong_passwd_syslog.test
similarity index 100%
rename from tests/tests/su/04/su_user_wrong_passwd_syslog.test
rename to tests/su/04/su_user_wrong_passwd_syslog.test
diff --git a/tests/tests/su/04/su_wrong_user.test b/tests/su/04/su_wrong_user.test
similarity index 100%
rename from tests/tests/su/04/su_wrong_user.test
rename to tests/su/04/su_wrong_user.test
diff --git a/tests/tests/su/05/config.txt b/tests/su/05/config.txt
similarity index 100%
rename from tests/tests/su/05/config.txt
rename to tests/su/05/config.txt
diff --git a/tests/tests/su/04/config/etc/group b/tests/su/05/config/etc/group
similarity index 100%
rename from tests/tests/su/04/config/etc/group
rename to tests/su/05/config/etc/group
diff --git a/tests/tests/su/04/config/etc/gshadow b/tests/su/05/config/etc/gshadow
similarity index 100%
rename from tests/tests/su/04/config/etc/gshadow
rename to tests/su/05/config/etc/gshadow
diff --git a/tests/tests/su/05/config/etc/login.defs b/tests/su/05/config/etc/login.defs
similarity index 100%
rename from tests/tests/su/05/config/etc/login.defs
rename to tests/su/05/config/etc/login.defs
diff --git a/tests/tests/su/05/config/etc/passwd b/tests/su/05/config/etc/passwd
similarity index 100%
rename from tests/tests/su/05/config/etc/passwd
rename to tests/su/05/config/etc/passwd
diff --git a/tests/tests/su/05/config/etc/shadow b/tests/su/05/config/etc/shadow
similarity index 100%
rename from tests/tests/su/05/config/etc/shadow
rename to tests/su/05/config/etc/shadow
diff --git a/tests/tests/su/05/config/var/log/auth.log b/tests/su/05/config/var/log/auth.log
similarity index 100%
rename from tests/tests/su/05/config/var/log/auth.log
rename to tests/su/05/config/var/log/auth.log
diff --git a/tests/tests/su/05/run_su_failed.exp b/tests/su/05/run_su_failed.exp
similarity index 100%
rename from tests/tests/su/05/run_su_failed.exp
rename to tests/su/05/run_su_failed.exp
diff --git a/tests/tests/su/05/su_user_wrong_passwd_syslog.test b/tests/su/05/su_user_wrong_passwd_syslog.test
similarity index 100%
rename from tests/tests/su/05/su_user_wrong_passwd_syslog.test
rename to tests/su/05/su_user_wrong_passwd_syslog.test
diff --git a/tests/tests/su/06/config.txt b/tests/su/06/config.txt
similarity index 100%
rename from tests/tests/su/06/config.txt
rename to tests/su/06/config.txt
diff --git a/tests/tests/su/05/config/etc/group b/tests/su/06/config/etc/group
similarity index 100%
rename from tests/tests/su/05/config/etc/group
rename to tests/su/06/config/etc/group
diff --git a/tests/tests/su/05/config/etc/gshadow b/tests/su/06/config/etc/gshadow
similarity index 100%
rename from tests/tests/su/05/config/etc/gshadow
rename to tests/su/06/config/etc/gshadow
diff --git a/tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/login.defs b/tests/su/06/config/etc/login.defs
similarity index 100%
rename from tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config/etc/login.defs
rename to tests/su/06/config/etc/login.defs
diff --git a/tests/tests/su/06/config/etc/passwd b/tests/su/06/config/etc/passwd
similarity index 100%
rename from tests/tests/su/06/config/etc/passwd
rename to tests/su/06/config/etc/passwd
diff --git a/tests/tests/su/06/config/etc/shadow b/tests/su/06/config/etc/shadow
similarity index 100%
rename from tests/tests/su/06/config/etc/shadow
rename to tests/su/06/config/etc/shadow
diff --git a/tests/tests/su/06/config/var/log/auth.log b/tests/su/06/config/var/log/auth.log
similarity index 100%
rename from tests/tests/su/06/config/var/log/auth.log
rename to tests/su/06/config/var/log/auth.log
diff --git a/tests/tests/su/06/run_su.exp b/tests/su/06/run_su.exp
similarity index 100%
rename from tests/tests/su/06/run_su.exp
rename to tests/su/06/run_su.exp
diff --git a/tests/tests/su/06/su_user_syslog.test b/tests/su/06/su_user_syslog.test
similarity index 100%
rename from tests/tests/su/06/su_user_syslog.test
rename to tests/su/06/su_user_syslog.test
diff --git a/tests/tests/su/07/config.txt b/tests/su/07/config.txt
similarity index 100%
rename from tests/tests/su/07/config.txt
rename to tests/su/07/config.txt
diff --git a/tests/tests/su/06/config/etc/group b/tests/su/07/config/etc/group
similarity index 100%
rename from tests/tests/su/06/config/etc/group
rename to tests/su/07/config/etc/group
diff --git a/tests/tests/su/06/config/etc/gshadow b/tests/su/07/config/etc/gshadow
similarity index 100%
rename from tests/tests/su/06/config/etc/gshadow
rename to tests/su/07/config/etc/gshadow
diff --git a/tests/tests/su/07/config/etc/login.defs b/tests/su/07/config/etc/login.defs
similarity index 100%
rename from tests/tests/su/07/config/etc/login.defs
rename to tests/su/07/config/etc/login.defs
diff --git a/tests/tests/su/07/config/etc/passwd b/tests/su/07/config/etc/passwd
similarity index 100%
rename from tests/tests/su/07/config/etc/passwd
rename to tests/su/07/config/etc/passwd
diff --git a/tests/tests/su/07/config/etc/shadow b/tests/su/07/config/etc/shadow
similarity index 100%
rename from tests/tests/su/07/config/etc/shadow
rename to tests/su/07/config/etc/shadow
diff --git a/tests/tests/su/07/config/var/log/auth.log b/tests/su/07/config/var/log/auth.log
similarity index 100%
rename from tests/tests/su/07/config/var/log/auth.log
rename to tests/su/07/config/var/log/auth.log
diff --git a/tests/tests/su/07/run_su.exp b/tests/su/07/run_su.exp
similarity index 100%
rename from tests/tests/su/07/run_su.exp
rename to tests/su/07/run_su.exp
diff --git a/tests/tests/su/07/su_user_syslog.test b/tests/su/07/su_user_syslog.test
similarity index 100%
rename from tests/tests/su/07/su_user_syslog.test
rename to tests/su/07/su_user_syslog.test
diff --git a/tests/tests/newusers/47_create_user_error_UID_4294967295/config.txt b/tests/su/08/config.txt
similarity index 100%
rename from tests/tests/newusers/47_create_user_error_UID_4294967295/config.txt
rename to tests/su/08/config.txt
diff --git a/tests/tests/su/07/config/etc/group b/tests/su/08/config/etc/group
similarity index 100%
rename from tests/tests/su/07/config/etc/group
rename to tests/su/08/config/etc/group
diff --git a/tests/tests/su/07/config/etc/gshadow b/tests/su/08/config/etc/gshadow
similarity index 100%
rename from tests/tests/su/07/config/etc/gshadow
rename to tests/su/08/config/etc/gshadow
diff --git a/tests/tests/su/08/config/etc/login.defs b/tests/su/08/config/etc/login.defs
similarity index 100%
rename from tests/tests/su/08/config/etc/login.defs
rename to tests/su/08/config/etc/login.defs
diff --git a/tests/tests/su/08/config/etc/passwd b/tests/su/08/config/etc/passwd
similarity index 100%
rename from tests/tests/su/08/config/etc/passwd
rename to tests/su/08/config/etc/passwd
diff --git a/tests/tests/su/08/config/etc/shadow b/tests/su/08/config/etc/shadow
similarity index 100%
rename from tests/tests/su/08/config/etc/shadow
rename to tests/su/08/config/etc/shadow
diff --git a/tests/tests/su/08/env_special-options_ b/tests/su/08/env_special-options_
similarity index 100%
rename from tests/tests/su/08/env_special-options_
rename to tests/su/08/env_special-options_
diff --git a/tests/tests/su/08/env_special-options_.exp b/tests/su/08/env_special-options_.exp
similarity index 100%
rename from tests/tests/su/08/env_special-options_.exp
rename to tests/su/08/env_special-options_.exp
diff --git a/tests/tests/su/08/env_special_root-options_ b/tests/su/08/env_special_root-options_
similarity index 100%
rename from tests/tests/su/08/env_special_root-options_
rename to tests/su/08/env_special_root-options_
diff --git a/tests/tests/su/08/env_special_root-options_.exp b/tests/su/08/env_special_root-options_.exp
similarity index 100%
rename from tests/tests/su/08/env_special_root-options_.exp
rename to tests/su/08/env_special_root-options_.exp
diff --git a/tests/tests/su/09/config.txt b/tests/su/09/config.txt
similarity index 100%
rename from tests/tests/su/09/config.txt
rename to tests/su/09/config.txt
diff --git a/tests/tests/su/08/config/etc/group b/tests/su/09/config/etc/group
similarity index 100%
rename from tests/tests/su/08/config/etc/group
rename to tests/su/09/config/etc/group
diff --git a/tests/tests/su/08/config/etc/gshadow b/tests/su/09/config/etc/gshadow
similarity index 100%
rename from tests/tests/su/08/config/etc/gshadow
rename to tests/su/09/config/etc/gshadow
diff --git a/tests/tests/su/09/config/etc/login.defs b/tests/su/09/config/etc/login.defs
similarity index 100%
rename from tests/tests/su/09/config/etc/login.defs
rename to tests/su/09/config/etc/login.defs
diff --git a/tests/tests/su/09/config/etc/passwd b/tests/su/09/config/etc/passwd
similarity index 100%
rename from tests/tests/su/09/config/etc/passwd
rename to tests/su/09/config/etc/passwd
diff --git a/tests/tests/su/09/config/etc/shadow b/tests/su/09/config/etc/shadow
similarity index 100%
rename from tests/tests/su/09/config/etc/shadow
rename to tests/su/09/config/etc/shadow
diff --git a/tests/tests/su/09/env_special-options_ b/tests/su/09/env_special-options_
similarity index 100%
rename from tests/tests/su/09/env_special-options_
rename to tests/su/09/env_special-options_
diff --git a/tests/tests/su/09/env_special-options_.exp b/tests/su/09/env_special-options_.exp
similarity index 100%
rename from tests/tests/su/09/env_special-options_.exp
rename to tests/su/09/env_special-options_.exp
diff --git a/tests/tests/su/09/env_special_root-options_ b/tests/su/09/env_special_root-options_
similarity index 100%
rename from tests/tests/su/09/env_special_root-options_
rename to tests/su/09/env_special_root-options_
diff --git a/tests/tests/su/09/env_special_root-options_.exp b/tests/su/09/env_special_root-options_.exp
similarity index 100%
rename from tests/tests/su/09/env_special_root-options_.exp
rename to tests/su/09/env_special_root-options_.exp
diff --git a/tests/tests/su/10_su_sulog_success/config.txt b/tests/su/10_su_sulog_success/config.txt
similarity index 100%
rename from tests/tests/su/10_su_sulog_success/config.txt
rename to tests/su/10_su_sulog_success/config.txt
diff --git a/tests/tests/su/09/config/etc/group b/tests/su/10_su_sulog_success/config/etc/group
similarity index 100%
rename from tests/tests/su/09/config/etc/group
rename to tests/su/10_su_sulog_success/config/etc/group
diff --git a/tests/tests/su/09/config/etc/gshadow b/tests/su/10_su_sulog_success/config/etc/gshadow
similarity index 100%
rename from tests/tests/su/09/config/etc/gshadow
rename to tests/su/10_su_sulog_success/config/etc/gshadow
diff --git a/tests/tests/su/10_su_sulog_success/config/etc/login.defs b/tests/su/10_su_sulog_success/config/etc/login.defs
similarity index 100%
rename from tests/tests/su/10_su_sulog_success/config/etc/login.defs
rename to tests/su/10_su_sulog_success/config/etc/login.defs
diff --git a/tests/tests/su/10_su_sulog_success/config/etc/passwd b/tests/su/10_su_sulog_success/config/etc/passwd
similarity index 100%
rename from tests/tests/su/10_su_sulog_success/config/etc/passwd
rename to tests/su/10_su_sulog_success/config/etc/passwd
diff --git a/tests/tests/su/10_su_sulog_success/config/etc/shadow b/tests/su/10_su_sulog_success/config/etc/shadow
similarity index 100%
rename from tests/tests/su/10_su_sulog_success/config/etc/shadow
rename to tests/su/10_su_sulog_success/config/etc/shadow
diff --git a/tests/tests/su/10_su_sulog_success/config/var/log/sulog b/tests/su/10_su_sulog_success/config/var/log/sulog
similarity index 100%
rename from tests/tests/su/10_su_sulog_success/config/var/log/sulog
rename to tests/su/10_su_sulog_success/config/var/log/sulog
diff --git a/tests/tests/su/10_su_sulog_success/data/sulog b/tests/su/10_su_sulog_success/data/sulog
similarity index 100%
rename from tests/tests/su/10_su_sulog_success/data/sulog
rename to tests/su/10_su_sulog_success/data/sulog
diff --git a/tests/tests/su/10_su_sulog_success/run_su.exp b/tests/su/10_su_sulog_success/run_su.exp
similarity index 100%
rename from tests/tests/su/10_su_sulog_success/run_su.exp
rename to tests/su/10_su_sulog_success/run_su.exp
diff --git a/tests/tests/su/10_su_sulog_success/su.test b/tests/su/10_su_sulog_success/su.test
similarity index 100%
rename from tests/tests/su/10_su_sulog_success/su.test
rename to tests/su/10_su_sulog_success/su.test
diff --git a/tests/tests/su/11_su_sulog_failure/config.txt b/tests/su/11_su_sulog_failure/config.txt
similarity index 100%
rename from tests/tests/su/11_su_sulog_failure/config.txt
rename to tests/su/11_su_sulog_failure/config.txt
diff --git a/tests/tests/su/10_su_sulog_success/config/etc/group b/tests/su/11_su_sulog_failure/config/etc/group
similarity index 100%
rename from tests/tests/su/10_su_sulog_success/config/etc/group
rename to tests/su/11_su_sulog_failure/config/etc/group
diff --git a/tests/tests/su/10_su_sulog_success/config/etc/gshadow b/tests/su/11_su_sulog_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/su/10_su_sulog_success/config/etc/gshadow
rename to tests/su/11_su_sulog_failure/config/etc/gshadow
diff --git a/tests/tests/su/11_su_sulog_failure/config/etc/login.defs b/tests/su/11_su_sulog_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/su/11_su_sulog_failure/config/etc/login.defs
rename to tests/su/11_su_sulog_failure/config/etc/login.defs
diff --git a/tests/tests/su/11_su_sulog_failure/config/etc/passwd b/tests/su/11_su_sulog_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/su/11_su_sulog_failure/config/etc/passwd
rename to tests/su/11_su_sulog_failure/config/etc/passwd
diff --git a/tests/tests/su/11_su_sulog_failure/config/etc/shadow b/tests/su/11_su_sulog_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/su/11_su_sulog_failure/config/etc/shadow
rename to tests/su/11_su_sulog_failure/config/etc/shadow
diff --git a/tests/tests/su/11_su_sulog_failure/config/var/log/sulog b/tests/su/11_su_sulog_failure/config/var/log/sulog
similarity index 100%
rename from tests/tests/su/11_su_sulog_failure/config/var/log/sulog
rename to tests/su/11_su_sulog_failure/config/var/log/sulog
diff --git a/tests/tests/su/11_su_sulog_failure/data/sulog b/tests/su/11_su_sulog_failure/data/sulog
similarity index 100%
rename from tests/tests/su/11_su_sulog_failure/data/sulog
rename to tests/su/11_su_sulog_failure/data/sulog
diff --git a/tests/tests/su/11_su_sulog_failure/run_su.exp b/tests/su/11_su_sulog_failure/run_su.exp
similarity index 100%
rename from tests/tests/su/11_su_sulog_failure/run_su.exp
rename to tests/su/11_su_sulog_failure/run_su.exp
diff --git a/tests/tests/su/11_su_sulog_failure/su.test b/tests/su/11_su_sulog_failure/su.test
similarity index 100%
rename from tests/tests/su/11_su_sulog_failure/su.test
rename to tests/su/11_su_sulog_failure/su.test
diff --git a/tests/tests/su/12_su_child_failure/config.txt b/tests/su/12_su_child_failure/config.txt
similarity index 100%
rename from tests/tests/su/12_su_child_failure/config.txt
rename to tests/su/12_su_child_failure/config.txt
diff --git a/tests/tests/su/11_su_sulog_failure/config/etc/group b/tests/su/12_su_child_failure/config/etc/group
similarity index 100%
rename from tests/tests/su/11_su_sulog_failure/config/etc/group
rename to tests/su/12_su_child_failure/config/etc/group
diff --git a/tests/tests/su/11_su_sulog_failure/config/etc/gshadow b/tests/su/12_su_child_failure/config/etc/gshadow
similarity index 100%
rename from tests/tests/su/11_su_sulog_failure/config/etc/gshadow
rename to tests/su/12_su_child_failure/config/etc/gshadow
diff --git a/tests/tests/su/12_su_child_failure/config/etc/login.defs b/tests/su/12_su_child_failure/config/etc/login.defs
similarity index 100%
rename from tests/tests/su/12_su_child_failure/config/etc/login.defs
rename to tests/su/12_su_child_failure/config/etc/login.defs
diff --git a/tests/tests/su/12_su_child_failure/config/etc/passwd b/tests/su/12_su_child_failure/config/etc/passwd
similarity index 100%
rename from tests/tests/su/12_su_child_failure/config/etc/passwd
rename to tests/su/12_su_child_failure/config/etc/passwd
diff --git a/tests/tests/su/12_su_child_failure/config/etc/shadow b/tests/su/12_su_child_failure/config/etc/shadow
similarity index 100%
rename from tests/tests/su/12_su_child_failure/config/etc/shadow
rename to tests/su/12_su_child_failure/config/etc/shadow
diff --git a/tests/tests/su/12_su_child_failure/config/var/log/sulog b/tests/su/12_su_child_failure/config/var/log/sulog
similarity index 100%
rename from tests/tests/su/12_su_child_failure/config/var/log/sulog
rename to tests/su/12_su_child_failure/config/var/log/sulog
diff --git a/tests/tests/su/12_su_child_failure/su.test b/tests/su/12_su_child_failure/su.test
similarity index 100%
rename from tests/tests/su/12_su_child_failure/su.test
rename to tests/su/12_su_child_failure/su.test
diff --git a/tests/tests/su/13_su_child_success/config.txt b/tests/su/13_su_child_success/config.txt
similarity index 100%
rename from tests/tests/su/13_su_child_success/config.txt
rename to tests/su/13_su_child_success/config.txt
diff --git a/tests/tests/su/12_su_child_failure/config/etc/group b/tests/su/13_su_child_success/config/etc/group
similarity index 100%
rename from tests/tests/su/12_su_child_failure/config/etc/group
rename to tests/su/13_su_child_success/config/etc/group
diff --git a/tests/tests/su/12_su_child_failure/config/etc/gshadow b/tests/su/13_su_child_success/config/etc/gshadow
similarity index 100%
rename from tests/tests/su/12_su_child_failure/config/etc/gshadow
rename to tests/su/13_su_child_success/config/etc/gshadow
diff --git a/tests/tests/su/13_su_child_success/config/etc/login.defs b/tests/su/13_su_child_success/config/etc/login.defs
similarity index 100%
rename from tests/tests/su/13_su_child_success/config/etc/login.defs
rename to tests/su/13_su_child_success/config/etc/login.defs
diff --git a/tests/tests/su/13_su_child_success/config/etc/passwd b/tests/su/13_su_child_success/config/etc/passwd
similarity index 100%
rename from tests/tests/su/13_su_child_success/config/etc/passwd
rename to tests/su/13_su_child_success/config/etc/passwd
diff --git a/tests/tests/su/13_su_child_success/config/etc/shadow b/tests/su/13_su_child_success/config/etc/shadow
similarity index 100%
rename from tests/tests/su/13_su_child_success/config/etc/shadow
rename to tests/su/13_su_child_success/config/etc/shadow
diff --git a/tests/tests/su/13_su_child_success/config/var/log/sulog b/tests/su/13_su_child_success/config/var/log/sulog
similarity index 100%
rename from tests/tests/su/13_su_child_success/config/var/log/sulog
rename to tests/su/13_su_child_success/config/var/log/sulog
diff --git a/tests/tests/su/13_su_child_success/su.test b/tests/su/13_su_child_success/su.test
similarity index 100%
rename from tests/tests/su/13_su_child_success/su.test
rename to tests/su/13_su_child_success/su.test
diff --git a/tests/tests/newusers/48_create_user_error_GID_4294967295/config.txt b/tests/subids/01_useradd_no_subids/config.txt
similarity index 100%
rename from tests/tests/newusers/48_create_user_error_GID_4294967295/config.txt
rename to tests/subids/01_useradd_no_subids/config.txt
diff --git a/tests/tests/subids/01_useradd_no_subids/config/etc/default/useradd b/tests/subids/01_useradd_no_subids/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/01_useradd_no_subids/config/etc/default/useradd
rename to tests/subids/01_useradd_no_subids/config/etc/default/useradd
diff --git a/tests/tests/passwd/22_passwd_usage/config/etc/group b/tests/subids/01_useradd_no_subids/config/etc/group
similarity index 100%
rename from tests/tests/passwd/22_passwd_usage/config/etc/group
rename to tests/subids/01_useradd_no_subids/config/etc/group
diff --git a/tests/tests/passwd/22_passwd_usage/config/etc/gshadow b/tests/subids/01_useradd_no_subids/config/etc/gshadow
similarity index 100%
rename from tests/tests/passwd/22_passwd_usage/config/etc/gshadow
rename to tests/subids/01_useradd_no_subids/config/etc/gshadow
diff --git a/tests/tests/passwd/22_passwd_usage/config/etc/passwd b/tests/subids/01_useradd_no_subids/config/etc/passwd
similarity index 100%
rename from tests/tests/passwd/22_passwd_usage/config/etc/passwd
rename to tests/subids/01_useradd_no_subids/config/etc/passwd
diff --git a/tests/tests/subids/01_useradd_no_subids/config/etc/shadow b/tests/subids/01_useradd_no_subids/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/01_useradd_no_subids/config/etc/shadow
rename to tests/subids/01_useradd_no_subids/config/etc/shadow
diff --git a/tests/tests/subids/01_useradd_no_subids/config/etc/subgid b/tests/subids/01_useradd_no_subids/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/01_useradd_no_subids/config/etc/subgid
rename to tests/subids/01_useradd_no_subids/config/etc/subgid
diff --git a/tests/tests/subids/01_useradd_no_subids/config/etc/subuid b/tests/subids/01_useradd_no_subids/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/01_useradd_no_subids/config/etc/subuid
rename to tests/subids/01_useradd_no_subids/config/etc/subuid
diff --git a/tests/tests/passwd/18_passwd_root_change_password_user/config/etc/group b/tests/subids/01_useradd_no_subids/data/group
similarity index 100%
rename from tests/tests/passwd/18_passwd_root_change_password_user/config/etc/group
rename to tests/subids/01_useradd_no_subids/data/group
diff --git a/tests/tests/subids/01_useradd_no_subids/data/gshadow b/tests/subids/01_useradd_no_subids/data/gshadow
similarity index 100%
rename from tests/tests/subids/01_useradd_no_subids/data/gshadow
rename to tests/subids/01_useradd_no_subids/data/gshadow
diff --git a/tests/tests/subids/01_useradd_no_subids/data/passwd b/tests/subids/01_useradd_no_subids/data/passwd
similarity index 100%
rename from tests/tests/subids/01_useradd_no_subids/data/passwd
rename to tests/subids/01_useradd_no_subids/data/passwd
diff --git a/tests/tests/subids/01_useradd_no_subids/data/shadow b/tests/subids/01_useradd_no_subids/data/shadow
similarity index 100%
rename from tests/tests/subids/01_useradd_no_subids/data/shadow
rename to tests/subids/01_useradd_no_subids/data/shadow
diff --git a/tests/tests/subids/01_useradd_no_subids/useradd.test b/tests/subids/01_useradd_no_subids/useradd.test
similarity index 100%
rename from tests/tests/subids/01_useradd_no_subids/useradd.test
rename to tests/subids/01_useradd_no_subids/useradd.test
diff --git a/tests/tests/newusers/50_usage/config.txt b/tests/subids/02_useradd_with_subids/config.txt
similarity index 100%
rename from tests/tests/newusers/50_usage/config.txt
rename to tests/subids/02_useradd_with_subids/config.txt
diff --git a/tests/tests/subids/02_useradd_with_subids/config/etc/default/useradd b/tests/subids/02_useradd_with_subids/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/config/etc/default/useradd
rename to tests/subids/02_useradd_with_subids/config/etc/default/useradd
diff --git a/tests/tests/subids/01_useradd_no_subids/config/etc/group b/tests/subids/02_useradd_with_subids/config/etc/group
similarity index 100%
rename from tests/tests/subids/01_useradd_no_subids/config/etc/group
rename to tests/subids/02_useradd_with_subids/config/etc/group
diff --git a/tests/tests/subids/01_useradd_no_subids/config/etc/gshadow b/tests/subids/02_useradd_with_subids/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/01_useradd_no_subids/config/etc/gshadow
rename to tests/subids/02_useradd_with_subids/config/etc/gshadow
diff --git a/tests/tests/subids/01_useradd_no_subids/config/etc/passwd b/tests/subids/02_useradd_with_subids/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/01_useradd_no_subids/config/etc/passwd
rename to tests/subids/02_useradd_with_subids/config/etc/passwd
diff --git a/tests/tests/subids/02_useradd_with_subids/config/etc/shadow b/tests/subids/02_useradd_with_subids/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/config/etc/shadow
rename to tests/subids/02_useradd_with_subids/config/etc/shadow
diff --git a/tests/tests/subids/02_useradd_with_subids/config/etc/subgid b/tests/subids/02_useradd_with_subids/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/config/etc/subgid
rename to tests/subids/02_useradd_with_subids/config/etc/subgid
diff --git a/tests/tests/subids/02_useradd_with_subids/config/etc/subuid b/tests/subids/02_useradd_with_subids/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/config/etc/subuid
rename to tests/subids/02_useradd_with_subids/config/etc/subuid
diff --git a/tests/tests/passwd/19_passwd_user_change_password/config/etc/group b/tests/subids/02_useradd_with_subids/data/group
similarity index 100%
rename from tests/tests/passwd/19_passwd_user_change_password/config/etc/group
rename to tests/subids/02_useradd_with_subids/data/group
diff --git a/tests/tests/subids/02_useradd_with_subids/data/gshadow b/tests/subids/02_useradd_with_subids/data/gshadow
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/data/gshadow
rename to tests/subids/02_useradd_with_subids/data/gshadow
diff --git a/tests/tests/subids/02_useradd_with_subids/data/passwd b/tests/subids/02_useradd_with_subids/data/passwd
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/data/passwd
rename to tests/subids/02_useradd_with_subids/data/passwd
diff --git a/tests/tests/subids/02_useradd_with_subids/data/shadow b/tests/subids/02_useradd_with_subids/data/shadow
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/data/shadow
rename to tests/subids/02_useradd_with_subids/data/shadow
diff --git a/tests/tests/subids/02_useradd_with_subids/data/subgid b/tests/subids/02_useradd_with_subids/data/subgid
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/data/subgid
rename to tests/subids/02_useradd_with_subids/data/subgid
diff --git a/tests/tests/subids/02_useradd_with_subids/data/subuid b/tests/subids/02_useradd_with_subids/data/subuid
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/data/subuid
rename to tests/subids/02_useradd_with_subids/data/subuid
diff --git a/tests/tests/subids/02_useradd_with_subids/useradd.test b/tests/subids/02_useradd_with_subids/useradd.test
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/useradd.test
rename to tests/subids/02_useradd_with_subids/useradd.test
diff --git a/tests/tests/newusers/51_usage_invalid_option/config.txt b/tests/subids/03_useradd_no_subgid/config.txt
similarity index 100%
rename from tests/tests/newusers/51_usage_invalid_option/config.txt
rename to tests/subids/03_useradd_no_subgid/config.txt
diff --git a/tests/tests/subids/03_useradd_no_subgid/config/etc/default/useradd b/tests/subids/03_useradd_no_subgid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/03_useradd_no_subgid/config/etc/default/useradd
rename to tests/subids/03_useradd_no_subgid/config/etc/default/useradd
diff --git a/tests/tests/subids/02_useradd_with_subids/config/etc/group b/tests/subids/03_useradd_no_subgid/config/etc/group
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/config/etc/group
rename to tests/subids/03_useradd_no_subgid/config/etc/group
diff --git a/tests/tests/subids/02_useradd_with_subids/config/etc/gshadow b/tests/subids/03_useradd_no_subgid/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/config/etc/gshadow
rename to tests/subids/03_useradd_no_subgid/config/etc/gshadow
diff --git a/tests/tests/subids/02_useradd_with_subids/config/etc/passwd b/tests/subids/03_useradd_no_subgid/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/config/etc/passwd
rename to tests/subids/03_useradd_no_subgid/config/etc/passwd
diff --git a/tests/tests/subids/03_useradd_no_subgid/config/etc/shadow b/tests/subids/03_useradd_no_subgid/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/03_useradd_no_subgid/config/etc/shadow
rename to tests/subids/03_useradd_no_subgid/config/etc/shadow
diff --git a/tests/tests/subids/03_useradd_no_subgid/config/etc/subgid b/tests/subids/03_useradd_no_subgid/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/03_useradd_no_subgid/config/etc/subgid
rename to tests/subids/03_useradd_no_subgid/config/etc/subgid
diff --git a/tests/tests/subids/03_useradd_no_subgid/config/etc/subuid b/tests/subids/03_useradd_no_subgid/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/03_useradd_no_subgid/config/etc/subuid
rename to tests/subids/03_useradd_no_subgid/config/etc/subuid
diff --git a/tests/tests/passwd/20_passwd_user_change_password_same_user/config/etc/group b/tests/subids/03_useradd_no_subgid/data/group
similarity index 100%
rename from tests/tests/passwd/20_passwd_user_change_password_same_user/config/etc/group
rename to tests/subids/03_useradd_no_subgid/data/group
diff --git a/tests/tests/subids/03_useradd_no_subgid/data/gshadow b/tests/subids/03_useradd_no_subgid/data/gshadow
similarity index 100%
rename from tests/tests/subids/03_useradd_no_subgid/data/gshadow
rename to tests/subids/03_useradd_no_subgid/data/gshadow
diff --git a/tests/tests/subids/03_useradd_no_subgid/data/passwd b/tests/subids/03_useradd_no_subgid/data/passwd
similarity index 100%
rename from tests/tests/subids/03_useradd_no_subgid/data/passwd
rename to tests/subids/03_useradd_no_subgid/data/passwd
diff --git a/tests/tests/subids/03_useradd_no_subgid/data/shadow b/tests/subids/03_useradd_no_subgid/data/shadow
similarity index 100%
rename from tests/tests/subids/03_useradd_no_subgid/data/shadow
rename to tests/subids/03_useradd_no_subgid/data/shadow
diff --git a/tests/tests/subids/03_useradd_no_subgid/data/subuid b/tests/subids/03_useradd_no_subgid/data/subuid
similarity index 100%
rename from tests/tests/subids/03_useradd_no_subgid/data/subuid
rename to tests/subids/03_useradd_no_subgid/data/subuid
diff --git a/tests/tests/subids/03_useradd_no_subgid/useradd.test b/tests/subids/03_useradd_no_subgid/useradd.test
similarity index 100%
rename from tests/tests/subids/03_useradd_no_subgid/useradd.test
rename to tests/subids/03_useradd_no_subgid/useradd.test
diff --git a/tests/tests/newusers/52_usage_2_input_files/config.txt b/tests/subids/04_useradd_no_subuid/config.txt
similarity index 100%
rename from tests/tests/newusers/52_usage_2_input_files/config.txt
rename to tests/subids/04_useradd_no_subuid/config.txt
diff --git a/tests/tests/subids/04_useradd_no_subuid/config/etc/default/useradd b/tests/subids/04_useradd_no_subuid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/04_useradd_no_subuid/config/etc/default/useradd
rename to tests/subids/04_useradd_no_subuid/config/etc/default/useradd
diff --git a/tests/tests/subids/03_useradd_no_subgid/config/etc/group b/tests/subids/04_useradd_no_subuid/config/etc/group
similarity index 100%
rename from tests/tests/subids/03_useradd_no_subgid/config/etc/group
rename to tests/subids/04_useradd_no_subuid/config/etc/group
diff --git a/tests/tests/subids/03_useradd_no_subgid/config/etc/gshadow b/tests/subids/04_useradd_no_subuid/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/03_useradd_no_subgid/config/etc/gshadow
rename to tests/subids/04_useradd_no_subuid/config/etc/gshadow
diff --git a/tests/tests/subids/03_useradd_no_subgid/config/etc/passwd b/tests/subids/04_useradd_no_subuid/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/03_useradd_no_subgid/config/etc/passwd
rename to tests/subids/04_useradd_no_subuid/config/etc/passwd
diff --git a/tests/tests/subids/04_useradd_no_subuid/config/etc/shadow b/tests/subids/04_useradd_no_subuid/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/04_useradd_no_subuid/config/etc/shadow
rename to tests/subids/04_useradd_no_subuid/config/etc/shadow
diff --git a/tests/tests/subids/04_useradd_no_subuid/config/etc/subgid b/tests/subids/04_useradd_no_subuid/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/04_useradd_no_subuid/config/etc/subgid
rename to tests/subids/04_useradd_no_subuid/config/etc/subgid
diff --git a/tests/tests/subids/04_useradd_no_subuid/config/etc/subuid b/tests/subids/04_useradd_no_subuid/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/04_useradd_no_subuid/config/etc/subuid
rename to tests/subids/04_useradd_no_subuid/config/etc/subuid
diff --git a/tests/tests/subids/01_useradd_no_subids/data/group b/tests/subids/04_useradd_no_subuid/data/group
similarity index 100%
rename from tests/tests/subids/01_useradd_no_subids/data/group
rename to tests/subids/04_useradd_no_subuid/data/group
diff --git a/tests/tests/subids/04_useradd_no_subuid/data/gshadow b/tests/subids/04_useradd_no_subuid/data/gshadow
similarity index 100%
rename from tests/tests/subids/04_useradd_no_subuid/data/gshadow
rename to tests/subids/04_useradd_no_subuid/data/gshadow
diff --git a/tests/tests/subids/04_useradd_no_subuid/data/passwd b/tests/subids/04_useradd_no_subuid/data/passwd
similarity index 100%
rename from tests/tests/subids/04_useradd_no_subuid/data/passwd
rename to tests/subids/04_useradd_no_subuid/data/passwd
diff --git a/tests/tests/subids/04_useradd_no_subuid/data/shadow b/tests/subids/04_useradd_no_subuid/data/shadow
similarity index 100%
rename from tests/tests/subids/04_useradd_no_subuid/data/shadow
rename to tests/subids/04_useradd_no_subuid/data/shadow
diff --git a/tests/tests/subids/04_useradd_no_subuid/data/subgid b/tests/subids/04_useradd_no_subuid/data/subgid
similarity index 100%
rename from tests/tests/subids/04_useradd_no_subuid/data/subgid
rename to tests/subids/04_useradd_no_subuid/data/subgid
diff --git a/tests/tests/subids/04_useradd_no_subuid/useradd.test b/tests/subids/04_useradd_no_subuid/useradd.test
similarity index 100%
rename from tests/tests/subids/04_useradd_no_subuid/useradd.test
rename to tests/subids/04_useradd_no_subuid/useradd.test
diff --git a/tests/tests/newusers/53_locked_passwd/config.txt b/tests/subids/05_useradd_fill_gap_start/config.txt
similarity index 100%
rename from tests/tests/newusers/53_locked_passwd/config.txt
rename to tests/subids/05_useradd_fill_gap_start/config.txt
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/config/etc/default/useradd b/tests/subids/05_useradd_fill_gap_start/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/config/etc/default/useradd
rename to tests/subids/05_useradd_fill_gap_start/config/etc/default/useradd
diff --git a/tests/tests/subids/04_useradd_no_subuid/config/etc/group b/tests/subids/05_useradd_fill_gap_start/config/etc/group
similarity index 100%
rename from tests/tests/subids/04_useradd_no_subuid/config/etc/group
rename to tests/subids/05_useradd_fill_gap_start/config/etc/group
diff --git a/tests/tests/subids/04_useradd_no_subuid/config/etc/gshadow b/tests/subids/05_useradd_fill_gap_start/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/04_useradd_no_subuid/config/etc/gshadow
rename to tests/subids/05_useradd_fill_gap_start/config/etc/gshadow
diff --git a/tests/tests/subids/04_useradd_no_subuid/config/etc/passwd b/tests/subids/05_useradd_fill_gap_start/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/04_useradd_no_subuid/config/etc/passwd
rename to tests/subids/05_useradd_fill_gap_start/config/etc/passwd
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/config/etc/shadow b/tests/subids/05_useradd_fill_gap_start/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/config/etc/shadow
rename to tests/subids/05_useradd_fill_gap_start/config/etc/shadow
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/config/etc/subgid b/tests/subids/05_useradd_fill_gap_start/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/config/etc/subgid
rename to tests/subids/05_useradd_fill_gap_start/config/etc/subgid
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/config/etc/subuid b/tests/subids/05_useradd_fill_gap_start/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/config/etc/subuid
rename to tests/subids/05_useradd_fill_gap_start/config/etc/subuid
diff --git a/tests/tests/subids/02_useradd_with_subids/data/group b/tests/subids/05_useradd_fill_gap_start/data/group
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/data/group
rename to tests/subids/05_useradd_fill_gap_start/data/group
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/data/gshadow b/tests/subids/05_useradd_fill_gap_start/data/gshadow
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/data/gshadow
rename to tests/subids/05_useradd_fill_gap_start/data/gshadow
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/data/passwd b/tests/subids/05_useradd_fill_gap_start/data/passwd
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/data/passwd
rename to tests/subids/05_useradd_fill_gap_start/data/passwd
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/data/shadow b/tests/subids/05_useradd_fill_gap_start/data/shadow
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/data/shadow
rename to tests/subids/05_useradd_fill_gap_start/data/shadow
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/data/subgid b/tests/subids/05_useradd_fill_gap_start/data/subgid
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/data/subgid
rename to tests/subids/05_useradd_fill_gap_start/data/subgid
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/data/subuid b/tests/subids/05_useradd_fill_gap_start/data/subuid
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/data/subuid
rename to tests/subids/05_useradd_fill_gap_start/data/subuid
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/useradd.test b/tests/subids/05_useradd_fill_gap_start/useradd.test
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/useradd.test
rename to tests/subids/05_useradd_fill_gap_start/useradd.test
diff --git a/tests/tests/newusers/54_locked_shadow/config.txt b/tests/subids/06_useradd_fill_gap_middle/config.txt
similarity index 100%
rename from tests/tests/newusers/54_locked_shadow/config.txt
rename to tests/subids/06_useradd_fill_gap_middle/config.txt
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/config/etc/default/useradd b/tests/subids/06_useradd_fill_gap_middle/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/config/etc/default/useradd
rename to tests/subids/06_useradd_fill_gap_middle/config/etc/default/useradd
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/config/etc/group b/tests/subids/06_useradd_fill_gap_middle/config/etc/group
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/config/etc/group
rename to tests/subids/06_useradd_fill_gap_middle/config/etc/group
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/config/etc/gshadow b/tests/subids/06_useradd_fill_gap_middle/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/config/etc/gshadow
rename to tests/subids/06_useradd_fill_gap_middle/config/etc/gshadow
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/config/etc/passwd b/tests/subids/06_useradd_fill_gap_middle/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/config/etc/passwd
rename to tests/subids/06_useradd_fill_gap_middle/config/etc/passwd
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/config/etc/shadow b/tests/subids/06_useradd_fill_gap_middle/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/config/etc/shadow
rename to tests/subids/06_useradd_fill_gap_middle/config/etc/shadow
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/config/etc/subgid b/tests/subids/06_useradd_fill_gap_middle/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/config/etc/subgid
rename to tests/subids/06_useradd_fill_gap_middle/config/etc/subgid
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/config/etc/subuid b/tests/subids/06_useradd_fill_gap_middle/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/config/etc/subuid
rename to tests/subids/06_useradd_fill_gap_middle/config/etc/subuid
diff --git a/tests/tests/subids/03_useradd_no_subgid/data/group b/tests/subids/06_useradd_fill_gap_middle/data/group
similarity index 100%
rename from tests/tests/subids/03_useradd_no_subgid/data/group
rename to tests/subids/06_useradd_fill_gap_middle/data/group
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/data/gshadow b/tests/subids/06_useradd_fill_gap_middle/data/gshadow
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/data/gshadow
rename to tests/subids/06_useradd_fill_gap_middle/data/gshadow
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/data/passwd b/tests/subids/06_useradd_fill_gap_middle/data/passwd
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/data/passwd
rename to tests/subids/06_useradd_fill_gap_middle/data/passwd
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/data/shadow b/tests/subids/06_useradd_fill_gap_middle/data/shadow
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/data/shadow
rename to tests/subids/06_useradd_fill_gap_middle/data/shadow
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/data/subgid b/tests/subids/06_useradd_fill_gap_middle/data/subgid
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/data/subgid
rename to tests/subids/06_useradd_fill_gap_middle/data/subgid
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/data/subuid b/tests/subids/06_useradd_fill_gap_middle/data/subuid
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/data/subuid
rename to tests/subids/06_useradd_fill_gap_middle/data/subuid
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/useradd.test b/tests/subids/06_useradd_fill_gap_middle/useradd.test
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/useradd.test
rename to tests/subids/06_useradd_fill_gap_middle/useradd.test
diff --git a/tests/tests/newusers/55_locked_group/config.txt b/tests/subids/07_useradd_fill_gap_end/config.txt
similarity index 100%
rename from tests/tests/newusers/55_locked_group/config.txt
rename to tests/subids/07_useradd_fill_gap_end/config.txt
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/config/etc/default/useradd b/tests/subids/07_useradd_fill_gap_end/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/config/etc/default/useradd
rename to tests/subids/07_useradd_fill_gap_end/config/etc/default/useradd
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/config/etc/group b/tests/subids/07_useradd_fill_gap_end/config/etc/group
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/config/etc/group
rename to tests/subids/07_useradd_fill_gap_end/config/etc/group
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/config/etc/gshadow b/tests/subids/07_useradd_fill_gap_end/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/config/etc/gshadow
rename to tests/subids/07_useradd_fill_gap_end/config/etc/gshadow
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/config/etc/passwd b/tests/subids/07_useradd_fill_gap_end/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/config/etc/passwd
rename to tests/subids/07_useradd_fill_gap_end/config/etc/passwd
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/config/etc/shadow b/tests/subids/07_useradd_fill_gap_end/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/config/etc/shadow
rename to tests/subids/07_useradd_fill_gap_end/config/etc/shadow
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/config/etc/subgid b/tests/subids/07_useradd_fill_gap_end/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/config/etc/subgid
rename to tests/subids/07_useradd_fill_gap_end/config/etc/subgid
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/config/etc/subuid b/tests/subids/07_useradd_fill_gap_end/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/config/etc/subuid
rename to tests/subids/07_useradd_fill_gap_end/config/etc/subuid
diff --git a/tests/tests/subids/04_useradd_no_subuid/data/group b/tests/subids/07_useradd_fill_gap_end/data/group
similarity index 100%
rename from tests/tests/subids/04_useradd_no_subuid/data/group
rename to tests/subids/07_useradd_fill_gap_end/data/group
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/data/gshadow b/tests/subids/07_useradd_fill_gap_end/data/gshadow
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/data/gshadow
rename to tests/subids/07_useradd_fill_gap_end/data/gshadow
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/data/passwd b/tests/subids/07_useradd_fill_gap_end/data/passwd
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/data/passwd
rename to tests/subids/07_useradd_fill_gap_end/data/passwd
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/data/shadow b/tests/subids/07_useradd_fill_gap_end/data/shadow
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/data/shadow
rename to tests/subids/07_useradd_fill_gap_end/data/shadow
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/data/subgid b/tests/subids/07_useradd_fill_gap_end/data/subgid
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/data/subgid
rename to tests/subids/07_useradd_fill_gap_end/data/subgid
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/data/subuid b/tests/subids/07_useradd_fill_gap_end/data/subuid
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/data/subuid
rename to tests/subids/07_useradd_fill_gap_end/data/subuid
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/useradd.test b/tests/subids/07_useradd_fill_gap_end/useradd.test
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/useradd.test
rename to tests/subids/07_useradd_fill_gap_end/useradd.test
diff --git a/tests/tests/newusers/56_locked_gshadow/config.txt b/tests/subids/08_useradd_no_more_subuids_start/config.txt
similarity index 100%
rename from tests/tests/newusers/56_locked_gshadow/config.txt
rename to tests/subids/08_useradd_no_more_subuids_start/config.txt
diff --git a/tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/default/useradd b/tests/subids/08_useradd_no_more_subuids_start/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/default/useradd
rename to tests/subids/08_useradd_no_more_subuids_start/config/etc/default/useradd
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/config/etc/group b/tests/subids/08_useradd_no_more_subuids_start/config/etc/group
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/config/etc/group
rename to tests/subids/08_useradd_no_more_subuids_start/config/etc/group
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/config/etc/gshadow b/tests/subids/08_useradd_no_more_subuids_start/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/config/etc/gshadow
rename to tests/subids/08_useradd_no_more_subuids_start/config/etc/gshadow
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/config/etc/passwd b/tests/subids/08_useradd_no_more_subuids_start/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/config/etc/passwd
rename to tests/subids/08_useradd_no_more_subuids_start/config/etc/passwd
diff --git a/tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/shadow b/tests/subids/08_useradd_no_more_subuids_start/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/shadow
rename to tests/subids/08_useradd_no_more_subuids_start/config/etc/shadow
diff --git a/tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/subgid b/tests/subids/08_useradd_no_more_subuids_start/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/subgid
rename to tests/subids/08_useradd_no_more_subuids_start/config/etc/subgid
diff --git a/tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/subuid b/tests/subids/08_useradd_no_more_subuids_start/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/subuid
rename to tests/subids/08_useradd_no_more_subuids_start/config/etc/subuid
diff --git a/tests/tests/subids/08_useradd_no_more_subuids_start/data/useradd.err b/tests/subids/08_useradd_no_more_subuids_start/data/useradd.err
similarity index 100%
rename from tests/tests/subids/08_useradd_no_more_subuids_start/data/useradd.err
rename to tests/subids/08_useradd_no_more_subuids_start/data/useradd.err
diff --git a/tests/tests/subids/08_useradd_no_more_subuids_start/useradd.test b/tests/subids/08_useradd_no_more_subuids_start/useradd.test
similarity index 100%
rename from tests/tests/subids/08_useradd_no_more_subuids_start/useradd.test
rename to tests/subids/08_useradd_no_more_subuids_start/useradd.test
diff --git a/tests/tests/newusers/57_missing_input_file/config.txt b/tests/subids/09_useradd_no_more_subgids_start/config.txt
similarity index 100%
rename from tests/tests/newusers/57_missing_input_file/config.txt
rename to tests/subids/09_useradd_no_more_subgids_start/config.txt
diff --git a/tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/default/useradd b/tests/subids/09_useradd_no_more_subgids_start/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/default/useradd
rename to tests/subids/09_useradd_no_more_subgids_start/config/etc/default/useradd
diff --git a/tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/group b/tests/subids/09_useradd_no_more_subgids_start/config/etc/group
similarity index 100%
rename from tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/group
rename to tests/subids/09_useradd_no_more_subgids_start/config/etc/group
diff --git a/tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/gshadow b/tests/subids/09_useradd_no_more_subgids_start/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/gshadow
rename to tests/subids/09_useradd_no_more_subgids_start/config/etc/gshadow
diff --git a/tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/passwd b/tests/subids/09_useradd_no_more_subgids_start/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/passwd
rename to tests/subids/09_useradd_no_more_subgids_start/config/etc/passwd
diff --git a/tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/shadow b/tests/subids/09_useradd_no_more_subgids_start/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/shadow
rename to tests/subids/09_useradd_no_more_subgids_start/config/etc/shadow
diff --git a/tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/subgid b/tests/subids/09_useradd_no_more_subgids_start/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/subgid
rename to tests/subids/09_useradd_no_more_subgids_start/config/etc/subgid
diff --git a/tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/subuid b/tests/subids/09_useradd_no_more_subgids_start/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/subuid
rename to tests/subids/09_useradd_no_more_subgids_start/config/etc/subuid
diff --git a/tests/tests/subids/09_useradd_no_more_subgids_start/data/useradd.err b/tests/subids/09_useradd_no_more_subgids_start/data/useradd.err
similarity index 100%
rename from tests/tests/subids/09_useradd_no_more_subgids_start/data/useradd.err
rename to tests/subids/09_useradd_no_more_subgids_start/data/useradd.err
diff --git a/tests/tests/subids/09_useradd_no_more_subgids_start/useradd.test b/tests/subids/09_useradd_no_more_subgids_start/useradd.test
similarity index 100%
rename from tests/tests/subids/09_useradd_no_more_subgids_start/useradd.test
rename to tests/subids/09_useradd_no_more_subgids_start/useradd.test
diff --git a/tests/tests/newusers/58_invalid_input_file/config.txt b/tests/subids/10_useradd_no_more_subuids_end/config.txt
similarity index 100%
rename from tests/tests/newusers/58_invalid_input_file/config.txt
rename to tests/subids/10_useradd_no_more_subuids_end/config.txt
diff --git a/tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/default/useradd b/tests/subids/10_useradd_no_more_subuids_end/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/default/useradd
rename to tests/subids/10_useradd_no_more_subuids_end/config/etc/default/useradd
diff --git a/tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/group b/tests/subids/10_useradd_no_more_subuids_end/config/etc/group
similarity index 100%
rename from tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/group
rename to tests/subids/10_useradd_no_more_subuids_end/config/etc/group
diff --git a/tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/gshadow b/tests/subids/10_useradd_no_more_subuids_end/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/gshadow
rename to tests/subids/10_useradd_no_more_subuids_end/config/etc/gshadow
diff --git a/tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/passwd b/tests/subids/10_useradd_no_more_subuids_end/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/passwd
rename to tests/subids/10_useradd_no_more_subuids_end/config/etc/passwd
diff --git a/tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/shadow b/tests/subids/10_useradd_no_more_subuids_end/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/shadow
rename to tests/subids/10_useradd_no_more_subuids_end/config/etc/shadow
diff --git a/tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/subgid b/tests/subids/10_useradd_no_more_subuids_end/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/subgid
rename to tests/subids/10_useradd_no_more_subuids_end/config/etc/subgid
diff --git a/tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/subuid b/tests/subids/10_useradd_no_more_subuids_end/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/subuid
rename to tests/subids/10_useradd_no_more_subuids_end/config/etc/subuid
diff --git a/tests/tests/subids/10_useradd_no_more_subuids_end/data/useradd.err b/tests/subids/10_useradd_no_more_subuids_end/data/useradd.err
similarity index 100%
rename from tests/tests/subids/10_useradd_no_more_subuids_end/data/useradd.err
rename to tests/subids/10_useradd_no_more_subuids_end/data/useradd.err
diff --git a/tests/tests/subids/10_useradd_no_more_subuids_end/useradd.test b/tests/subids/10_useradd_no_more_subuids_end/useradd.test
similarity index 100%
rename from tests/tests/subids/10_useradd_no_more_subuids_end/useradd.test
rename to tests/subids/10_useradd_no_more_subuids_end/useradd.test
diff --git a/tests/tests/su/08/config.txt b/tests/subids/11_useradd_no_more_subgids_end/config.txt
similarity index 100%
rename from tests/tests/su/08/config.txt
rename to tests/subids/11_useradd_no_more_subgids_end/config.txt
diff --git a/tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/default/useradd b/tests/subids/11_useradd_no_more_subgids_end/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/default/useradd
rename to tests/subids/11_useradd_no_more_subgids_end/config/etc/default/useradd
diff --git a/tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/group b/tests/subids/11_useradd_no_more_subgids_end/config/etc/group
similarity index 100%
rename from tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/group
rename to tests/subids/11_useradd_no_more_subgids_end/config/etc/group
diff --git a/tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/gshadow b/tests/subids/11_useradd_no_more_subgids_end/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/gshadow
rename to tests/subids/11_useradd_no_more_subgids_end/config/etc/gshadow
diff --git a/tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/passwd b/tests/subids/11_useradd_no_more_subgids_end/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/passwd
rename to tests/subids/11_useradd_no_more_subgids_end/config/etc/passwd
diff --git a/tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/shadow b/tests/subids/11_useradd_no_more_subgids_end/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/shadow
rename to tests/subids/11_useradd_no_more_subgids_end/config/etc/shadow
diff --git a/tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/subgid b/tests/subids/11_useradd_no_more_subgids_end/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/subgid
rename to tests/subids/11_useradd_no_more_subgids_end/config/etc/subgid
diff --git a/tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/subuid b/tests/subids/11_useradd_no_more_subgids_end/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/subuid
rename to tests/subids/11_useradd_no_more_subgids_end/config/etc/subuid
diff --git a/tests/tests/subids/11_useradd_no_more_subgids_end/data/useradd.err b/tests/subids/11_useradd_no_more_subgids_end/data/useradd.err
similarity index 100%
rename from tests/tests/subids/11_useradd_no_more_subgids_end/data/useradd.err
rename to tests/subids/11_useradd_no_more_subgids_end/data/useradd.err
diff --git a/tests/tests/subids/11_useradd_no_more_subgids_end/useradd.test b/tests/subids/11_useradd_no_more_subgids_end/useradd.test
similarity index 100%
rename from tests/tests/subids/11_useradd_no_more_subgids_end/useradd.test
rename to tests/subids/11_useradd_no_more_subgids_end/useradd.test
diff --git a/tests/tests/subids/01_useradd_no_subids/config.txt b/tests/subids/12_useradd_invalid_subuid_configuration1/config.txt
similarity index 100%
rename from tests/tests/subids/01_useradd_no_subids/config.txt
rename to tests/subids/12_useradd_invalid_subuid_configuration1/config.txt
diff --git a/tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/default/useradd b/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/default/useradd
rename to tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/default/useradd
diff --git a/tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/group b/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/group
similarity index 100%
rename from tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/group
rename to tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/group
diff --git a/tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/gshadow b/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/gshadow
rename to tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/gshadow
diff --git a/tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/login.defs b/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/login.defs
similarity index 100%
rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/login.defs
rename to tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/login.defs
diff --git a/tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/passwd b/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/passwd
rename to tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/passwd
diff --git a/tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/shadow b/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/shadow
rename to tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/shadow
diff --git a/tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/subgid b/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/subgid
rename to tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/subgid
diff --git a/tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/subuid b/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/subuid
rename to tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/subuid
diff --git a/tests/tests/subids/12_useradd_invalid_subuid_configuration1/data/useradd.err b/tests/subids/12_useradd_invalid_subuid_configuration1/data/useradd.err
similarity index 100%
rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/data/useradd.err
rename to tests/subids/12_useradd_invalid_subuid_configuration1/data/useradd.err
diff --git a/tests/tests/subids/12_useradd_invalid_subuid_configuration1/useradd.test b/tests/subids/12_useradd_invalid_subuid_configuration1/useradd.test
similarity index 100%
rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/useradd.test
rename to tests/subids/12_useradd_invalid_subuid_configuration1/useradd.test
diff --git a/tests/tests/subids/02_useradd_with_subids/config.txt b/tests/subids/13_useradd_invalid_subuid_configuration2/config.txt
similarity index 100%
rename from tests/tests/subids/02_useradd_with_subids/config.txt
rename to tests/subids/13_useradd_invalid_subuid_configuration2/config.txt
diff --git a/tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/default/useradd b/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/default/useradd
rename to tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/default/useradd
diff --git a/tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/group b/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/group
similarity index 100%
rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/group
rename to tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/group
diff --git a/tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/gshadow b/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/gshadow
rename to tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/gshadow
diff --git a/tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/login.defs b/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/login.defs
similarity index 100%
rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/login.defs
rename to tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/login.defs
diff --git a/tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/passwd b/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/passwd
rename to tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/passwd
diff --git a/tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/shadow b/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/shadow
rename to tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/shadow
diff --git a/tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/subgid b/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/subgid
rename to tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/subgid
diff --git a/tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/subuid b/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/subuid
rename to tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/subuid
diff --git a/tests/tests/subids/13_useradd_invalid_subuid_configuration2/data/useradd.err b/tests/subids/13_useradd_invalid_subuid_configuration2/data/useradd.err
similarity index 100%
rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/data/useradd.err
rename to tests/subids/13_useradd_invalid_subuid_configuration2/data/useradd.err
diff --git a/tests/tests/subids/13_useradd_invalid_subuid_configuration2/useradd.test b/tests/subids/13_useradd_invalid_subuid_configuration2/useradd.test
similarity index 100%
rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/useradd.test
rename to tests/subids/13_useradd_invalid_subuid_configuration2/useradd.test
diff --git a/tests/tests/subids/03_useradd_no_subgid/config.txt b/tests/subids/14_useradd_invalid_subuid_configuration3/config.txt
similarity index 100%
rename from tests/tests/subids/03_useradd_no_subgid/config.txt
rename to tests/subids/14_useradd_invalid_subuid_configuration3/config.txt
diff --git a/tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/default/useradd b/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/default/useradd
rename to tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/default/useradd
diff --git a/tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/group b/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/group
similarity index 100%
rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/group
rename to tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/group
diff --git a/tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/gshadow b/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/gshadow
rename to tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/gshadow
diff --git a/tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/login.defs b/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/login.defs
similarity index 100%
rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/login.defs
rename to tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/login.defs
diff --git a/tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/passwd b/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/passwd
rename to tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/passwd
diff --git a/tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/shadow b/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/shadow
rename to tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/shadow
diff --git a/tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/subgid b/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/subgid
rename to tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/subgid
diff --git a/tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/subuid b/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/subuid
rename to tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/subuid
diff --git a/tests/tests/subids/14_useradd_invalid_subuid_configuration3/data/useradd.err b/tests/subids/14_useradd_invalid_subuid_configuration3/data/useradd.err
similarity index 100%
rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/data/useradd.err
rename to tests/subids/14_useradd_invalid_subuid_configuration3/data/useradd.err
diff --git a/tests/tests/subids/14_useradd_invalid_subuid_configuration3/useradd.test b/tests/subids/14_useradd_invalid_subuid_configuration3/useradd.test
similarity index 100%
rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/useradd.test
rename to tests/subids/14_useradd_invalid_subuid_configuration3/useradd.test
diff --git a/tests/tests/subids/04_useradd_no_subuid/config.txt b/tests/subids/15_useradd_invalid_subgid_configuration1/config.txt
similarity index 100%
rename from tests/tests/subids/04_useradd_no_subuid/config.txt
rename to tests/subids/15_useradd_invalid_subgid_configuration1/config.txt
diff --git a/tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/default/useradd b/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/default/useradd
rename to tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/default/useradd
diff --git a/tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/group b/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/group
similarity index 100%
rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/group
rename to tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/group
diff --git a/tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/gshadow b/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/gshadow
rename to tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/gshadow
diff --git a/tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/login.defs b/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/login.defs
similarity index 100%
rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/login.defs
rename to tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/login.defs
diff --git a/tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/passwd b/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/passwd
rename to tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/passwd
diff --git a/tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/shadow b/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/shadow
rename to tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/shadow
diff --git a/tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/subgid b/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/subgid
rename to tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/subgid
diff --git a/tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/subuid b/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/subuid
rename to tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/subuid
diff --git a/tests/tests/subids/15_useradd_invalid_subgid_configuration1/data/useradd.err b/tests/subids/15_useradd_invalid_subgid_configuration1/data/useradd.err
similarity index 100%
rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/data/useradd.err
rename to tests/subids/15_useradd_invalid_subgid_configuration1/data/useradd.err
diff --git a/tests/tests/subids/15_useradd_invalid_subgid_configuration1/useradd.test b/tests/subids/15_useradd_invalid_subgid_configuration1/useradd.test
similarity index 100%
rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/useradd.test
rename to tests/subids/15_useradd_invalid_subgid_configuration1/useradd.test
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/config.txt b/tests/subids/16_useradd_invalid_subgid_configuration2/config.txt
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/config.txt
rename to tests/subids/16_useradd_invalid_subgid_configuration2/config.txt
diff --git a/tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/default/useradd b/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/default/useradd
rename to tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/default/useradd
diff --git a/tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/group b/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/group
similarity index 100%
rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/group
rename to tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/group
diff --git a/tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/gshadow b/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/gshadow
rename to tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/gshadow
diff --git a/tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/login.defs b/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/login.defs
similarity index 100%
rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/login.defs
rename to tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/login.defs
diff --git a/tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/passwd b/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/passwd
rename to tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/passwd
diff --git a/tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/shadow b/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/shadow
rename to tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/shadow
diff --git a/tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/subgid b/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/subgid
rename to tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/subgid
diff --git a/tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/subuid b/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/subuid
rename to tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/subuid
diff --git a/tests/tests/subids/16_useradd_invalid_subgid_configuration2/data/useradd.err b/tests/subids/16_useradd_invalid_subgid_configuration2/data/useradd.err
similarity index 100%
rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/data/useradd.err
rename to tests/subids/16_useradd_invalid_subgid_configuration2/data/useradd.err
diff --git a/tests/tests/subids/16_useradd_invalid_subgid_configuration2/useradd.test b/tests/subids/16_useradd_invalid_subgid_configuration2/useradd.test
similarity index 100%
rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/useradd.test
rename to tests/subids/16_useradd_invalid_subgid_configuration2/useradd.test
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/config.txt b/tests/subids/17_useradd_invalid_subgid_configuration3/config.txt
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/config.txt
rename to tests/subids/17_useradd_invalid_subgid_configuration3/config.txt
diff --git a/tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/default/useradd b/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/default/useradd
rename to tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/default/useradd
diff --git a/tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/group b/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/group
similarity index 100%
rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/group
rename to tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/group
diff --git a/tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/gshadow b/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/gshadow
rename to tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/gshadow
diff --git a/tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/login.defs b/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/login.defs
similarity index 100%
rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/login.defs
rename to tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/login.defs
diff --git a/tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/passwd b/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/passwd
rename to tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/passwd
diff --git a/tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/shadow b/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/shadow
rename to tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/shadow
diff --git a/tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/subgid b/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/subgid
rename to tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/subgid
diff --git a/tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/subuid b/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/subuid
rename to tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/subuid
diff --git a/tests/tests/subids/17_useradd_invalid_subgid_configuration3/data/useradd.err b/tests/subids/17_useradd_invalid_subgid_configuration3/data/useradd.err
similarity index 100%
rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/data/useradd.err
rename to tests/subids/17_useradd_invalid_subgid_configuration3/data/useradd.err
diff --git a/tests/tests/subids/17_useradd_invalid_subgid_configuration3/useradd.test b/tests/subids/17_useradd_invalid_subgid_configuration3/useradd.test
similarity index 100%
rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/useradd.test
rename to tests/subids/17_useradd_invalid_subgid_configuration3/useradd.test
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/config.txt b/tests/subids/18_useradd_min=max/config.txt
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/config.txt
rename to tests/subids/18_useradd_min=max/config.txt
diff --git a/tests/tests/subids/18_useradd_min=max/config/etc/default/useradd b/tests/subids/18_useradd_min=max/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/config/etc/default/useradd
rename to tests/subids/18_useradd_min=max/config/etc/default/useradd
diff --git a/tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/group b/tests/subids/18_useradd_min=max/config/etc/group
similarity index 100%
rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/group
rename to tests/subids/18_useradd_min=max/config/etc/group
diff --git a/tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/gshadow b/tests/subids/18_useradd_min=max/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/gshadow
rename to tests/subids/18_useradd_min=max/config/etc/gshadow
diff --git a/tests/tests/subids/18_useradd_min=max/config/etc/login.defs b/tests/subids/18_useradd_min=max/config/etc/login.defs
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/config/etc/login.defs
rename to tests/subids/18_useradd_min=max/config/etc/login.defs
diff --git a/tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/passwd b/tests/subids/18_useradd_min=max/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/passwd
rename to tests/subids/18_useradd_min=max/config/etc/passwd
diff --git a/tests/tests/subids/18_useradd_min=max/config/etc/shadow b/tests/subids/18_useradd_min=max/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/config/etc/shadow
rename to tests/subids/18_useradd_min=max/config/etc/shadow
diff --git a/tests/tests/subids/18_useradd_min=max/config/etc/subgid b/tests/subids/18_useradd_min=max/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/config/etc/subgid
rename to tests/subids/18_useradd_min=max/config/etc/subgid
diff --git a/tests/tests/subids/18_useradd_min=max/config/etc/subuid b/tests/subids/18_useradd_min=max/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/config/etc/subuid
rename to tests/subids/18_useradd_min=max/config/etc/subuid
diff --git a/tests/tests/subids/05_useradd_fill_gap_start/data/group b/tests/subids/18_useradd_min=max/data/group
similarity index 100%
rename from tests/tests/subids/05_useradd_fill_gap_start/data/group
rename to tests/subids/18_useradd_min=max/data/group
diff --git a/tests/tests/subids/18_useradd_min=max/data/gshadow b/tests/subids/18_useradd_min=max/data/gshadow
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/data/gshadow
rename to tests/subids/18_useradd_min=max/data/gshadow
diff --git a/tests/tests/subids/18_useradd_min=max/data/passwd b/tests/subids/18_useradd_min=max/data/passwd
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/data/passwd
rename to tests/subids/18_useradd_min=max/data/passwd
diff --git a/tests/tests/subids/18_useradd_min=max/data/shadow b/tests/subids/18_useradd_min=max/data/shadow
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/data/shadow
rename to tests/subids/18_useradd_min=max/data/shadow
diff --git a/tests/tests/subids/18_useradd_min=max/data/subgid b/tests/subids/18_useradd_min=max/data/subgid
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/data/subgid
rename to tests/subids/18_useradd_min=max/data/subgid
diff --git a/tests/tests/subids/18_useradd_min=max/data/subuid b/tests/subids/18_useradd_min=max/data/subuid
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/data/subuid
rename to tests/subids/18_useradd_min=max/data/subuid
diff --git a/tests/tests/subids/18_useradd_min=max/useradd.test b/tests/subids/18_useradd_min=max/useradd.test
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/useradd.test
rename to tests/subids/18_useradd_min=max/useradd.test
diff --git a/tests/tests/subids/08_useradd_no_more_subuids_start/config.txt b/tests/subids/19_useradd_locked_subuid/config.txt
similarity index 100%
rename from tests/tests/subids/08_useradd_no_more_subuids_start/config.txt
rename to tests/subids/19_useradd_locked_subuid/config.txt
diff --git a/tests/tests/subids/19_useradd_locked_subuid/config/etc/default/useradd b/tests/subids/19_useradd_locked_subuid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/19_useradd_locked_subuid/config/etc/default/useradd
rename to tests/subids/19_useradd_locked_subuid/config/etc/default/useradd
diff --git a/tests/tests/subids/19_useradd_locked_subuid/config/etc/group b/tests/subids/19_useradd_locked_subuid/config/etc/group
similarity index 100%
rename from tests/tests/subids/19_useradd_locked_subuid/config/etc/group
rename to tests/subids/19_useradd_locked_subuid/config/etc/group
diff --git a/tests/tests/subids/19_useradd_locked_subuid/config/etc/gshadow b/tests/subids/19_useradd_locked_subuid/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/19_useradd_locked_subuid/config/etc/gshadow
rename to tests/subids/19_useradd_locked_subuid/config/etc/gshadow
diff --git a/tests/tests/subids/18_useradd_min=max/config/etc/passwd b/tests/subids/19_useradd_locked_subuid/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/config/etc/passwd
rename to tests/subids/19_useradd_locked_subuid/config/etc/passwd
diff --git a/tests/tests/passwd/22_passwd_usage/config/etc/shadow b/tests/subids/19_useradd_locked_subuid/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/22_passwd_usage/config/etc/shadow
rename to tests/subids/19_useradd_locked_subuid/config/etc/shadow
diff --git a/tests/tests/subids/19_useradd_locked_subuid/config/etc/subgid b/tests/subids/19_useradd_locked_subuid/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/19_useradd_locked_subuid/config/etc/subgid
rename to tests/subids/19_useradd_locked_subuid/config/etc/subgid
diff --git a/tests/tests/subids/19_useradd_locked_subuid/config/etc/subuid b/tests/subids/19_useradd_locked_subuid/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/19_useradd_locked_subuid/config/etc/subuid
rename to tests/subids/19_useradd_locked_subuid/config/etc/subuid
diff --git a/tests/tests/subids/19_useradd_locked_subuid/data/useradd.err b/tests/subids/19_useradd_locked_subuid/data/useradd.err
similarity index 100%
rename from tests/tests/subids/19_useradd_locked_subuid/data/useradd.err
rename to tests/subids/19_useradd_locked_subuid/data/useradd.err
diff --git a/tests/tests/subids/19_useradd_locked_subuid/useradd.test b/tests/subids/19_useradd_locked_subuid/useradd.test
similarity index 100%
rename from tests/tests/subids/19_useradd_locked_subuid/useradd.test
rename to tests/subids/19_useradd_locked_subuid/useradd.test
diff --git a/tests/tests/subids/09_useradd_no_more_subgids_start/config.txt b/tests/subids/20_useradd_locked_subgid/config.txt
similarity index 100%
rename from tests/tests/subids/09_useradd_no_more_subgids_start/config.txt
rename to tests/subids/20_useradd_locked_subgid/config.txt
diff --git a/tests/tests/subids/20_useradd_locked_subgid/config/etc/default/useradd b/tests/subids/20_useradd_locked_subgid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/20_useradd_locked_subgid/config/etc/default/useradd
rename to tests/subids/20_useradd_locked_subgid/config/etc/default/useradd
diff --git a/tests/tests/subids/20_useradd_locked_subgid/config/etc/group b/tests/subids/20_useradd_locked_subgid/config/etc/group
similarity index 100%
rename from tests/tests/subids/20_useradd_locked_subgid/config/etc/group
rename to tests/subids/20_useradd_locked_subgid/config/etc/group
diff --git a/tests/tests/subids/20_useradd_locked_subgid/config/etc/gshadow b/tests/subids/20_useradd_locked_subgid/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/20_useradd_locked_subgid/config/etc/gshadow
rename to tests/subids/20_useradd_locked_subgid/config/etc/gshadow
diff --git a/tests/tests/subids/19_useradd_locked_subuid/config/etc/passwd b/tests/subids/20_useradd_locked_subgid/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/19_useradd_locked_subuid/config/etc/passwd
rename to tests/subids/20_useradd_locked_subgid/config/etc/passwd
diff --git a/tests/tests/subids/19_useradd_locked_subuid/config/etc/shadow b/tests/subids/20_useradd_locked_subgid/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/19_useradd_locked_subuid/config/etc/shadow
rename to tests/subids/20_useradd_locked_subgid/config/etc/shadow
diff --git a/tests/tests/subids/20_useradd_locked_subgid/config/etc/subgid b/tests/subids/20_useradd_locked_subgid/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/20_useradd_locked_subgid/config/etc/subgid
rename to tests/subids/20_useradd_locked_subgid/config/etc/subgid
diff --git a/tests/tests/subids/20_useradd_locked_subgid/config/etc/subuid b/tests/subids/20_useradd_locked_subgid/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/20_useradd_locked_subgid/config/etc/subuid
rename to tests/subids/20_useradd_locked_subgid/config/etc/subuid
diff --git a/tests/tests/subids/20_useradd_locked_subgid/data/useradd.err b/tests/subids/20_useradd_locked_subgid/data/useradd.err
similarity index 100%
rename from tests/tests/subids/20_useradd_locked_subgid/data/useradd.err
rename to tests/subids/20_useradd_locked_subgid/data/useradd.err
diff --git a/tests/tests/subids/20_useradd_locked_subgid/useradd.test b/tests/subids/20_useradd_locked_subgid/useradd.test
similarity index 100%
rename from tests/tests/subids/20_useradd_locked_subgid/useradd.test
rename to tests/subids/20_useradd_locked_subgid/useradd.test
diff --git a/tests/tests/subids/21_usermod_create_subuid_range/config.txt b/tests/subids/21_usermod_create_subuid_range/config.txt
similarity index 100%
rename from tests/tests/subids/21_usermod_create_subuid_range/config.txt
rename to tests/subids/21_usermod_create_subuid_range/config.txt
diff --git a/tests/tests/subids/21_usermod_create_subuid_range/config/etc/default/useradd b/tests/subids/21_usermod_create_subuid_range/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/21_usermod_create_subuid_range/config/etc/default/useradd
rename to tests/subids/21_usermod_create_subuid_range/config/etc/default/useradd
diff --git a/tests/tests/log/lastlog/18_lastlog-b/config/etc/group b/tests/subids/21_usermod_create_subuid_range/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/18_lastlog-b/config/etc/group
rename to tests/subids/21_usermod_create_subuid_range/config/etc/group
diff --git a/tests/tests/log/lastlog/18_lastlog-b/config/etc/gshadow b/tests/subids/21_usermod_create_subuid_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/18_lastlog-b/config/etc/gshadow
rename to tests/subids/21_usermod_create_subuid_range/config/etc/gshadow
diff --git a/tests/tests/subids/21_usermod_create_subuid_range/config/etc/passwd b/tests/subids/21_usermod_create_subuid_range/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/21_usermod_create_subuid_range/config/etc/passwd
rename to tests/subids/21_usermod_create_subuid_range/config/etc/passwd
diff --git a/tests/tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/shadow b/tests/subids/21_usermod_create_subuid_range/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/shadow
rename to tests/subids/21_usermod_create_subuid_range/config/etc/shadow
diff --git a/tests/tests/subids/21_usermod_create_subuid_range/config/etc/subgid b/tests/subids/21_usermod_create_subuid_range/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/21_usermod_create_subuid_range/config/etc/subgid
rename to tests/subids/21_usermod_create_subuid_range/config/etc/subgid
diff --git a/tests/tests/subids/21_usermod_create_subuid_range/config/etc/subuid b/tests/subids/21_usermod_create_subuid_range/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/21_usermod_create_subuid_range/config/etc/subuid
rename to tests/subids/21_usermod_create_subuid_range/config/etc/subuid
diff --git a/tests/tests/subids/21_usermod_create_subuid_range/data/subuid b/tests/subids/21_usermod_create_subuid_range/data/subuid
similarity index 100%
rename from tests/tests/subids/21_usermod_create_subuid_range/data/subuid
rename to tests/subids/21_usermod_create_subuid_range/data/subuid
diff --git a/tests/tests/subids/21_usermod_create_subuid_range/usermod.test b/tests/subids/21_usermod_create_subuid_range/usermod.test
similarity index 100%
rename from tests/tests/subids/21_usermod_create_subuid_range/usermod.test
rename to tests/subids/21_usermod_create_subuid_range/usermod.test
diff --git a/tests/tests/subids/22_usermod_create_subgid_range/config.txt b/tests/subids/22_usermod_create_subgid_range/config.txt
similarity index 100%
rename from tests/tests/subids/22_usermod_create_subgid_range/config.txt
rename to tests/subids/22_usermod_create_subgid_range/config.txt
diff --git a/tests/tests/subids/22_usermod_create_subgid_range/config/etc/default/useradd b/tests/subids/22_usermod_create_subgid_range/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/22_usermod_create_subgid_range/config/etc/default/useradd
rename to tests/subids/22_usermod_create_subgid_range/config/etc/default/useradd
diff --git a/tests/tests/log/lastlog/19_lastlog-t_invalid/config/etc/group b/tests/subids/22_usermod_create_subgid_range/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/19_lastlog-t_invalid/config/etc/group
rename to tests/subids/22_usermod_create_subgid_range/config/etc/group
diff --git a/tests/tests/log/lastlog/19_lastlog-t_invalid/config/etc/gshadow b/tests/subids/22_usermod_create_subgid_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/19_lastlog-t_invalid/config/etc/gshadow
rename to tests/subids/22_usermod_create_subgid_range/config/etc/gshadow
diff --git a/tests/tests/subids/22_usermod_create_subgid_range/config/etc/passwd b/tests/subids/22_usermod_create_subgid_range/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/22_usermod_create_subgid_range/config/etc/passwd
rename to tests/subids/22_usermod_create_subgid_range/config/etc/passwd
diff --git a/tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/shadow b/tests/subids/22_usermod_create_subgid_range/config/etc/shadow
similarity index 100%
rename from tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/shadow
rename to tests/subids/22_usermod_create_subgid_range/config/etc/shadow
diff --git a/tests/tests/subids/22_usermod_create_subgid_range/config/etc/subgid b/tests/subids/22_usermod_create_subgid_range/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/22_usermod_create_subgid_range/config/etc/subgid
rename to tests/subids/22_usermod_create_subgid_range/config/etc/subgid
diff --git a/tests/tests/subids/22_usermod_create_subgid_range/config/etc/subuid b/tests/subids/22_usermod_create_subgid_range/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/22_usermod_create_subgid_range/config/etc/subuid
rename to tests/subids/22_usermod_create_subgid_range/config/etc/subuid
diff --git a/tests/tests/subids/22_usermod_create_subgid_range/data/subgid b/tests/subids/22_usermod_create_subgid_range/data/subgid
similarity index 100%
rename from tests/tests/subids/22_usermod_create_subgid_range/data/subgid
rename to tests/subids/22_usermod_create_subgid_range/data/subgid
diff --git a/tests/tests/subids/22_usermod_create_subgid_range/usermod.test b/tests/subids/22_usermod_create_subgid_range/usermod.test
similarity index 100%
rename from tests/tests/subids/22_usermod_create_subgid_range/usermod.test
rename to tests/subids/22_usermod_create_subgid_range/usermod.test
diff --git a/tests/tests/subids/23_usermod_create_subids_ranges/config.txt b/tests/subids/23_usermod_create_subids_ranges/config.txt
similarity index 100%
rename from tests/tests/subids/23_usermod_create_subids_ranges/config.txt
rename to tests/subids/23_usermod_create_subids_ranges/config.txt
diff --git a/tests/tests/subids/23_usermod_create_subids_ranges/config/etc/default/useradd b/tests/subids/23_usermod_create_subids_ranges/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/23_usermod_create_subids_ranges/config/etc/default/useradd
rename to tests/subids/23_usermod_create_subids_ranges/config/etc/default/useradd
diff --git a/tests/tests/log/lastlog/20_lastlog-b_invalid/config/etc/group b/tests/subids/23_usermod_create_subids_ranges/config/etc/group
similarity index 100%
rename from tests/tests/log/lastlog/20_lastlog-b_invalid/config/etc/group
rename to tests/subids/23_usermod_create_subids_ranges/config/etc/group
diff --git a/tests/tests/log/lastlog/20_lastlog-b_invalid/config/etc/gshadow b/tests/subids/23_usermod_create_subids_ranges/config/etc/gshadow
similarity index 100%
rename from tests/tests/log/lastlog/20_lastlog-b_invalid/config/etc/gshadow
rename to tests/subids/23_usermod_create_subids_ranges/config/etc/gshadow
diff --git a/tests/tests/subids/23_usermod_create_subids_ranges/config/etc/passwd b/tests/subids/23_usermod_create_subids_ranges/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/23_usermod_create_subids_ranges/config/etc/passwd
rename to tests/subids/23_usermod_create_subids_ranges/config/etc/passwd
diff --git a/tests/tests/log/faillog/01_faillog_no_faillog/config/etc/shadow b/tests/subids/23_usermod_create_subids_ranges/config/etc/shadow
similarity index 100%
rename from tests/tests/log/faillog/01_faillog_no_faillog/config/etc/shadow
rename to tests/subids/23_usermod_create_subids_ranges/config/etc/shadow
diff --git a/tests/tests/subids/23_usermod_create_subids_ranges/config/etc/subgid b/tests/subids/23_usermod_create_subids_ranges/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/23_usermod_create_subids_ranges/config/etc/subgid
rename to tests/subids/23_usermod_create_subids_ranges/config/etc/subgid
diff --git a/tests/tests/subids/23_usermod_create_subids_ranges/config/etc/subuid b/tests/subids/23_usermod_create_subids_ranges/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/23_usermod_create_subids_ranges/config/etc/subuid
rename to tests/subids/23_usermod_create_subids_ranges/config/etc/subuid
diff --git a/tests/tests/subids/23_usermod_create_subids_ranges/data/subgid b/tests/subids/23_usermod_create_subids_ranges/data/subgid
similarity index 100%
rename from tests/tests/subids/23_usermod_create_subids_ranges/data/subgid
rename to tests/subids/23_usermod_create_subids_ranges/data/subgid
diff --git a/tests/tests/subids/23_usermod_create_subids_ranges/data/subuid b/tests/subids/23_usermod_create_subids_ranges/data/subuid
similarity index 100%
rename from tests/tests/subids/23_usermod_create_subids_ranges/data/subuid
rename to tests/subids/23_usermod_create_subids_ranges/data/subuid
diff --git a/tests/tests/subids/23_usermod_create_subids_ranges/usermod.test b/tests/subids/23_usermod_create_subids_ranges/usermod.test
similarity index 100%
rename from tests/tests/subids/23_usermod_create_subids_ranges/usermod.test
rename to tests/subids/23_usermod_create_subids_ranges/usermod.test
diff --git a/tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config.txt b/tests/subids/24_usermod_create_subids_overlapping_ranges/config.txt
similarity index 100%
rename from tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config.txt
rename to tests/subids/24_usermod_create_subids_overlapping_ranges/config.txt
diff --git a/tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/default/useradd b/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/default/useradd
rename to tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/default/useradd
diff --git a/tests/tests/subids/21_usermod_create_subuid_range/config/etc/group b/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/group
similarity index 100%
rename from tests/tests/subids/21_usermod_create_subuid_range/config/etc/group
rename to tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/group
diff --git a/tests/tests/subids/21_usermod_create_subuid_range/config/etc/gshadow b/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/21_usermod_create_subuid_range/config/etc/gshadow
rename to tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/gshadow
diff --git a/tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/passwd b/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/passwd
rename to tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/passwd
diff --git a/tests/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/shadow b/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/shadow
rename to tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/shadow
diff --git a/tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/subgid b/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/subgid
rename to tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/subgid
diff --git a/tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/subuid b/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/subuid
rename to tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/subuid
diff --git a/tests/tests/subids/24_usermod_create_subids_overlapping_ranges/data/subgid b/tests/subids/24_usermod_create_subids_overlapping_ranges/data/subgid
similarity index 100%
rename from tests/tests/subids/24_usermod_create_subids_overlapping_ranges/data/subgid
rename to tests/subids/24_usermod_create_subids_overlapping_ranges/data/subgid
diff --git a/tests/tests/subids/24_usermod_create_subids_overlapping_ranges/data/subuid b/tests/subids/24_usermod_create_subids_overlapping_ranges/data/subuid
similarity index 100%
rename from tests/tests/subids/24_usermod_create_subids_overlapping_ranges/data/subuid
rename to tests/subids/24_usermod_create_subids_overlapping_ranges/data/subuid
diff --git a/tests/tests/subids/24_usermod_create_subids_overlapping_ranges/usermod.test b/tests/subids/24_usermod_create_subids_overlapping_ranges/usermod.test
similarity index 100%
rename from tests/tests/subids/24_usermod_create_subids_overlapping_ranges/usermod.test
rename to tests/subids/24_usermod_create_subids_overlapping_ranges/usermod.test
diff --git a/tests/tests/subids/25_usermod_add_range/config.txt b/tests/subids/25_usermod_add_range/config.txt
similarity index 100%
rename from tests/tests/subids/25_usermod_add_range/config.txt
rename to tests/subids/25_usermod_add_range/config.txt
diff --git a/tests/tests/subids/25_usermod_add_range/config/etc/default/useradd b/tests/subids/25_usermod_add_range/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/25_usermod_add_range/config/etc/default/useradd
rename to tests/subids/25_usermod_add_range/config/etc/default/useradd
diff --git a/tests/tests/subids/22_usermod_create_subgid_range/config/etc/group b/tests/subids/25_usermod_add_range/config/etc/group
similarity index 100%
rename from tests/tests/subids/22_usermod_create_subgid_range/config/etc/group
rename to tests/subids/25_usermod_add_range/config/etc/group
diff --git a/tests/tests/subids/22_usermod_create_subgid_range/config/etc/gshadow b/tests/subids/25_usermod_add_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/22_usermod_create_subgid_range/config/etc/gshadow
rename to tests/subids/25_usermod_add_range/config/etc/gshadow
diff --git a/tests/tests/subids/25_usermod_add_range/config/etc/passwd b/tests/subids/25_usermod_add_range/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/25_usermod_add_range/config/etc/passwd
rename to tests/subids/25_usermod_add_range/config/etc/passwd
diff --git a/tests/tests/log/lastlog/03_lastlog_format/config/etc/shadow b/tests/subids/25_usermod_add_range/config/etc/shadow
similarity index 100%
rename from tests/tests/log/lastlog/03_lastlog_format/config/etc/shadow
rename to tests/subids/25_usermod_add_range/config/etc/shadow
diff --git a/tests/tests/subids/25_usermod_add_range/config/etc/subgid b/tests/subids/25_usermod_add_range/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/25_usermod_add_range/config/etc/subgid
rename to tests/subids/25_usermod_add_range/config/etc/subgid
diff --git a/tests/tests/subids/25_usermod_add_range/config/etc/subuid b/tests/subids/25_usermod_add_range/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/25_usermod_add_range/config/etc/subuid
rename to tests/subids/25_usermod_add_range/config/etc/subuid
diff --git a/tests/tests/subids/25_usermod_add_range/data/subgid b/tests/subids/25_usermod_add_range/data/subgid
similarity index 100%
rename from tests/tests/subids/25_usermod_add_range/data/subgid
rename to tests/subids/25_usermod_add_range/data/subgid
diff --git a/tests/tests/subids/25_usermod_add_range/data/subuid b/tests/subids/25_usermod_add_range/data/subuid
similarity index 100%
rename from tests/tests/subids/25_usermod_add_range/data/subuid
rename to tests/subids/25_usermod_add_range/data/subuid
diff --git a/tests/tests/subids/25_usermod_add_range/usermod.test b/tests/subids/25_usermod_add_range/usermod.test
similarity index 100%
rename from tests/tests/subids/25_usermod_add_range/usermod.test
rename to tests/subids/25_usermod_add_range/usermod.test
diff --git a/tests/tests/subids/26_usermod_add_overlapping_ranges/config.txt b/tests/subids/26_usermod_add_overlapping_ranges/config.txt
similarity index 100%
rename from tests/tests/subids/26_usermod_add_overlapping_ranges/config.txt
rename to tests/subids/26_usermod_add_overlapping_ranges/config.txt
diff --git a/tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/default/useradd b/tests/subids/26_usermod_add_overlapping_ranges/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/default/useradd
rename to tests/subids/26_usermod_add_overlapping_ranges/config/etc/default/useradd
diff --git a/tests/tests/subids/23_usermod_create_subids_ranges/config/etc/group b/tests/subids/26_usermod_add_overlapping_ranges/config/etc/group
similarity index 100%
rename from tests/tests/subids/23_usermod_create_subids_ranges/config/etc/group
rename to tests/subids/26_usermod_add_overlapping_ranges/config/etc/group
diff --git a/tests/tests/subids/23_usermod_create_subids_ranges/config/etc/gshadow b/tests/subids/26_usermod_add_overlapping_ranges/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/23_usermod_create_subids_ranges/config/etc/gshadow
rename to tests/subids/26_usermod_add_overlapping_ranges/config/etc/gshadow
diff --git a/tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/passwd b/tests/subids/26_usermod_add_overlapping_ranges/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/passwd
rename to tests/subids/26_usermod_add_overlapping_ranges/config/etc/passwd
diff --git a/tests/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/shadow b/tests/subids/26_usermod_add_overlapping_ranges/config/etc/shadow
similarity index 100%
rename from tests/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/shadow
rename to tests/subids/26_usermod_add_overlapping_ranges/config/etc/shadow
diff --git a/tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/subgid b/tests/subids/26_usermod_add_overlapping_ranges/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/subgid
rename to tests/subids/26_usermod_add_overlapping_ranges/config/etc/subgid
diff --git a/tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/subuid b/tests/subids/26_usermod_add_overlapping_ranges/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/subuid
rename to tests/subids/26_usermod_add_overlapping_ranges/config/etc/subuid
diff --git a/tests/tests/subids/26_usermod_add_overlapping_ranges/data/subgid b/tests/subids/26_usermod_add_overlapping_ranges/data/subgid
similarity index 100%
rename from tests/tests/subids/26_usermod_add_overlapping_ranges/data/subgid
rename to tests/subids/26_usermod_add_overlapping_ranges/data/subgid
diff --git a/tests/tests/subids/26_usermod_add_overlapping_ranges/data/subuid b/tests/subids/26_usermod_add_overlapping_ranges/data/subuid
similarity index 100%
rename from tests/tests/subids/26_usermod_add_overlapping_ranges/data/subuid
rename to tests/subids/26_usermod_add_overlapping_ranges/data/subuid
diff --git a/tests/tests/subids/26_usermod_add_overlapping_ranges/usermod.test b/tests/subids/26_usermod_add_overlapping_ranges/usermod.test
similarity index 100%
rename from tests/tests/subids/26_usermod_add_overlapping_ranges/usermod.test
rename to tests/subids/26_usermod_add_overlapping_ranges/usermod.test
diff --git a/tests/tests/subids/27_usermod_remove_range_all/config.txt b/tests/subids/27_usermod_remove_range_all/config.txt
similarity index 100%
rename from tests/tests/subids/27_usermod_remove_range_all/config.txt
rename to tests/subids/27_usermod_remove_range_all/config.txt
diff --git a/tests/tests/subids/27_usermod_remove_range_all/config/etc/default/useradd b/tests/subids/27_usermod_remove_range_all/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/27_usermod_remove_range_all/config/etc/default/useradd
rename to tests/subids/27_usermod_remove_range_all/config/etc/default/useradd
diff --git a/tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/group b/tests/subids/27_usermod_remove_range_all/config/etc/group
similarity index 100%
rename from tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/group
rename to tests/subids/27_usermod_remove_range_all/config/etc/group
diff --git a/tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/gshadow b/tests/subids/27_usermod_remove_range_all/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/gshadow
rename to tests/subids/27_usermod_remove_range_all/config/etc/gshadow
diff --git a/tests/tests/subids/27_usermod_remove_range_all/config/etc/passwd b/tests/subids/27_usermod_remove_range_all/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/27_usermod_remove_range_all/config/etc/passwd
rename to tests/subids/27_usermod_remove_range_all/config/etc/passwd
diff --git a/tests/tests/subids/21_usermod_create_subuid_range/config/etc/shadow b/tests/subids/27_usermod_remove_range_all/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/21_usermod_create_subuid_range/config/etc/shadow
rename to tests/subids/27_usermod_remove_range_all/config/etc/shadow
diff --git a/tests/tests/subids/27_usermod_remove_range_all/config/etc/subgid b/tests/subids/27_usermod_remove_range_all/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/27_usermod_remove_range_all/config/etc/subgid
rename to tests/subids/27_usermod_remove_range_all/config/etc/subgid
diff --git a/tests/tests/subids/27_usermod_remove_range_all/config/etc/subuid b/tests/subids/27_usermod_remove_range_all/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/27_usermod_remove_range_all/config/etc/subuid
rename to tests/subids/27_usermod_remove_range_all/config/etc/subuid
diff --git a/tests/tests/subids/27_usermod_remove_range_all/data/subgid b/tests/subids/27_usermod_remove_range_all/data/subgid
similarity index 100%
rename from tests/tests/subids/27_usermod_remove_range_all/data/subgid
rename to tests/subids/27_usermod_remove_range_all/data/subgid
diff --git a/tests/tests/subids/27_usermod_remove_range_all/data/subuid b/tests/subids/27_usermod_remove_range_all/data/subuid
similarity index 100%
rename from tests/tests/subids/27_usermod_remove_range_all/data/subuid
rename to tests/subids/27_usermod_remove_range_all/data/subuid
diff --git a/tests/tests/subids/27_usermod_remove_range_all/usermod.test b/tests/subids/27_usermod_remove_range_all/usermod.test
similarity index 100%
rename from tests/tests/subids/27_usermod_remove_range_all/usermod.test
rename to tests/subids/27_usermod_remove_range_all/usermod.test
diff --git a/tests/tests/subids/28_usermod_remove_range_partial_begin/config.txt b/tests/subids/28_usermod_remove_range_partial_begin/config.txt
similarity index 100%
rename from tests/tests/subids/28_usermod_remove_range_partial_begin/config.txt
rename to tests/subids/28_usermod_remove_range_partial_begin/config.txt
diff --git a/tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/default/useradd b/tests/subids/28_usermod_remove_range_partial_begin/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/default/useradd
rename to tests/subids/28_usermod_remove_range_partial_begin/config/etc/default/useradd
diff --git a/tests/tests/subids/25_usermod_add_range/config/etc/group b/tests/subids/28_usermod_remove_range_partial_begin/config/etc/group
similarity index 100%
rename from tests/tests/subids/25_usermod_add_range/config/etc/group
rename to tests/subids/28_usermod_remove_range_partial_begin/config/etc/group
diff --git a/tests/tests/subids/25_usermod_add_range/config/etc/gshadow b/tests/subids/28_usermod_remove_range_partial_begin/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/25_usermod_add_range/config/etc/gshadow
rename to tests/subids/28_usermod_remove_range_partial_begin/config/etc/gshadow
diff --git a/tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/passwd b/tests/subids/28_usermod_remove_range_partial_begin/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/passwd
rename to tests/subids/28_usermod_remove_range_partial_begin/config/etc/passwd
diff --git a/tests/tests/subids/22_usermod_create_subgid_range/config/etc/shadow b/tests/subids/28_usermod_remove_range_partial_begin/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/22_usermod_create_subgid_range/config/etc/shadow
rename to tests/subids/28_usermod_remove_range_partial_begin/config/etc/shadow
diff --git a/tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/subgid b/tests/subids/28_usermod_remove_range_partial_begin/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/subgid
rename to tests/subids/28_usermod_remove_range_partial_begin/config/etc/subgid
diff --git a/tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/subuid b/tests/subids/28_usermod_remove_range_partial_begin/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/subuid
rename to tests/subids/28_usermod_remove_range_partial_begin/config/etc/subuid
diff --git a/tests/tests/subids/28_usermod_remove_range_partial_begin/data/subgid b/tests/subids/28_usermod_remove_range_partial_begin/data/subgid
similarity index 100%
rename from tests/tests/subids/28_usermod_remove_range_partial_begin/data/subgid
rename to tests/subids/28_usermod_remove_range_partial_begin/data/subgid
diff --git a/tests/tests/subids/28_usermod_remove_range_partial_begin/data/subuid b/tests/subids/28_usermod_remove_range_partial_begin/data/subuid
similarity index 100%
rename from tests/tests/subids/28_usermod_remove_range_partial_begin/data/subuid
rename to tests/subids/28_usermod_remove_range_partial_begin/data/subuid
diff --git a/tests/tests/subids/28_usermod_remove_range_partial_begin/usermod.test b/tests/subids/28_usermod_remove_range_partial_begin/usermod.test
similarity index 100%
rename from tests/tests/subids/28_usermod_remove_range_partial_begin/usermod.test
rename to tests/subids/28_usermod_remove_range_partial_begin/usermod.test
diff --git a/tests/tests/subids/29_usermod_remove_range_partial_middle/config.txt b/tests/subids/29_usermod_remove_range_partial_middle/config.txt
similarity index 100%
rename from tests/tests/subids/29_usermod_remove_range_partial_middle/config.txt
rename to tests/subids/29_usermod_remove_range_partial_middle/config.txt
diff --git a/tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/default/useradd b/tests/subids/29_usermod_remove_range_partial_middle/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/default/useradd
rename to tests/subids/29_usermod_remove_range_partial_middle/config/etc/default/useradd
diff --git a/tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/group b/tests/subids/29_usermod_remove_range_partial_middle/config/etc/group
similarity index 100%
rename from tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/group
rename to tests/subids/29_usermod_remove_range_partial_middle/config/etc/group
diff --git a/tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/gshadow b/tests/subids/29_usermod_remove_range_partial_middle/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/gshadow
rename to tests/subids/29_usermod_remove_range_partial_middle/config/etc/gshadow
diff --git a/tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/passwd b/tests/subids/29_usermod_remove_range_partial_middle/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/passwd
rename to tests/subids/29_usermod_remove_range_partial_middle/config/etc/passwd
diff --git a/tests/tests/subids/23_usermod_create_subids_ranges/config/etc/shadow b/tests/subids/29_usermod_remove_range_partial_middle/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/23_usermod_create_subids_ranges/config/etc/shadow
rename to tests/subids/29_usermod_remove_range_partial_middle/config/etc/shadow
diff --git a/tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/subgid b/tests/subids/29_usermod_remove_range_partial_middle/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/subgid
rename to tests/subids/29_usermod_remove_range_partial_middle/config/etc/subgid
diff --git a/tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/subuid b/tests/subids/29_usermod_remove_range_partial_middle/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/subuid
rename to tests/subids/29_usermod_remove_range_partial_middle/config/etc/subuid
diff --git a/tests/tests/subids/29_usermod_remove_range_partial_middle/data/subgid b/tests/subids/29_usermod_remove_range_partial_middle/data/subgid
similarity index 100%
rename from tests/tests/subids/29_usermod_remove_range_partial_middle/data/subgid
rename to tests/subids/29_usermod_remove_range_partial_middle/data/subgid
diff --git a/tests/tests/subids/29_usermod_remove_range_partial_middle/data/subuid b/tests/subids/29_usermod_remove_range_partial_middle/data/subuid
similarity index 100%
rename from tests/tests/subids/29_usermod_remove_range_partial_middle/data/subuid
rename to tests/subids/29_usermod_remove_range_partial_middle/data/subuid
diff --git a/tests/tests/subids/29_usermod_remove_range_partial_middle/usermod.test b/tests/subids/29_usermod_remove_range_partial_middle/usermod.test
similarity index 100%
rename from tests/tests/subids/29_usermod_remove_range_partial_middle/usermod.test
rename to tests/subids/29_usermod_remove_range_partial_middle/usermod.test
diff --git a/tests/tests/subids/30_usermod_remove_range_partial_end/config.txt b/tests/subids/30_usermod_remove_range_partial_end/config.txt
similarity index 100%
rename from tests/tests/subids/30_usermod_remove_range_partial_end/config.txt
rename to tests/subids/30_usermod_remove_range_partial_end/config.txt
diff --git a/tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/default/useradd b/tests/subids/30_usermod_remove_range_partial_end/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/default/useradd
rename to tests/subids/30_usermod_remove_range_partial_end/config/etc/default/useradd
diff --git a/tests/tests/subids/27_usermod_remove_range_all/config/etc/group b/tests/subids/30_usermod_remove_range_partial_end/config/etc/group
similarity index 100%
rename from tests/tests/subids/27_usermod_remove_range_all/config/etc/group
rename to tests/subids/30_usermod_remove_range_partial_end/config/etc/group
diff --git a/tests/tests/subids/27_usermod_remove_range_all/config/etc/gshadow b/tests/subids/30_usermod_remove_range_partial_end/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/27_usermod_remove_range_all/config/etc/gshadow
rename to tests/subids/30_usermod_remove_range_partial_end/config/etc/gshadow
diff --git a/tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/passwd b/tests/subids/30_usermod_remove_range_partial_end/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/passwd
rename to tests/subids/30_usermod_remove_range_partial_end/config/etc/passwd
diff --git a/tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/shadow b/tests/subids/30_usermod_remove_range_partial_end/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/shadow
rename to tests/subids/30_usermod_remove_range_partial_end/config/etc/shadow
diff --git a/tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/subgid b/tests/subids/30_usermod_remove_range_partial_end/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/subgid
rename to tests/subids/30_usermod_remove_range_partial_end/config/etc/subgid
diff --git a/tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/subuid b/tests/subids/30_usermod_remove_range_partial_end/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/subuid
rename to tests/subids/30_usermod_remove_range_partial_end/config/etc/subuid
diff --git a/tests/tests/subids/30_usermod_remove_range_partial_end/data/subgid b/tests/subids/30_usermod_remove_range_partial_end/data/subgid
similarity index 100%
rename from tests/tests/subids/30_usermod_remove_range_partial_end/data/subgid
rename to tests/subids/30_usermod_remove_range_partial_end/data/subgid
diff --git a/tests/tests/subids/30_usermod_remove_range_partial_end/data/subuid b/tests/subids/30_usermod_remove_range_partial_end/data/subuid
similarity index 100%
rename from tests/tests/subids/30_usermod_remove_range_partial_end/data/subuid
rename to tests/subids/30_usermod_remove_range_partial_end/data/subuid
diff --git a/tests/tests/subids/30_usermod_remove_range_partial_end/usermod.test b/tests/subids/30_usermod_remove_range_partial_end/usermod.test
similarity index 100%
rename from tests/tests/subids/30_usermod_remove_range_partial_end/usermod.test
rename to tests/subids/30_usermod_remove_range_partial_end/usermod.test
diff --git a/tests/tests/subids/31_usermod_remove_outside_range/config.txt b/tests/subids/31_usermod_remove_outside_range/config.txt
similarity index 100%
rename from tests/tests/subids/31_usermod_remove_outside_range/config.txt
rename to tests/subids/31_usermod_remove_outside_range/config.txt
diff --git a/tests/tests/subids/31_usermod_remove_outside_range/config/etc/default/useradd b/tests/subids/31_usermod_remove_outside_range/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/31_usermod_remove_outside_range/config/etc/default/useradd
rename to tests/subids/31_usermod_remove_outside_range/config/etc/default/useradd
diff --git a/tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/group b/tests/subids/31_usermod_remove_outside_range/config/etc/group
similarity index 100%
rename from tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/group
rename to tests/subids/31_usermod_remove_outside_range/config/etc/group
diff --git a/tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/gshadow b/tests/subids/31_usermod_remove_outside_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/gshadow
rename to tests/subids/31_usermod_remove_outside_range/config/etc/gshadow
diff --git a/tests/tests/subids/31_usermod_remove_outside_range/config/etc/passwd b/tests/subids/31_usermod_remove_outside_range/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/31_usermod_remove_outside_range/config/etc/passwd
rename to tests/subids/31_usermod_remove_outside_range/config/etc/passwd
diff --git a/tests/tests/subids/25_usermod_add_range/config/etc/shadow b/tests/subids/31_usermod_remove_outside_range/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/25_usermod_add_range/config/etc/shadow
rename to tests/subids/31_usermod_remove_outside_range/config/etc/shadow
diff --git a/tests/tests/subids/31_usermod_remove_outside_range/config/etc/subgid b/tests/subids/31_usermod_remove_outside_range/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/31_usermod_remove_outside_range/config/etc/subgid
rename to tests/subids/31_usermod_remove_outside_range/config/etc/subgid
diff --git a/tests/tests/subids/31_usermod_remove_outside_range/config/etc/subuid b/tests/subids/31_usermod_remove_outside_range/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/31_usermod_remove_outside_range/config/etc/subuid
rename to tests/subids/31_usermod_remove_outside_range/config/etc/subuid
diff --git a/tests/tests/subids/31_usermod_remove_outside_range/data/subgid b/tests/subids/31_usermod_remove_outside_range/data/subgid
similarity index 100%
rename from tests/tests/subids/31_usermod_remove_outside_range/data/subgid
rename to tests/subids/31_usermod_remove_outside_range/data/subgid
diff --git a/tests/tests/subids/31_usermod_remove_outside_range/data/subuid b/tests/subids/31_usermod_remove_outside_range/data/subuid
similarity index 100%
rename from tests/tests/subids/31_usermod_remove_outside_range/data/subuid
rename to tests/subids/31_usermod_remove_outside_range/data/subuid
diff --git a/tests/tests/subids/31_usermod_remove_outside_range/usermod.test b/tests/subids/31_usermod_remove_outside_range/usermod.test
similarity index 100%
rename from tests/tests/subids/31_usermod_remove_outside_range/usermod.test
rename to tests/subids/31_usermod_remove_outside_range/usermod.test
diff --git a/tests/tests/subids/32_usermod_remove_overlapping_range_begin/config.txt b/tests/subids/32_usermod_remove_overlapping_range_begin/config.txt
similarity index 100%
rename from tests/tests/subids/32_usermod_remove_overlapping_range_begin/config.txt
rename to tests/subids/32_usermod_remove_overlapping_range_begin/config.txt
diff --git a/tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/default/useradd b/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/default/useradd
rename to tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/default/useradd
diff --git a/tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/group b/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/group
similarity index 100%
rename from tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/group
rename to tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/group
diff --git a/tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/gshadow b/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/gshadow
rename to tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/gshadow
diff --git a/tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/passwd b/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/passwd
rename to tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/passwd
diff --git a/tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/shadow b/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/shadow
rename to tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/shadow
diff --git a/tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/subgid b/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/subgid
rename to tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/subgid
diff --git a/tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/subuid b/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/subuid
rename to tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/subuid
diff --git a/tests/tests/subids/32_usermod_remove_overlapping_range_begin/data/subgid b/tests/subids/32_usermod_remove_overlapping_range_begin/data/subgid
similarity index 100%
rename from tests/tests/subids/32_usermod_remove_overlapping_range_begin/data/subgid
rename to tests/subids/32_usermod_remove_overlapping_range_begin/data/subgid
diff --git a/tests/tests/subids/32_usermod_remove_overlapping_range_begin/data/subuid b/tests/subids/32_usermod_remove_overlapping_range_begin/data/subuid
similarity index 100%
rename from tests/tests/subids/32_usermod_remove_overlapping_range_begin/data/subuid
rename to tests/subids/32_usermod_remove_overlapping_range_begin/data/subuid
diff --git a/tests/tests/subids/32_usermod_remove_overlapping_range_begin/usermod.test b/tests/subids/32_usermod_remove_overlapping_range_begin/usermod.test
similarity index 100%
rename from tests/tests/subids/32_usermod_remove_overlapping_range_begin/usermod.test
rename to tests/subids/32_usermod_remove_overlapping_range_begin/usermod.test
diff --git a/tests/tests/subids/33_usermod_remove_overlapping_range_end/config.txt b/tests/subids/33_usermod_remove_overlapping_range_end/config.txt
similarity index 100%
rename from tests/tests/subids/33_usermod_remove_overlapping_range_end/config.txt
rename to tests/subids/33_usermod_remove_overlapping_range_end/config.txt
diff --git a/tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/default/useradd b/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/default/useradd
rename to tests/subids/33_usermod_remove_overlapping_range_end/config/etc/default/useradd
diff --git a/tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/group b/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/group
similarity index 100%
rename from tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/group
rename to tests/subids/33_usermod_remove_overlapping_range_end/config/etc/group
diff --git a/tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/gshadow b/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/gshadow
rename to tests/subids/33_usermod_remove_overlapping_range_end/config/etc/gshadow
diff --git a/tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/passwd b/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/passwd
rename to tests/subids/33_usermod_remove_overlapping_range_end/config/etc/passwd
diff --git a/tests/tests/subids/27_usermod_remove_range_all/config/etc/shadow b/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/27_usermod_remove_range_all/config/etc/shadow
rename to tests/subids/33_usermod_remove_overlapping_range_end/config/etc/shadow
diff --git a/tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/subgid b/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/subgid
rename to tests/subids/33_usermod_remove_overlapping_range_end/config/etc/subgid
diff --git a/tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/subuid b/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/subuid
rename to tests/subids/33_usermod_remove_overlapping_range_end/config/etc/subuid
diff --git a/tests/tests/subids/33_usermod_remove_overlapping_range_end/data/subgid b/tests/subids/33_usermod_remove_overlapping_range_end/data/subgid
similarity index 100%
rename from tests/tests/subids/33_usermod_remove_overlapping_range_end/data/subgid
rename to tests/subids/33_usermod_remove_overlapping_range_end/data/subgid
diff --git a/tests/tests/subids/33_usermod_remove_overlapping_range_end/data/subuid b/tests/subids/33_usermod_remove_overlapping_range_end/data/subuid
similarity index 100%
rename from tests/tests/subids/33_usermod_remove_overlapping_range_end/data/subuid
rename to tests/subids/33_usermod_remove_overlapping_range_end/data/subuid
diff --git a/tests/tests/subids/33_usermod_remove_overlapping_range_end/usermod.test b/tests/subids/33_usermod_remove_overlapping_range_end/usermod.test
similarity index 100%
rename from tests/tests/subids/33_usermod_remove_overlapping_range_end/usermod.test
rename to tests/subids/33_usermod_remove_overlapping_range_end/usermod.test
diff --git a/tests/tests/subids/34_usermod_remove_overlapping_range_all/config.txt b/tests/subids/34_usermod_remove_overlapping_range_all/config.txt
similarity index 100%
rename from tests/tests/subids/34_usermod_remove_overlapping_range_all/config.txt
rename to tests/subids/34_usermod_remove_overlapping_range_all/config.txt
diff --git a/tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/default/useradd b/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/default/useradd
rename to tests/subids/34_usermod_remove_overlapping_range_all/config/etc/default/useradd
diff --git a/tests/tests/subids/31_usermod_remove_outside_range/config/etc/group b/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/group
similarity index 100%
rename from tests/tests/subids/31_usermod_remove_outside_range/config/etc/group
rename to tests/subids/34_usermod_remove_overlapping_range_all/config/etc/group
diff --git a/tests/tests/subids/31_usermod_remove_outside_range/config/etc/gshadow b/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/31_usermod_remove_outside_range/config/etc/gshadow
rename to tests/subids/34_usermod_remove_overlapping_range_all/config/etc/gshadow
diff --git a/tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/passwd b/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/passwd
rename to tests/subids/34_usermod_remove_overlapping_range_all/config/etc/passwd
diff --git a/tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/shadow b/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/shadow
rename to tests/subids/34_usermod_remove_overlapping_range_all/config/etc/shadow
diff --git a/tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/subgid b/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/subgid
rename to tests/subids/34_usermod_remove_overlapping_range_all/config/etc/subgid
diff --git a/tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/subuid b/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/subuid
rename to tests/subids/34_usermod_remove_overlapping_range_all/config/etc/subuid
diff --git a/tests/tests/subids/34_usermod_remove_overlapping_range_all/data/subgid b/tests/subids/34_usermod_remove_overlapping_range_all/data/subgid
similarity index 100%
rename from tests/tests/subids/34_usermod_remove_overlapping_range_all/data/subgid
rename to tests/subids/34_usermod_remove_overlapping_range_all/data/subgid
diff --git a/tests/tests/subids/34_usermod_remove_overlapping_range_all/data/subuid b/tests/subids/34_usermod_remove_overlapping_range_all/data/subuid
similarity index 100%
rename from tests/tests/subids/34_usermod_remove_overlapping_range_all/data/subuid
rename to tests/subids/34_usermod_remove_overlapping_range_all/data/subuid
diff --git a/tests/tests/subids/34_usermod_remove_overlapping_range_all/usermod.test b/tests/subids/34_usermod_remove_overlapping_range_all/usermod.test
similarity index 100%
rename from tests/tests/subids/34_usermod_remove_overlapping_range_all/usermod.test
rename to tests/subids/34_usermod_remove_overlapping_range_all/usermod.test
diff --git a/tests/tests/subids/35_usermod_remove_only_user_ranges/config.txt b/tests/subids/35_usermod_remove_only_user_ranges/config.txt
similarity index 100%
rename from tests/tests/subids/35_usermod_remove_only_user_ranges/config.txt
rename to tests/subids/35_usermod_remove_only_user_ranges/config.txt
diff --git a/tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/default/useradd b/tests/subids/35_usermod_remove_only_user_ranges/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/default/useradd
rename to tests/subids/35_usermod_remove_only_user_ranges/config/etc/default/useradd
diff --git a/tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/group b/tests/subids/35_usermod_remove_only_user_ranges/config/etc/group
similarity index 100%
rename from tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/group
rename to tests/subids/35_usermod_remove_only_user_ranges/config/etc/group
diff --git a/tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/gshadow b/tests/subids/35_usermod_remove_only_user_ranges/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/gshadow
rename to tests/subids/35_usermod_remove_only_user_ranges/config/etc/gshadow
diff --git a/tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/passwd b/tests/subids/35_usermod_remove_only_user_ranges/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/passwd
rename to tests/subids/35_usermod_remove_only_user_ranges/config/etc/passwd
diff --git a/tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/shadow b/tests/subids/35_usermod_remove_only_user_ranges/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/shadow
rename to tests/subids/35_usermod_remove_only_user_ranges/config/etc/shadow
diff --git a/tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/subgid b/tests/subids/35_usermod_remove_only_user_ranges/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/subgid
rename to tests/subids/35_usermod_remove_only_user_ranges/config/etc/subgid
diff --git a/tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/subuid b/tests/subids/35_usermod_remove_only_user_ranges/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/subuid
rename to tests/subids/35_usermod_remove_only_user_ranges/config/etc/subuid
diff --git a/tests/tests/subids/35_usermod_remove_only_user_ranges/data/subgid b/tests/subids/35_usermod_remove_only_user_ranges/data/subgid
similarity index 100%
rename from tests/tests/subids/35_usermod_remove_only_user_ranges/data/subgid
rename to tests/subids/35_usermod_remove_only_user_ranges/data/subgid
diff --git a/tests/tests/subids/35_usermod_remove_only_user_ranges/data/subuid b/tests/subids/35_usermod_remove_only_user_ranges/data/subuid
similarity index 100%
rename from tests/tests/subids/35_usermod_remove_only_user_ranges/data/subuid
rename to tests/subids/35_usermod_remove_only_user_ranges/data/subuid
diff --git a/tests/tests/subids/35_usermod_remove_only_user_ranges/usermod.test b/tests/subids/35_usermod_remove_only_user_ranges/usermod.test
similarity index 100%
rename from tests/tests/subids/35_usermod_remove_only_user_ranges/usermod.test
rename to tests/subids/35_usermod_remove_only_user_ranges/usermod.test
diff --git a/tests/tests/subids/36_usermod_remove_with_comment/config.txt b/tests/subids/36_usermod_remove_with_comment/config.txt
similarity index 100%
rename from tests/tests/subids/36_usermod_remove_with_comment/config.txt
rename to tests/subids/36_usermod_remove_with_comment/config.txt
diff --git a/tests/tests/subids/36_usermod_remove_with_comment/config/etc/default/useradd b/tests/subids/36_usermod_remove_with_comment/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/36_usermod_remove_with_comment/config/etc/default/useradd
rename to tests/subids/36_usermod_remove_with_comment/config/etc/default/useradd
diff --git a/tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/group b/tests/subids/36_usermod_remove_with_comment/config/etc/group
similarity index 100%
rename from tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/group
rename to tests/subids/36_usermod_remove_with_comment/config/etc/group
diff --git a/tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/gshadow b/tests/subids/36_usermod_remove_with_comment/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/gshadow
rename to tests/subids/36_usermod_remove_with_comment/config/etc/gshadow
diff --git a/tests/tests/subids/36_usermod_remove_with_comment/config/etc/passwd b/tests/subids/36_usermod_remove_with_comment/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/36_usermod_remove_with_comment/config/etc/passwd
rename to tests/subids/36_usermod_remove_with_comment/config/etc/passwd
diff --git a/tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/shadow b/tests/subids/36_usermod_remove_with_comment/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/shadow
rename to tests/subids/36_usermod_remove_with_comment/config/etc/shadow
diff --git a/tests/tests/subids/36_usermod_remove_with_comment/config/etc/subgid b/tests/subids/36_usermod_remove_with_comment/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/36_usermod_remove_with_comment/config/etc/subgid
rename to tests/subids/36_usermod_remove_with_comment/config/etc/subgid
diff --git a/tests/tests/subids/36_usermod_remove_with_comment/config/etc/subuid b/tests/subids/36_usermod_remove_with_comment/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/36_usermod_remove_with_comment/config/etc/subuid
rename to tests/subids/36_usermod_remove_with_comment/config/etc/subuid
diff --git a/tests/tests/subids/36_usermod_remove_with_comment/data/subgid b/tests/subids/36_usermod_remove_with_comment/data/subgid
similarity index 100%
rename from tests/tests/subids/36_usermod_remove_with_comment/data/subgid
rename to tests/subids/36_usermod_remove_with_comment/data/subgid
diff --git a/tests/tests/subids/36_usermod_remove_with_comment/data/subuid b/tests/subids/36_usermod_remove_with_comment/data/subuid
similarity index 100%
rename from tests/tests/subids/36_usermod_remove_with_comment/data/subuid
rename to tests/subids/36_usermod_remove_with_comment/data/subuid
diff --git a/tests/tests/subids/36_usermod_remove_with_comment/usermod.test b/tests/subids/36_usermod_remove_with_comment/usermod.test
similarity index 100%
rename from tests/tests/subids/36_usermod_remove_with_comment/usermod.test
rename to tests/subids/36_usermod_remove_with_comment/usermod.test
diff --git a/tests/tests/subids/37_usermod_-v_invalid_range/config.txt b/tests/subids/37_usermod_-v_invalid_range/config.txt
similarity index 100%
rename from tests/tests/subids/37_usermod_-v_invalid_range/config.txt
rename to tests/subids/37_usermod_-v_invalid_range/config.txt
diff --git a/tests/tests/subids/37_usermod_-v_invalid_range/config/etc/default/useradd b/tests/subids/37_usermod_-v_invalid_range/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/37_usermod_-v_invalid_range/config/etc/default/useradd
rename to tests/subids/37_usermod_-v_invalid_range/config/etc/default/useradd
diff --git a/tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/group b/tests/subids/37_usermod_-v_invalid_range/config/etc/group
similarity index 100%
rename from tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/group
rename to tests/subids/37_usermod_-v_invalid_range/config/etc/group
diff --git a/tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/gshadow b/tests/subids/37_usermod_-v_invalid_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/gshadow
rename to tests/subids/37_usermod_-v_invalid_range/config/etc/gshadow
diff --git a/tests/tests/subids/37_usermod_-v_invalid_range/config/etc/passwd b/tests/subids/37_usermod_-v_invalid_range/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/37_usermod_-v_invalid_range/config/etc/passwd
rename to tests/subids/37_usermod_-v_invalid_range/config/etc/passwd
diff --git a/tests/tests/subids/31_usermod_remove_outside_range/config/etc/shadow b/tests/subids/37_usermod_-v_invalid_range/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/31_usermod_remove_outside_range/config/etc/shadow
rename to tests/subids/37_usermod_-v_invalid_range/config/etc/shadow
diff --git a/tests/tests/subids/37_usermod_-v_invalid_range/config/etc/subgid b/tests/subids/37_usermod_-v_invalid_range/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/37_usermod_-v_invalid_range/config/etc/subgid
rename to tests/subids/37_usermod_-v_invalid_range/config/etc/subgid
diff --git a/tests/tests/subids/37_usermod_-v_invalid_range/config/etc/subuid b/tests/subids/37_usermod_-v_invalid_range/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/37_usermod_-v_invalid_range/config/etc/subuid
rename to tests/subids/37_usermod_-v_invalid_range/config/etc/subuid
diff --git a/tests/tests/subids/37_usermod_-v_invalid_range/data/usermod.err b/tests/subids/37_usermod_-v_invalid_range/data/usermod.err
similarity index 100%
rename from tests/tests/subids/37_usermod_-v_invalid_range/data/usermod.err
rename to tests/subids/37_usermod_-v_invalid_range/data/usermod.err
diff --git a/tests/tests/subids/37_usermod_-v_invalid_range/usermod.test b/tests/subids/37_usermod_-v_invalid_range/usermod.test
similarity index 100%
rename from tests/tests/subids/37_usermod_-v_invalid_range/usermod.test
rename to tests/subids/37_usermod_-v_invalid_range/usermod.test
diff --git a/tests/tests/subids/38_usermod_-V_invalid_range/config.txt b/tests/subids/38_usermod_-V_invalid_range/config.txt
similarity index 100%
rename from tests/tests/subids/38_usermod_-V_invalid_range/config.txt
rename to tests/subids/38_usermod_-V_invalid_range/config.txt
diff --git a/tests/tests/subids/38_usermod_-V_invalid_range/config/etc/default/useradd b/tests/subids/38_usermod_-V_invalid_range/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/38_usermod_-V_invalid_range/config/etc/default/useradd
rename to tests/subids/38_usermod_-V_invalid_range/config/etc/default/useradd
diff --git a/tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/group b/tests/subids/38_usermod_-V_invalid_range/config/etc/group
similarity index 100%
rename from tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/group
rename to tests/subids/38_usermod_-V_invalid_range/config/etc/group
diff --git a/tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/gshadow b/tests/subids/38_usermod_-V_invalid_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/gshadow
rename to tests/subids/38_usermod_-V_invalid_range/config/etc/gshadow
diff --git a/tests/tests/subids/38_usermod_-V_invalid_range/config/etc/passwd b/tests/subids/38_usermod_-V_invalid_range/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/38_usermod_-V_invalid_range/config/etc/passwd
rename to tests/subids/38_usermod_-V_invalid_range/config/etc/passwd
diff --git a/tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/shadow b/tests/subids/38_usermod_-V_invalid_range/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/shadow
rename to tests/subids/38_usermod_-V_invalid_range/config/etc/shadow
diff --git a/tests/tests/subids/38_usermod_-V_invalid_range/config/etc/subgid b/tests/subids/38_usermod_-V_invalid_range/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/38_usermod_-V_invalid_range/config/etc/subgid
rename to tests/subids/38_usermod_-V_invalid_range/config/etc/subgid
diff --git a/tests/tests/subids/38_usermod_-V_invalid_range/config/etc/subuid b/tests/subids/38_usermod_-V_invalid_range/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/38_usermod_-V_invalid_range/config/etc/subuid
rename to tests/subids/38_usermod_-V_invalid_range/config/etc/subuid
diff --git a/tests/tests/subids/38_usermod_-V_invalid_range/data/usermod.err b/tests/subids/38_usermod_-V_invalid_range/data/usermod.err
similarity index 100%
rename from tests/tests/subids/38_usermod_-V_invalid_range/data/usermod.err
rename to tests/subids/38_usermod_-V_invalid_range/data/usermod.err
diff --git a/tests/tests/subids/38_usermod_-V_invalid_range/usermod.test b/tests/subids/38_usermod_-V_invalid_range/usermod.test
similarity index 100%
rename from tests/tests/subids/38_usermod_-V_invalid_range/usermod.test
rename to tests/subids/38_usermod_-V_invalid_range/usermod.test
diff --git a/tests/tests/subids/39_usermod_-w_invalid_range/config.txt b/tests/subids/39_usermod_-w_invalid_range/config.txt
similarity index 100%
rename from tests/tests/subids/39_usermod_-w_invalid_range/config.txt
rename to tests/subids/39_usermod_-w_invalid_range/config.txt
diff --git a/tests/tests/subids/39_usermod_-w_invalid_range/config/etc/default/useradd b/tests/subids/39_usermod_-w_invalid_range/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/39_usermod_-w_invalid_range/config/etc/default/useradd
rename to tests/subids/39_usermod_-w_invalid_range/config/etc/default/useradd
diff --git a/tests/tests/subids/36_usermod_remove_with_comment/config/etc/group b/tests/subids/39_usermod_-w_invalid_range/config/etc/group
similarity index 100%
rename from tests/tests/subids/36_usermod_remove_with_comment/config/etc/group
rename to tests/subids/39_usermod_-w_invalid_range/config/etc/group
diff --git a/tests/tests/subids/36_usermod_remove_with_comment/config/etc/gshadow b/tests/subids/39_usermod_-w_invalid_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/36_usermod_remove_with_comment/config/etc/gshadow
rename to tests/subids/39_usermod_-w_invalid_range/config/etc/gshadow
diff --git a/tests/tests/subids/39_usermod_-w_invalid_range/config/etc/passwd b/tests/subids/39_usermod_-w_invalid_range/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/39_usermod_-w_invalid_range/config/etc/passwd
rename to tests/subids/39_usermod_-w_invalid_range/config/etc/passwd
diff --git a/tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/shadow b/tests/subids/39_usermod_-w_invalid_range/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/shadow
rename to tests/subids/39_usermod_-w_invalid_range/config/etc/shadow
diff --git a/tests/tests/subids/39_usermod_-w_invalid_range/config/etc/subgid b/tests/subids/39_usermod_-w_invalid_range/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/39_usermod_-w_invalid_range/config/etc/subgid
rename to tests/subids/39_usermod_-w_invalid_range/config/etc/subgid
diff --git a/tests/tests/subids/39_usermod_-w_invalid_range/config/etc/subuid b/tests/subids/39_usermod_-w_invalid_range/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/39_usermod_-w_invalid_range/config/etc/subuid
rename to tests/subids/39_usermod_-w_invalid_range/config/etc/subuid
diff --git a/tests/tests/subids/39_usermod_-w_invalid_range/data/usermod.err b/tests/subids/39_usermod_-w_invalid_range/data/usermod.err
similarity index 100%
rename from tests/tests/subids/39_usermod_-w_invalid_range/data/usermod.err
rename to tests/subids/39_usermod_-w_invalid_range/data/usermod.err
diff --git a/tests/tests/subids/39_usermod_-w_invalid_range/usermod.test b/tests/subids/39_usermod_-w_invalid_range/usermod.test
similarity index 100%
rename from tests/tests/subids/39_usermod_-w_invalid_range/usermod.test
rename to tests/subids/39_usermod_-w_invalid_range/usermod.test
diff --git a/tests/tests/subids/40_usermod_-W_invalid_range/config.txt b/tests/subids/40_usermod_-W_invalid_range/config.txt
similarity index 100%
rename from tests/tests/subids/40_usermod_-W_invalid_range/config.txt
rename to tests/subids/40_usermod_-W_invalid_range/config.txt
diff --git a/tests/tests/subids/40_usermod_-W_invalid_range/config/etc/default/useradd b/tests/subids/40_usermod_-W_invalid_range/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/40_usermod_-W_invalid_range/config/etc/default/useradd
rename to tests/subids/40_usermod_-W_invalid_range/config/etc/default/useradd
diff --git a/tests/tests/subids/37_usermod_-v_invalid_range/config/etc/group b/tests/subids/40_usermod_-W_invalid_range/config/etc/group
similarity index 100%
rename from tests/tests/subids/37_usermod_-v_invalid_range/config/etc/group
rename to tests/subids/40_usermod_-W_invalid_range/config/etc/group
diff --git a/tests/tests/subids/37_usermod_-v_invalid_range/config/etc/gshadow b/tests/subids/40_usermod_-W_invalid_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/37_usermod_-v_invalid_range/config/etc/gshadow
rename to tests/subids/40_usermod_-W_invalid_range/config/etc/gshadow
diff --git a/tests/tests/subids/40_usermod_-W_invalid_range/config/etc/passwd b/tests/subids/40_usermod_-W_invalid_range/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/40_usermod_-W_invalid_range/config/etc/passwd
rename to tests/subids/40_usermod_-W_invalid_range/config/etc/passwd
diff --git a/tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/shadow b/tests/subids/40_usermod_-W_invalid_range/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/shadow
rename to tests/subids/40_usermod_-W_invalid_range/config/etc/shadow
diff --git a/tests/tests/subids/40_usermod_-W_invalid_range/config/etc/subgid b/tests/subids/40_usermod_-W_invalid_range/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/40_usermod_-W_invalid_range/config/etc/subgid
rename to tests/subids/40_usermod_-W_invalid_range/config/etc/subgid
diff --git a/tests/tests/subids/40_usermod_-W_invalid_range/config/etc/subuid b/tests/subids/40_usermod_-W_invalid_range/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/40_usermod_-W_invalid_range/config/etc/subuid
rename to tests/subids/40_usermod_-W_invalid_range/config/etc/subuid
diff --git a/tests/tests/subids/40_usermod_-W_invalid_range/data/usermod.err b/tests/subids/40_usermod_-W_invalid_range/data/usermod.err
similarity index 100%
rename from tests/tests/subids/40_usermod_-W_invalid_range/data/usermod.err
rename to tests/subids/40_usermod_-W_invalid_range/data/usermod.err
diff --git a/tests/tests/subids/40_usermod_-W_invalid_range/usermod.test b/tests/subids/40_usermod_-W_invalid_range/usermod.test
similarity index 100%
rename from tests/tests/subids/40_usermod_-W_invalid_range/usermod.test
rename to tests/subids/40_usermod_-W_invalid_range/usermod.test
diff --git a/tests/tests/subids/10_useradd_no_more_subuids_end/config.txt b/tests/subids/41_usermod_locked_subuid/config.txt
similarity index 100%
rename from tests/tests/subids/10_useradd_no_more_subuids_end/config.txt
rename to tests/subids/41_usermod_locked_subuid/config.txt
diff --git a/tests/tests/subids/41_usermod_locked_subuid/config/etc/default/useradd b/tests/subids/41_usermod_locked_subuid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/41_usermod_locked_subuid/config/etc/default/useradd
rename to tests/subids/41_usermod_locked_subuid/config/etc/default/useradd
diff --git a/tests/tests/subids/41_usermod_locked_subuid/config/etc/group b/tests/subids/41_usermod_locked_subuid/config/etc/group
similarity index 100%
rename from tests/tests/subids/41_usermod_locked_subuid/config/etc/group
rename to tests/subids/41_usermod_locked_subuid/config/etc/group
diff --git a/tests/tests/subids/41_usermod_locked_subuid/config/etc/gshadow b/tests/subids/41_usermod_locked_subuid/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/41_usermod_locked_subuid/config/etc/gshadow
rename to tests/subids/41_usermod_locked_subuid/config/etc/gshadow
diff --git a/tests/tests/subids/41_usermod_locked_subuid/config/etc/passwd b/tests/subids/41_usermod_locked_subuid/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/41_usermod_locked_subuid/config/etc/passwd
rename to tests/subids/41_usermod_locked_subuid/config/etc/passwd
diff --git a/tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/shadow b/tests/subids/41_usermod_locked_subuid/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/shadow
rename to tests/subids/41_usermod_locked_subuid/config/etc/shadow
diff --git a/tests/tests/subids/41_usermod_locked_subuid/config/etc/subgid b/tests/subids/41_usermod_locked_subuid/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/41_usermod_locked_subuid/config/etc/subgid
rename to tests/subids/41_usermod_locked_subuid/config/etc/subgid
diff --git a/tests/tests/subids/41_usermod_locked_subuid/config/etc/subuid b/tests/subids/41_usermod_locked_subuid/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/41_usermod_locked_subuid/config/etc/subuid
rename to tests/subids/41_usermod_locked_subuid/config/etc/subuid
diff --git a/tests/tests/subids/41_usermod_locked_subuid/data/usermod.err b/tests/subids/41_usermod_locked_subuid/data/usermod.err
similarity index 100%
rename from tests/tests/subids/41_usermod_locked_subuid/data/usermod.err
rename to tests/subids/41_usermod_locked_subuid/data/usermod.err
diff --git a/tests/tests/subids/41_usermod_locked_subuid/usermod.test b/tests/subids/41_usermod_locked_subuid/usermod.test
similarity index 100%
rename from tests/tests/subids/41_usermod_locked_subuid/usermod.test
rename to tests/subids/41_usermod_locked_subuid/usermod.test
diff --git a/tests/tests/subids/11_useradd_no_more_subgids_end/config.txt b/tests/subids/42_usermod_locked_subgid/config.txt
similarity index 100%
rename from tests/tests/subids/11_useradd_no_more_subgids_end/config.txt
rename to tests/subids/42_usermod_locked_subgid/config.txt
diff --git a/tests/tests/subids/42_usermod_locked_subgid/config/etc/default/useradd b/tests/subids/42_usermod_locked_subgid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/42_usermod_locked_subgid/config/etc/default/useradd
rename to tests/subids/42_usermod_locked_subgid/config/etc/default/useradd
diff --git a/tests/tests/subids/42_usermod_locked_subgid/config/etc/group b/tests/subids/42_usermod_locked_subgid/config/etc/group
similarity index 100%
rename from tests/tests/subids/42_usermod_locked_subgid/config/etc/group
rename to tests/subids/42_usermod_locked_subgid/config/etc/group
diff --git a/tests/tests/subids/42_usermod_locked_subgid/config/etc/gshadow b/tests/subids/42_usermod_locked_subgid/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/42_usermod_locked_subgid/config/etc/gshadow
rename to tests/subids/42_usermod_locked_subgid/config/etc/gshadow
diff --git a/tests/tests/subids/42_usermod_locked_subgid/config/etc/passwd b/tests/subids/42_usermod_locked_subgid/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/42_usermod_locked_subgid/config/etc/passwd
rename to tests/subids/42_usermod_locked_subgid/config/etc/passwd
diff --git a/tests/tests/subids/36_usermod_remove_with_comment/config/etc/shadow b/tests/subids/42_usermod_locked_subgid/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/36_usermod_remove_with_comment/config/etc/shadow
rename to tests/subids/42_usermod_locked_subgid/config/etc/shadow
diff --git a/tests/tests/subids/42_usermod_locked_subgid/config/etc/subgid b/tests/subids/42_usermod_locked_subgid/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/42_usermod_locked_subgid/config/etc/subgid
rename to tests/subids/42_usermod_locked_subgid/config/etc/subgid
diff --git a/tests/tests/subids/42_usermod_locked_subgid/config/etc/subuid b/tests/subids/42_usermod_locked_subgid/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/42_usermod_locked_subgid/config/etc/subuid
rename to tests/subids/42_usermod_locked_subgid/config/etc/subuid
diff --git a/tests/tests/subids/42_usermod_locked_subgid/data/usermod.err b/tests/subids/42_usermod_locked_subgid/data/usermod.err
similarity index 100%
rename from tests/tests/subids/42_usermod_locked_subgid/data/usermod.err
rename to tests/subids/42_usermod_locked_subgid/data/usermod.err
diff --git a/tests/tests/subids/42_usermod_locked_subgid/usermod.test b/tests/subids/42_usermod_locked_subgid/usermod.test
similarity index 100%
rename from tests/tests/subids/42_usermod_locked_subgid/usermod.test
rename to tests/subids/42_usermod_locked_subgid/usermod.test
diff --git a/tests/tests/subids/12_useradd_invalid_subuid_configuration1/config.txt b/tests/subids/43_usermod_-w_no_subgid/config.txt
similarity index 100%
rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/config.txt
rename to tests/subids/43_usermod_-w_no_subgid/config.txt
diff --git a/tests/tests/subids/43_usermod_-w_no_subgid/config/etc/default/useradd b/tests/subids/43_usermod_-w_no_subgid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/43_usermod_-w_no_subgid/config/etc/default/useradd
rename to tests/subids/43_usermod_-w_no_subgid/config/etc/default/useradd
diff --git a/tests/tests/subids/43_usermod_-w_no_subgid/config/etc/group b/tests/subids/43_usermod_-w_no_subgid/config/etc/group
similarity index 100%
rename from tests/tests/subids/43_usermod_-w_no_subgid/config/etc/group
rename to tests/subids/43_usermod_-w_no_subgid/config/etc/group
diff --git a/tests/tests/subids/43_usermod_-w_no_subgid/config/etc/gshadow b/tests/subids/43_usermod_-w_no_subgid/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/43_usermod_-w_no_subgid/config/etc/gshadow
rename to tests/subids/43_usermod_-w_no_subgid/config/etc/gshadow
diff --git a/tests/tests/subids/43_usermod_-w_no_subgid/config/etc/passwd b/tests/subids/43_usermod_-w_no_subgid/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/43_usermod_-w_no_subgid/config/etc/passwd
rename to tests/subids/43_usermod_-w_no_subgid/config/etc/passwd
diff --git a/tests/tests/subids/37_usermod_-v_invalid_range/config/etc/shadow b/tests/subids/43_usermod_-w_no_subgid/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/37_usermod_-v_invalid_range/config/etc/shadow
rename to tests/subids/43_usermod_-w_no_subgid/config/etc/shadow
diff --git a/tests/tests/subids/43_usermod_-w_no_subgid/config/etc/subgid b/tests/subids/43_usermod_-w_no_subgid/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/43_usermod_-w_no_subgid/config/etc/subgid
rename to tests/subids/43_usermod_-w_no_subgid/config/etc/subgid
diff --git a/tests/tests/subids/43_usermod_-w_no_subgid/config/etc/subuid b/tests/subids/43_usermod_-w_no_subgid/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/43_usermod_-w_no_subgid/config/etc/subuid
rename to tests/subids/43_usermod_-w_no_subgid/config/etc/subuid
diff --git a/tests/tests/subids/43_usermod_-w_no_subgid/data/usermod.err b/tests/subids/43_usermod_-w_no_subgid/data/usermod.err
similarity index 100%
rename from tests/tests/subids/43_usermod_-w_no_subgid/data/usermod.err
rename to tests/subids/43_usermod_-w_no_subgid/data/usermod.err
diff --git a/tests/tests/subids/43_usermod_-w_no_subgid/usermod.test b/tests/subids/43_usermod_-w_no_subgid/usermod.test
similarity index 100%
rename from tests/tests/subids/43_usermod_-w_no_subgid/usermod.test
rename to tests/subids/43_usermod_-w_no_subgid/usermod.test
diff --git a/tests/tests/subids/13_useradd_invalid_subuid_configuration2/config.txt b/tests/subids/44_usermod_-W_no_subgid/config.txt
similarity index 100%
rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/config.txt
rename to tests/subids/44_usermod_-W_no_subgid/config.txt
diff --git a/tests/tests/subids/44_usermod_-W_no_subgid/config/etc/default/useradd b/tests/subids/44_usermod_-W_no_subgid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/44_usermod_-W_no_subgid/config/etc/default/useradd
rename to tests/subids/44_usermod_-W_no_subgid/config/etc/default/useradd
diff --git a/tests/tests/subids/44_usermod_-W_no_subgid/config/etc/group b/tests/subids/44_usermod_-W_no_subgid/config/etc/group
similarity index 100%
rename from tests/tests/subids/44_usermod_-W_no_subgid/config/etc/group
rename to tests/subids/44_usermod_-W_no_subgid/config/etc/group
diff --git a/tests/tests/subids/44_usermod_-W_no_subgid/config/etc/gshadow b/tests/subids/44_usermod_-W_no_subgid/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/44_usermod_-W_no_subgid/config/etc/gshadow
rename to tests/subids/44_usermod_-W_no_subgid/config/etc/gshadow
diff --git a/tests/tests/subids/44_usermod_-W_no_subgid/config/etc/passwd b/tests/subids/44_usermod_-W_no_subgid/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/44_usermod_-W_no_subgid/config/etc/passwd
rename to tests/subids/44_usermod_-W_no_subgid/config/etc/passwd
diff --git a/tests/tests/subids/38_usermod_-V_invalid_range/config/etc/shadow b/tests/subids/44_usermod_-W_no_subgid/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/38_usermod_-V_invalid_range/config/etc/shadow
rename to tests/subids/44_usermod_-W_no_subgid/config/etc/shadow
diff --git a/tests/tests/subids/44_usermod_-W_no_subgid/config/etc/subgid b/tests/subids/44_usermod_-W_no_subgid/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/44_usermod_-W_no_subgid/config/etc/subgid
rename to tests/subids/44_usermod_-W_no_subgid/config/etc/subgid
diff --git a/tests/tests/subids/44_usermod_-W_no_subgid/config/etc/subuid b/tests/subids/44_usermod_-W_no_subgid/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/44_usermod_-W_no_subgid/config/etc/subuid
rename to tests/subids/44_usermod_-W_no_subgid/config/etc/subuid
diff --git a/tests/tests/subids/44_usermod_-W_no_subgid/data/usermod.err b/tests/subids/44_usermod_-W_no_subgid/data/usermod.err
similarity index 100%
rename from tests/tests/subids/44_usermod_-W_no_subgid/data/usermod.err
rename to tests/subids/44_usermod_-W_no_subgid/data/usermod.err
diff --git a/tests/tests/subids/44_usermod_-W_no_subgid/usermod.test b/tests/subids/44_usermod_-W_no_subgid/usermod.test
similarity index 100%
rename from tests/tests/subids/44_usermod_-W_no_subgid/usermod.test
rename to tests/subids/44_usermod_-W_no_subgid/usermod.test
diff --git a/tests/tests/subids/14_useradd_invalid_subuid_configuration3/config.txt b/tests/subids/45_usermod_-v_no_subgid/config.txt
similarity index 100%
rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/config.txt
rename to tests/subids/45_usermod_-v_no_subgid/config.txt
diff --git a/tests/tests/subids/45_usermod_-v_no_subgid/config/etc/default/useradd b/tests/subids/45_usermod_-v_no_subgid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/45_usermod_-v_no_subgid/config/etc/default/useradd
rename to tests/subids/45_usermod_-v_no_subgid/config/etc/default/useradd
diff --git a/tests/tests/subids/45_usermod_-v_no_subgid/config/etc/group b/tests/subids/45_usermod_-v_no_subgid/config/etc/group
similarity index 100%
rename from tests/tests/subids/45_usermod_-v_no_subgid/config/etc/group
rename to tests/subids/45_usermod_-v_no_subgid/config/etc/group
diff --git a/tests/tests/subids/45_usermod_-v_no_subgid/config/etc/gshadow b/tests/subids/45_usermod_-v_no_subgid/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/45_usermod_-v_no_subgid/config/etc/gshadow
rename to tests/subids/45_usermod_-v_no_subgid/config/etc/gshadow
diff --git a/tests/tests/subids/45_usermod_-v_no_subgid/config/etc/passwd b/tests/subids/45_usermod_-v_no_subgid/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/45_usermod_-v_no_subgid/config/etc/passwd
rename to tests/subids/45_usermod_-v_no_subgid/config/etc/passwd
diff --git a/tests/tests/subids/39_usermod_-w_invalid_range/config/etc/shadow b/tests/subids/45_usermod_-v_no_subgid/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/39_usermod_-w_invalid_range/config/etc/shadow
rename to tests/subids/45_usermod_-v_no_subgid/config/etc/shadow
diff --git a/tests/tests/subids/45_usermod_-v_no_subgid/config/etc/subgid b/tests/subids/45_usermod_-v_no_subgid/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/45_usermod_-v_no_subgid/config/etc/subgid
rename to tests/subids/45_usermod_-v_no_subgid/config/etc/subgid
diff --git a/tests/tests/subids/45_usermod_-v_no_subgid/config/etc/subuid b/tests/subids/45_usermod_-v_no_subgid/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/45_usermod_-v_no_subgid/config/etc/subuid
rename to tests/subids/45_usermod_-v_no_subgid/config/etc/subuid
diff --git a/tests/tests/subids/45_usermod_-v_no_subgid/data/usermod.err b/tests/subids/45_usermod_-v_no_subgid/data/usermod.err
similarity index 100%
rename from tests/tests/subids/45_usermod_-v_no_subgid/data/usermod.err
rename to tests/subids/45_usermod_-v_no_subgid/data/usermod.err
diff --git a/tests/tests/subids/45_usermod_-v_no_subgid/usermod.test b/tests/subids/45_usermod_-v_no_subgid/usermod.test
similarity index 100%
rename from tests/tests/subids/45_usermod_-v_no_subgid/usermod.test
rename to tests/subids/45_usermod_-v_no_subgid/usermod.test
diff --git a/tests/tests/subids/15_useradd_invalid_subgid_configuration1/config.txt b/tests/subids/46_usermod_-V_no_subgid/config.txt
similarity index 100%
rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/config.txt
rename to tests/subids/46_usermod_-V_no_subgid/config.txt
diff --git a/tests/tests/subids/46_usermod_-V_no_subgid/config/etc/default/useradd b/tests/subids/46_usermod_-V_no_subgid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/46_usermod_-V_no_subgid/config/etc/default/useradd
rename to tests/subids/46_usermod_-V_no_subgid/config/etc/default/useradd
diff --git a/tests/tests/subids/46_usermod_-V_no_subgid/config/etc/group b/tests/subids/46_usermod_-V_no_subgid/config/etc/group
similarity index 100%
rename from tests/tests/subids/46_usermod_-V_no_subgid/config/etc/group
rename to tests/subids/46_usermod_-V_no_subgid/config/etc/group
diff --git a/tests/tests/subids/46_usermod_-V_no_subgid/config/etc/gshadow b/tests/subids/46_usermod_-V_no_subgid/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/46_usermod_-V_no_subgid/config/etc/gshadow
rename to tests/subids/46_usermod_-V_no_subgid/config/etc/gshadow
diff --git a/tests/tests/subids/46_usermod_-V_no_subgid/config/etc/passwd b/tests/subids/46_usermod_-V_no_subgid/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/46_usermod_-V_no_subgid/config/etc/passwd
rename to tests/subids/46_usermod_-V_no_subgid/config/etc/passwd
diff --git a/tests/tests/subids/40_usermod_-W_invalid_range/config/etc/shadow b/tests/subids/46_usermod_-V_no_subgid/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/40_usermod_-W_invalid_range/config/etc/shadow
rename to tests/subids/46_usermod_-V_no_subgid/config/etc/shadow
diff --git a/tests/tests/subids/46_usermod_-V_no_subgid/config/etc/subgid b/tests/subids/46_usermod_-V_no_subgid/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/46_usermod_-V_no_subgid/config/etc/subgid
rename to tests/subids/46_usermod_-V_no_subgid/config/etc/subgid
diff --git a/tests/tests/subids/46_usermod_-V_no_subgid/config/etc/subuid b/tests/subids/46_usermod_-V_no_subgid/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/46_usermod_-V_no_subgid/config/etc/subuid
rename to tests/subids/46_usermod_-V_no_subgid/config/etc/subuid
diff --git a/tests/tests/subids/46_usermod_-V_no_subgid/data/usermod.err b/tests/subids/46_usermod_-V_no_subgid/data/usermod.err
similarity index 100%
rename from tests/tests/subids/46_usermod_-V_no_subgid/data/usermod.err
rename to tests/subids/46_usermod_-V_no_subgid/data/usermod.err
diff --git a/tests/tests/subids/46_usermod_-V_no_subgid/usermod.test b/tests/subids/46_usermod_-V_no_subgid/usermod.test
similarity index 100%
rename from tests/tests/subids/46_usermod_-V_no_subgid/usermod.test
rename to tests/subids/46_usermod_-V_no_subgid/usermod.test
diff --git a/tests/tests/subids/47_usermod_-v_invalid_range2/config.txt b/tests/subids/47_usermod_-v_invalid_range2/config.txt
similarity index 100%
rename from tests/tests/subids/47_usermod_-v_invalid_range2/config.txt
rename to tests/subids/47_usermod_-v_invalid_range2/config.txt
diff --git a/tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/default/useradd b/tests/subids/47_usermod_-v_invalid_range2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/default/useradd
rename to tests/subids/47_usermod_-v_invalid_range2/config/etc/default/useradd
diff --git a/tests/tests/subids/38_usermod_-V_invalid_range/config/etc/group b/tests/subids/47_usermod_-v_invalid_range2/config/etc/group
similarity index 100%
rename from tests/tests/subids/38_usermod_-V_invalid_range/config/etc/group
rename to tests/subids/47_usermod_-v_invalid_range2/config/etc/group
diff --git a/tests/tests/subids/38_usermod_-V_invalid_range/config/etc/gshadow b/tests/subids/47_usermod_-v_invalid_range2/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/38_usermod_-V_invalid_range/config/etc/gshadow
rename to tests/subids/47_usermod_-v_invalid_range2/config/etc/gshadow
diff --git a/tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/passwd b/tests/subids/47_usermod_-v_invalid_range2/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/passwd
rename to tests/subids/47_usermod_-v_invalid_range2/config/etc/passwd
diff --git a/tests/tests/subids/41_usermod_locked_subuid/config/etc/shadow b/tests/subids/47_usermod_-v_invalid_range2/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/41_usermod_locked_subuid/config/etc/shadow
rename to tests/subids/47_usermod_-v_invalid_range2/config/etc/shadow
diff --git a/tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/subgid b/tests/subids/47_usermod_-v_invalid_range2/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/subgid
rename to tests/subids/47_usermod_-v_invalid_range2/config/etc/subgid
diff --git a/tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/subuid b/tests/subids/47_usermod_-v_invalid_range2/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/subuid
rename to tests/subids/47_usermod_-v_invalid_range2/config/etc/subuid
diff --git a/tests/tests/subids/47_usermod_-v_invalid_range2/data/usermod.err b/tests/subids/47_usermod_-v_invalid_range2/data/usermod.err
similarity index 100%
rename from tests/tests/subids/47_usermod_-v_invalid_range2/data/usermod.err
rename to tests/subids/47_usermod_-v_invalid_range2/data/usermod.err
diff --git a/tests/tests/subids/47_usermod_-v_invalid_range2/usermod.test b/tests/subids/47_usermod_-v_invalid_range2/usermod.test
similarity index 100%
rename from tests/tests/subids/47_usermod_-v_invalid_range2/usermod.test
rename to tests/subids/47_usermod_-v_invalid_range2/usermod.test
diff --git a/tests/tests/subids/48_usermod_-v_invalid_range3/config.txt b/tests/subids/48_usermod_-v_invalid_range3/config.txt
similarity index 100%
rename from tests/tests/subids/48_usermod_-v_invalid_range3/config.txt
rename to tests/subids/48_usermod_-v_invalid_range3/config.txt
diff --git a/tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/default/useradd b/tests/subids/48_usermod_-v_invalid_range3/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/default/useradd
rename to tests/subids/48_usermod_-v_invalid_range3/config/etc/default/useradd
diff --git a/tests/tests/subids/39_usermod_-w_invalid_range/config/etc/group b/tests/subids/48_usermod_-v_invalid_range3/config/etc/group
similarity index 100%
rename from tests/tests/subids/39_usermod_-w_invalid_range/config/etc/group
rename to tests/subids/48_usermod_-v_invalid_range3/config/etc/group
diff --git a/tests/tests/subids/39_usermod_-w_invalid_range/config/etc/gshadow b/tests/subids/48_usermod_-v_invalid_range3/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/39_usermod_-w_invalid_range/config/etc/gshadow
rename to tests/subids/48_usermod_-v_invalid_range3/config/etc/gshadow
diff --git a/tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/passwd b/tests/subids/48_usermod_-v_invalid_range3/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/passwd
rename to tests/subids/48_usermod_-v_invalid_range3/config/etc/passwd
diff --git a/tests/tests/subids/42_usermod_locked_subgid/config/etc/shadow b/tests/subids/48_usermod_-v_invalid_range3/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/42_usermod_locked_subgid/config/etc/shadow
rename to tests/subids/48_usermod_-v_invalid_range3/config/etc/shadow
diff --git a/tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/subgid b/tests/subids/48_usermod_-v_invalid_range3/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/subgid
rename to tests/subids/48_usermod_-v_invalid_range3/config/etc/subgid
diff --git a/tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/subuid b/tests/subids/48_usermod_-v_invalid_range3/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/subuid
rename to tests/subids/48_usermod_-v_invalid_range3/config/etc/subuid
diff --git a/tests/tests/subids/48_usermod_-v_invalid_range3/data/usermod.err b/tests/subids/48_usermod_-v_invalid_range3/data/usermod.err
similarity index 100%
rename from tests/tests/subids/48_usermod_-v_invalid_range3/data/usermod.err
rename to tests/subids/48_usermod_-v_invalid_range3/data/usermod.err
diff --git a/tests/tests/subids/48_usermod_-v_invalid_range3/usermod.test b/tests/subids/48_usermod_-v_invalid_range3/usermod.test
similarity index 100%
rename from tests/tests/subids/48_usermod_-v_invalid_range3/usermod.test
rename to tests/subids/48_usermod_-v_invalid_range3/usermod.test
diff --git a/tests/tests/subids/49_usermod_-v_invalid_range4/config.txt b/tests/subids/49_usermod_-v_invalid_range4/config.txt
similarity index 100%
rename from tests/tests/subids/49_usermod_-v_invalid_range4/config.txt
rename to tests/subids/49_usermod_-v_invalid_range4/config.txt
diff --git a/tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/default/useradd b/tests/subids/49_usermod_-v_invalid_range4/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/default/useradd
rename to tests/subids/49_usermod_-v_invalid_range4/config/etc/default/useradd
diff --git a/tests/tests/subids/40_usermod_-W_invalid_range/config/etc/group b/tests/subids/49_usermod_-v_invalid_range4/config/etc/group
similarity index 100%
rename from tests/tests/subids/40_usermod_-W_invalid_range/config/etc/group
rename to tests/subids/49_usermod_-v_invalid_range4/config/etc/group
diff --git a/tests/tests/subids/40_usermod_-W_invalid_range/config/etc/gshadow b/tests/subids/49_usermod_-v_invalid_range4/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/40_usermod_-W_invalid_range/config/etc/gshadow
rename to tests/subids/49_usermod_-v_invalid_range4/config/etc/gshadow
diff --git a/tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/passwd b/tests/subids/49_usermod_-v_invalid_range4/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/passwd
rename to tests/subids/49_usermod_-v_invalid_range4/config/etc/passwd
diff --git a/tests/tests/subids/43_usermod_-w_no_subgid/config/etc/shadow b/tests/subids/49_usermod_-v_invalid_range4/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/43_usermod_-w_no_subgid/config/etc/shadow
rename to tests/subids/49_usermod_-v_invalid_range4/config/etc/shadow
diff --git a/tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/subgid b/tests/subids/49_usermod_-v_invalid_range4/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/subgid
rename to tests/subids/49_usermod_-v_invalid_range4/config/etc/subgid
diff --git a/tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/subuid b/tests/subids/49_usermod_-v_invalid_range4/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/subuid
rename to tests/subids/49_usermod_-v_invalid_range4/config/etc/subuid
diff --git a/tests/tests/subids/49_usermod_-v_invalid_range4/data/usermod.err b/tests/subids/49_usermod_-v_invalid_range4/data/usermod.err
similarity index 100%
rename from tests/tests/subids/49_usermod_-v_invalid_range4/data/usermod.err
rename to tests/subids/49_usermod_-v_invalid_range4/data/usermod.err
diff --git a/tests/tests/subids/49_usermod_-v_invalid_range4/usermod.test b/tests/subids/49_usermod_-v_invalid_range4/usermod.test
similarity index 100%
rename from tests/tests/subids/49_usermod_-v_invalid_range4/usermod.test
rename to tests/subids/49_usermod_-v_invalid_range4/usermod.test
diff --git a/tests/tests/subids/50_usermod_-v_invalid_range5/config.txt b/tests/subids/50_usermod_-v_invalid_range5/config.txt
similarity index 100%
rename from tests/tests/subids/50_usermod_-v_invalid_range5/config.txt
rename to tests/subids/50_usermod_-v_invalid_range5/config.txt
diff --git a/tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/default/useradd b/tests/subids/50_usermod_-v_invalid_range5/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/default/useradd
rename to tests/subids/50_usermod_-v_invalid_range5/config/etc/default/useradd
diff --git a/tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/group b/tests/subids/50_usermod_-v_invalid_range5/config/etc/group
similarity index 100%
rename from tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/group
rename to tests/subids/50_usermod_-v_invalid_range5/config/etc/group
diff --git a/tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/gshadow b/tests/subids/50_usermod_-v_invalid_range5/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/gshadow
rename to tests/subids/50_usermod_-v_invalid_range5/config/etc/gshadow
diff --git a/tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/passwd b/tests/subids/50_usermod_-v_invalid_range5/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/passwd
rename to tests/subids/50_usermod_-v_invalid_range5/config/etc/passwd
diff --git a/tests/tests/subids/44_usermod_-W_no_subgid/config/etc/shadow b/tests/subids/50_usermod_-v_invalid_range5/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/44_usermod_-W_no_subgid/config/etc/shadow
rename to tests/subids/50_usermod_-v_invalid_range5/config/etc/shadow
diff --git a/tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/subgid b/tests/subids/50_usermod_-v_invalid_range5/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/subgid
rename to tests/subids/50_usermod_-v_invalid_range5/config/etc/subgid
diff --git a/tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/subuid b/tests/subids/50_usermod_-v_invalid_range5/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/subuid
rename to tests/subids/50_usermod_-v_invalid_range5/config/etc/subuid
diff --git a/tests/tests/subids/50_usermod_-v_invalid_range5/data/usermod.err b/tests/subids/50_usermod_-v_invalid_range5/data/usermod.err
similarity index 100%
rename from tests/tests/subids/50_usermod_-v_invalid_range5/data/usermod.err
rename to tests/subids/50_usermod_-v_invalid_range5/data/usermod.err
diff --git a/tests/tests/subids/50_usermod_-v_invalid_range5/usermod.test b/tests/subids/50_usermod_-v_invalid_range5/usermod.test
similarity index 100%
rename from tests/tests/subids/50_usermod_-v_invalid_range5/usermod.test
rename to tests/subids/50_usermod_-v_invalid_range5/usermod.test
diff --git a/tests/tests/subids/51_usermod_-v_invalid_range6/config.txt b/tests/subids/51_usermod_-v_invalid_range6/config.txt
similarity index 100%
rename from tests/tests/subids/51_usermod_-v_invalid_range6/config.txt
rename to tests/subids/51_usermod_-v_invalid_range6/config.txt
diff --git a/tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/default/useradd b/tests/subids/51_usermod_-v_invalid_range6/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/default/useradd
rename to tests/subids/51_usermod_-v_invalid_range6/config/etc/default/useradd
diff --git a/tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/group b/tests/subids/51_usermod_-v_invalid_range6/config/etc/group
similarity index 100%
rename from tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/group
rename to tests/subids/51_usermod_-v_invalid_range6/config/etc/group
diff --git a/tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/gshadow b/tests/subids/51_usermod_-v_invalid_range6/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/gshadow
rename to tests/subids/51_usermod_-v_invalid_range6/config/etc/gshadow
diff --git a/tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/passwd b/tests/subids/51_usermod_-v_invalid_range6/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/passwd
rename to tests/subids/51_usermod_-v_invalid_range6/config/etc/passwd
diff --git a/tests/tests/subids/45_usermod_-v_no_subgid/config/etc/shadow b/tests/subids/51_usermod_-v_invalid_range6/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/45_usermod_-v_no_subgid/config/etc/shadow
rename to tests/subids/51_usermod_-v_invalid_range6/config/etc/shadow
diff --git a/tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/subgid b/tests/subids/51_usermod_-v_invalid_range6/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/subgid
rename to tests/subids/51_usermod_-v_invalid_range6/config/etc/subgid
diff --git a/tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/subuid b/tests/subids/51_usermod_-v_invalid_range6/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/subuid
rename to tests/subids/51_usermod_-v_invalid_range6/config/etc/subuid
diff --git a/tests/tests/subids/51_usermod_-v_invalid_range6/data/usermod.err b/tests/subids/51_usermod_-v_invalid_range6/data/usermod.err
similarity index 100%
rename from tests/tests/subids/51_usermod_-v_invalid_range6/data/usermod.err
rename to tests/subids/51_usermod_-v_invalid_range6/data/usermod.err
diff --git a/tests/tests/subids/51_usermod_-v_invalid_range6/usermod.test b/tests/subids/51_usermod_-v_invalid_range6/usermod.test
similarity index 100%
rename from tests/tests/subids/51_usermod_-v_invalid_range6/usermod.test
rename to tests/subids/51_usermod_-v_invalid_range6/usermod.test
diff --git a/tests/tests/subids/52_usermod_-v_invalid_range7/config.txt b/tests/subids/52_usermod_-v_invalid_range7/config.txt
similarity index 100%
rename from tests/tests/subids/52_usermod_-v_invalid_range7/config.txt
rename to tests/subids/52_usermod_-v_invalid_range7/config.txt
diff --git a/tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/default/useradd b/tests/subids/52_usermod_-v_invalid_range7/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/default/useradd
rename to tests/subids/52_usermod_-v_invalid_range7/config/etc/default/useradd
diff --git a/tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/group b/tests/subids/52_usermod_-v_invalid_range7/config/etc/group
similarity index 100%
rename from tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/group
rename to tests/subids/52_usermod_-v_invalid_range7/config/etc/group
diff --git a/tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/gshadow b/tests/subids/52_usermod_-v_invalid_range7/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/gshadow
rename to tests/subids/52_usermod_-v_invalid_range7/config/etc/gshadow
diff --git a/tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/passwd b/tests/subids/52_usermod_-v_invalid_range7/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/passwd
rename to tests/subids/52_usermod_-v_invalid_range7/config/etc/passwd
diff --git a/tests/tests/subids/46_usermod_-V_no_subgid/config/etc/shadow b/tests/subids/52_usermod_-v_invalid_range7/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/46_usermod_-V_no_subgid/config/etc/shadow
rename to tests/subids/52_usermod_-v_invalid_range7/config/etc/shadow
diff --git a/tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/subgid b/tests/subids/52_usermod_-v_invalid_range7/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/subgid
rename to tests/subids/52_usermod_-v_invalid_range7/config/etc/subgid
diff --git a/tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/subuid b/tests/subids/52_usermod_-v_invalid_range7/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/subuid
rename to tests/subids/52_usermod_-v_invalid_range7/config/etc/subuid
diff --git a/tests/tests/subids/52_usermod_-v_invalid_range7/data/usermod.err b/tests/subids/52_usermod_-v_invalid_range7/data/usermod.err
similarity index 100%
rename from tests/tests/subids/52_usermod_-v_invalid_range7/data/usermod.err
rename to tests/subids/52_usermod_-v_invalid_range7/data/usermod.err
diff --git a/tests/tests/subids/52_usermod_-v_invalid_range7/usermod.test b/tests/subids/52_usermod_-v_invalid_range7/usermod.test
similarity index 100%
rename from tests/tests/subids/52_usermod_-v_invalid_range7/usermod.test
rename to tests/subids/52_usermod_-v_invalid_range7/usermod.test
diff --git a/tests/tests/subids/53_userdel_one_subuid_range/config.txt b/tests/subids/53_userdel_one_subuid_range/config.txt
similarity index 100%
rename from tests/tests/subids/53_userdel_one_subuid_range/config.txt
rename to tests/subids/53_userdel_one_subuid_range/config.txt
diff --git a/tests/tests/subids/53_userdel_one_subuid_range/config/etc/default/useradd b/tests/subids/53_userdel_one_subuid_range/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/53_userdel_one_subuid_range/config/etc/default/useradd
rename to tests/subids/53_userdel_one_subuid_range/config/etc/default/useradd
diff --git a/tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/group b/tests/subids/53_userdel_one_subuid_range/config/etc/group
similarity index 100%
rename from tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/group
rename to tests/subids/53_userdel_one_subuid_range/config/etc/group
diff --git a/tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/gshadow b/tests/subids/53_userdel_one_subuid_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/gshadow
rename to tests/subids/53_userdel_one_subuid_range/config/etc/gshadow
diff --git a/tests/tests/subids/53_userdel_one_subuid_range/config/etc/passwd b/tests/subids/53_userdel_one_subuid_range/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/53_userdel_one_subuid_range/config/etc/passwd
rename to tests/subids/53_userdel_one_subuid_range/config/etc/passwd
diff --git a/tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/shadow b/tests/subids/53_userdel_one_subuid_range/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/shadow
rename to tests/subids/53_userdel_one_subuid_range/config/etc/shadow
diff --git a/tests/tests/subids/53_userdel_one_subuid_range/config/etc/subgid b/tests/subids/53_userdel_one_subuid_range/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/53_userdel_one_subuid_range/config/etc/subgid
rename to tests/subids/53_userdel_one_subuid_range/config/etc/subgid
diff --git a/tests/tests/subids/53_userdel_one_subuid_range/config/etc/subuid b/tests/subids/53_userdel_one_subuid_range/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/53_userdel_one_subuid_range/config/etc/subuid
rename to tests/subids/53_userdel_one_subuid_range/config/etc/subuid
diff --git a/tests/tests/subids/53_userdel_one_subuid_range/data/group b/tests/subids/53_userdel_one_subuid_range/data/group
similarity index 100%
rename from tests/tests/subids/53_userdel_one_subuid_range/data/group
rename to tests/subids/53_userdel_one_subuid_range/data/group
diff --git a/tests/tests/subids/53_userdel_one_subuid_range/data/gshadow b/tests/subids/53_userdel_one_subuid_range/data/gshadow
similarity index 100%
rename from tests/tests/subids/53_userdel_one_subuid_range/data/gshadow
rename to tests/subids/53_userdel_one_subuid_range/data/gshadow
diff --git a/tests/tests/subids/20_useradd_locked_subgid/config/etc/passwd b/tests/subids/53_userdel_one_subuid_range/data/passwd
similarity index 100%
rename from tests/tests/subids/20_useradd_locked_subgid/config/etc/passwd
rename to tests/subids/53_userdel_one_subuid_range/data/passwd
diff --git a/tests/tests/subids/20_useradd_locked_subgid/config/etc/shadow b/tests/subids/53_userdel_one_subuid_range/data/shadow
similarity index 100%
rename from tests/tests/subids/20_useradd_locked_subgid/config/etc/shadow
rename to tests/subids/53_userdel_one_subuid_range/data/shadow
diff --git a/tests/tests/subids/53_userdel_one_subuid_range/data/subuid b/tests/subids/53_userdel_one_subuid_range/data/subuid
similarity index 100%
rename from tests/tests/subids/53_userdel_one_subuid_range/data/subuid
rename to tests/subids/53_userdel_one_subuid_range/data/subuid
diff --git a/tests/tests/subids/53_userdel_one_subuid_range/userdel.test b/tests/subids/53_userdel_one_subuid_range/userdel.test
similarity index 100%
rename from tests/tests/subids/53_userdel_one_subuid_range/userdel.test
rename to tests/subids/53_userdel_one_subuid_range/userdel.test
diff --git a/tests/tests/subids/54_userdel_one_subgid_range/config.txt b/tests/subids/54_userdel_one_subgid_range/config.txt
similarity index 100%
rename from tests/tests/subids/54_userdel_one_subgid_range/config.txt
rename to tests/subids/54_userdel_one_subgid_range/config.txt
diff --git a/tests/tests/subids/54_userdel_one_subgid_range/config/etc/default/useradd b/tests/subids/54_userdel_one_subgid_range/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/54_userdel_one_subgid_range/config/etc/default/useradd
rename to tests/subids/54_userdel_one_subgid_range/config/etc/default/useradd
diff --git a/tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/group b/tests/subids/54_userdel_one_subgid_range/config/etc/group
similarity index 100%
rename from tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/group
rename to tests/subids/54_userdel_one_subgid_range/config/etc/group
diff --git a/tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/gshadow b/tests/subids/54_userdel_one_subgid_range/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/gshadow
rename to tests/subids/54_userdel_one_subgid_range/config/etc/gshadow
diff --git a/tests/tests/subids/54_userdel_one_subgid_range/config/etc/passwd b/tests/subids/54_userdel_one_subgid_range/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/54_userdel_one_subgid_range/config/etc/passwd
rename to tests/subids/54_userdel_one_subgid_range/config/etc/passwd
diff --git a/tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/shadow b/tests/subids/54_userdel_one_subgid_range/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/shadow
rename to tests/subids/54_userdel_one_subgid_range/config/etc/shadow
diff --git a/tests/tests/subids/54_userdel_one_subgid_range/config/etc/subgid b/tests/subids/54_userdel_one_subgid_range/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/54_userdel_one_subgid_range/config/etc/subgid
rename to tests/subids/54_userdel_one_subgid_range/config/etc/subgid
diff --git a/tests/tests/subids/54_userdel_one_subgid_range/config/etc/subuid b/tests/subids/54_userdel_one_subgid_range/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/54_userdel_one_subgid_range/config/etc/subuid
rename to tests/subids/54_userdel_one_subgid_range/config/etc/subuid
diff --git a/tests/tests/subids/54_userdel_one_subgid_range/data/group b/tests/subids/54_userdel_one_subgid_range/data/group
similarity index 100%
rename from tests/tests/subids/54_userdel_one_subgid_range/data/group
rename to tests/subids/54_userdel_one_subgid_range/data/group
diff --git a/tests/tests/subids/54_userdel_one_subgid_range/data/gshadow b/tests/subids/54_userdel_one_subgid_range/data/gshadow
similarity index 100%
rename from tests/tests/subids/54_userdel_one_subgid_range/data/gshadow
rename to tests/subids/54_userdel_one_subgid_range/data/gshadow
diff --git a/tests/tests/subids/53_userdel_one_subuid_range/data/passwd b/tests/subids/54_userdel_one_subgid_range/data/passwd
similarity index 100%
rename from tests/tests/subids/53_userdel_one_subuid_range/data/passwd
rename to tests/subids/54_userdel_one_subgid_range/data/passwd
diff --git a/tests/tests/subids/53_userdel_one_subuid_range/data/shadow b/tests/subids/54_userdel_one_subgid_range/data/shadow
similarity index 100%
rename from tests/tests/subids/53_userdel_one_subuid_range/data/shadow
rename to tests/subids/54_userdel_one_subgid_range/data/shadow
diff --git a/tests/tests/subids/54_userdel_one_subgid_range/data/subgid b/tests/subids/54_userdel_one_subgid_range/data/subgid
similarity index 100%
rename from tests/tests/subids/54_userdel_one_subgid_range/data/subgid
rename to tests/subids/54_userdel_one_subgid_range/data/subgid
diff --git a/tests/tests/subids/54_userdel_one_subgid_range/userdel.test b/tests/subids/54_userdel_one_subgid_range/userdel.test
similarity index 100%
rename from tests/tests/subids/54_userdel_one_subgid_range/userdel.test
rename to tests/subids/54_userdel_one_subgid_range/userdel.test
diff --git a/tests/tests/subids/55_userdel_no_subuid/config.txt b/tests/subids/55_userdel_no_subuid/config.txt
similarity index 100%
rename from tests/tests/subids/55_userdel_no_subuid/config.txt
rename to tests/subids/55_userdel_no_subuid/config.txt
diff --git a/tests/tests/subids/55_userdel_no_subuid/config/etc/default/useradd b/tests/subids/55_userdel_no_subuid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/55_userdel_no_subuid/config/etc/default/useradd
rename to tests/subids/55_userdel_no_subuid/config/etc/default/useradd
diff --git a/tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/group b/tests/subids/55_userdel_no_subuid/config/etc/group
similarity index 100%
rename from tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/group
rename to tests/subids/55_userdel_no_subuid/config/etc/group
diff --git a/tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/gshadow b/tests/subids/55_userdel_no_subuid/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/gshadow
rename to tests/subids/55_userdel_no_subuid/config/etc/gshadow
diff --git a/tests/tests/subids/55_userdel_no_subuid/config/etc/passwd b/tests/subids/55_userdel_no_subuid/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/55_userdel_no_subuid/config/etc/passwd
rename to tests/subids/55_userdel_no_subuid/config/etc/passwd
diff --git a/tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/shadow b/tests/subids/55_userdel_no_subuid/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/shadow
rename to tests/subids/55_userdel_no_subuid/config/etc/shadow
diff --git a/tests/tests/subids/55_userdel_no_subuid/config/etc/subgid b/tests/subids/55_userdel_no_subuid/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/55_userdel_no_subuid/config/etc/subgid
rename to tests/subids/55_userdel_no_subuid/config/etc/subgid
diff --git a/tests/tests/subids/55_userdel_no_subuid/config/etc/subuid b/tests/subids/55_userdel_no_subuid/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/55_userdel_no_subuid/config/etc/subuid
rename to tests/subids/55_userdel_no_subuid/config/etc/subuid
diff --git a/tests/tests/subids/55_userdel_no_subuid/data/group b/tests/subids/55_userdel_no_subuid/data/group
similarity index 100%
rename from tests/tests/subids/55_userdel_no_subuid/data/group
rename to tests/subids/55_userdel_no_subuid/data/group
diff --git a/tests/tests/subids/55_userdel_no_subuid/data/gshadow b/tests/subids/55_userdel_no_subuid/data/gshadow
similarity index 100%
rename from tests/tests/subids/55_userdel_no_subuid/data/gshadow
rename to tests/subids/55_userdel_no_subuid/data/gshadow
diff --git a/tests/tests/subids/54_userdel_one_subgid_range/data/passwd b/tests/subids/55_userdel_no_subuid/data/passwd
similarity index 100%
rename from tests/tests/subids/54_userdel_one_subgid_range/data/passwd
rename to tests/subids/55_userdel_no_subuid/data/passwd
diff --git a/tests/tests/subids/54_userdel_one_subgid_range/data/shadow b/tests/subids/55_userdel_no_subuid/data/shadow
similarity index 100%
rename from tests/tests/subids/54_userdel_one_subgid_range/data/shadow
rename to tests/subids/55_userdel_no_subuid/data/shadow
diff --git a/tests/tests/subids/55_userdel_no_subuid/data/subgid b/tests/subids/55_userdel_no_subuid/data/subgid
similarity index 100%
rename from tests/tests/subids/55_userdel_no_subuid/data/subgid
rename to tests/subids/55_userdel_no_subuid/data/subgid
diff --git a/tests/tests/subids/55_userdel_no_subuid/userdel.test b/tests/subids/55_userdel_no_subuid/userdel.test
similarity index 100%
rename from tests/tests/subids/55_userdel_no_subuid/userdel.test
rename to tests/subids/55_userdel_no_subuid/userdel.test
diff --git a/tests/tests/subids/56_userdel_no_subgid/config.txt b/tests/subids/56_userdel_no_subgid/config.txt
similarity index 100%
rename from tests/tests/subids/56_userdel_no_subgid/config.txt
rename to tests/subids/56_userdel_no_subgid/config.txt
diff --git a/tests/tests/subids/56_userdel_no_subgid/config/etc/default/useradd b/tests/subids/56_userdel_no_subgid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/56_userdel_no_subgid/config/etc/default/useradd
rename to tests/subids/56_userdel_no_subgid/config/etc/default/useradd
diff --git a/tests/tests/subids/53_userdel_one_subuid_range/config/etc/group b/tests/subids/56_userdel_no_subgid/config/etc/group
similarity index 100%
rename from tests/tests/subids/53_userdel_one_subuid_range/config/etc/group
rename to tests/subids/56_userdel_no_subgid/config/etc/group
diff --git a/tests/tests/subids/53_userdel_one_subuid_range/config/etc/gshadow b/tests/subids/56_userdel_no_subgid/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/53_userdel_one_subuid_range/config/etc/gshadow
rename to tests/subids/56_userdel_no_subgid/config/etc/gshadow
diff --git a/tests/tests/subids/56_userdel_no_subgid/config/etc/passwd b/tests/subids/56_userdel_no_subgid/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/56_userdel_no_subgid/config/etc/passwd
rename to tests/subids/56_userdel_no_subgid/config/etc/passwd
diff --git a/tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/shadow b/tests/subids/56_userdel_no_subgid/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/shadow
rename to tests/subids/56_userdel_no_subgid/config/etc/shadow
diff --git a/tests/tests/subids/56_userdel_no_subgid/config/etc/subgid b/tests/subids/56_userdel_no_subgid/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/56_userdel_no_subgid/config/etc/subgid
rename to tests/subids/56_userdel_no_subgid/config/etc/subgid
diff --git a/tests/tests/subids/56_userdel_no_subgid/config/etc/subuid b/tests/subids/56_userdel_no_subgid/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/56_userdel_no_subgid/config/etc/subuid
rename to tests/subids/56_userdel_no_subgid/config/etc/subuid
diff --git a/tests/tests/subids/56_userdel_no_subgid/data/group b/tests/subids/56_userdel_no_subgid/data/group
similarity index 100%
rename from tests/tests/subids/56_userdel_no_subgid/data/group
rename to tests/subids/56_userdel_no_subgid/data/group
diff --git a/tests/tests/subids/56_userdel_no_subgid/data/gshadow b/tests/subids/56_userdel_no_subgid/data/gshadow
similarity index 100%
rename from tests/tests/subids/56_userdel_no_subgid/data/gshadow
rename to tests/subids/56_userdel_no_subgid/data/gshadow
diff --git a/tests/tests/subids/55_userdel_no_subuid/data/passwd b/tests/subids/56_userdel_no_subgid/data/passwd
similarity index 100%
rename from tests/tests/subids/55_userdel_no_subuid/data/passwd
rename to tests/subids/56_userdel_no_subgid/data/passwd
diff --git a/tests/tests/subids/55_userdel_no_subuid/data/shadow b/tests/subids/56_userdel_no_subgid/data/shadow
similarity index 100%
rename from tests/tests/subids/55_userdel_no_subuid/data/shadow
rename to tests/subids/56_userdel_no_subgid/data/shadow
diff --git a/tests/tests/subids/56_userdel_no_subgid/data/subuid b/tests/subids/56_userdel_no_subgid/data/subuid
similarity index 100%
rename from tests/tests/subids/56_userdel_no_subgid/data/subuid
rename to tests/subids/56_userdel_no_subgid/data/subuid
diff --git a/tests/tests/subids/56_userdel_no_subgid/userdel.test b/tests/subids/56_userdel_no_subgid/userdel.test
similarity index 100%
rename from tests/tests/subids/56_userdel_no_subgid/userdel.test
rename to tests/subids/56_userdel_no_subgid/userdel.test
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/config.txt b/tests/subids/57_userdel_multiple_ranges/config.txt
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/config.txt
rename to tests/subids/57_userdel_multiple_ranges/config.txt
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/config/etc/default/useradd b/tests/subids/57_userdel_multiple_ranges/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/config/etc/default/useradd
rename to tests/subids/57_userdel_multiple_ranges/config/etc/default/useradd
diff --git a/tests/tests/subids/54_userdel_one_subgid_range/config/etc/group b/tests/subids/57_userdel_multiple_ranges/config/etc/group
similarity index 100%
rename from tests/tests/subids/54_userdel_one_subgid_range/config/etc/group
rename to tests/subids/57_userdel_multiple_ranges/config/etc/group
diff --git a/tests/tests/subids/54_userdel_one_subgid_range/config/etc/gshadow b/tests/subids/57_userdel_multiple_ranges/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/54_userdel_one_subgid_range/config/etc/gshadow
rename to tests/subids/57_userdel_multiple_ranges/config/etc/gshadow
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/config/etc/passwd b/tests/subids/57_userdel_multiple_ranges/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/config/etc/passwd
rename to tests/subids/57_userdel_multiple_ranges/config/etc/passwd
diff --git a/tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/shadow b/tests/subids/57_userdel_multiple_ranges/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/shadow
rename to tests/subids/57_userdel_multiple_ranges/config/etc/shadow
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/config/etc/subgid b/tests/subids/57_userdel_multiple_ranges/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/config/etc/subgid
rename to tests/subids/57_userdel_multiple_ranges/config/etc/subgid
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/config/etc/subuid b/tests/subids/57_userdel_multiple_ranges/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/config/etc/subuid
rename to tests/subids/57_userdel_multiple_ranges/config/etc/subuid
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/data/group b/tests/subids/57_userdel_multiple_ranges/data/group
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/data/group
rename to tests/subids/57_userdel_multiple_ranges/data/group
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/data/gshadow b/tests/subids/57_userdel_multiple_ranges/data/gshadow
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/data/gshadow
rename to tests/subids/57_userdel_multiple_ranges/data/gshadow
diff --git a/tests/tests/subids/56_userdel_no_subgid/data/passwd b/tests/subids/57_userdel_multiple_ranges/data/passwd
similarity index 100%
rename from tests/tests/subids/56_userdel_no_subgid/data/passwd
rename to tests/subids/57_userdel_multiple_ranges/data/passwd
diff --git a/tests/tests/subids/56_userdel_no_subgid/data/shadow b/tests/subids/57_userdel_multiple_ranges/data/shadow
similarity index 100%
rename from tests/tests/subids/56_userdel_no_subgid/data/shadow
rename to tests/subids/57_userdel_multiple_ranges/data/shadow
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/data/subgid b/tests/subids/57_userdel_multiple_ranges/data/subgid
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/data/subgid
rename to tests/subids/57_userdel_multiple_ranges/data/subgid
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/data/subuid b/tests/subids/57_userdel_multiple_ranges/data/subuid
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/data/subuid
rename to tests/subids/57_userdel_multiple_ranges/data/subuid
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/userdel.test b/tests/subids/57_userdel_multiple_ranges/userdel.test
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/userdel.test
rename to tests/subids/57_userdel_multiple_ranges/userdel.test
diff --git a/tests/tests/subids/16_useradd_invalid_subgid_configuration2/config.txt b/tests/subids/58_newusers_with_subids/config.txt
similarity index 100%
rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/config.txt
rename to tests/subids/58_newusers_with_subids/config.txt
diff --git a/tests/tests/subids/18_useradd_min=max/config/etc/group b/tests/subids/58_newusers_with_subids/config/etc/group
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/config/etc/group
rename to tests/subids/58_newusers_with_subids/config/etc/group
diff --git a/tests/tests/subids/18_useradd_min=max/config/etc/gshadow b/tests/subids/58_newusers_with_subids/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/config/etc/gshadow
rename to tests/subids/58_newusers_with_subids/config/etc/gshadow
diff --git a/tests/tests/subids/58_newusers_with_subids/config/etc/pam.d/common-password b/tests/subids/58_newusers_with_subids/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/config/etc/pam.d/common-password
rename to tests/subids/58_newusers_with_subids/config/etc/pam.d/common-password
diff --git a/tests/tests/subids/58_newusers_with_subids/config/etc/pam.d/newusers b/tests/subids/58_newusers_with_subids/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/config/etc/pam.d/newusers
rename to tests/subids/58_newusers_with_subids/config/etc/pam.d/newusers
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/data/passwd b/tests/subids/58_newusers_with_subids/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/data/passwd
rename to tests/subids/58_newusers_with_subids/config/etc/passwd
diff --git a/tests/tests/subids/58_newusers_with_subids/config/etc/shadow b/tests/subids/58_newusers_with_subids/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/config/etc/shadow
rename to tests/subids/58_newusers_with_subids/config/etc/shadow
diff --git a/tests/tests/subids/58_newusers_with_subids/config/etc/subgid b/tests/subids/58_newusers_with_subids/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/config/etc/subgid
rename to tests/subids/58_newusers_with_subids/config/etc/subgid
diff --git a/tests/tests/subids/58_newusers_with_subids/config/etc/subuid b/tests/subids/58_newusers_with_subids/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/config/etc/subuid
rename to tests/subids/58_newusers_with_subids/config/etc/subuid
diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/data/group b/tests/subids/58_newusers_with_subids/data/group
similarity index 100%
rename from tests/tests/subids/06_useradd_fill_gap_middle/data/group
rename to tests/subids/58_newusers_with_subids/data/group
diff --git a/tests/tests/passwd/18_passwd_root_change_password_user/config/etc/gshadow b/tests/subids/58_newusers_with_subids/data/gshadow
similarity index 100%
rename from tests/tests/passwd/18_passwd_root_change_password_user/config/etc/gshadow
rename to tests/subids/58_newusers_with_subids/data/gshadow
diff --git a/tests/tests/subids/58_newusers_with_subids/data/newusers.list b/tests/subids/58_newusers_with_subids/data/newusers.list
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/data/newusers.list
rename to tests/subids/58_newusers_with_subids/data/newusers.list
diff --git a/tests/tests/subids/58_newusers_with_subids/data/passwd b/tests/subids/58_newusers_with_subids/data/passwd
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/data/passwd
rename to tests/subids/58_newusers_with_subids/data/passwd
diff --git a/tests/tests/subids/58_newusers_with_subids/data/shadow b/tests/subids/58_newusers_with_subids/data/shadow
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/data/shadow
rename to tests/subids/58_newusers_with_subids/data/shadow
diff --git a/tests/tests/subids/58_newusers_with_subids/data/subgid b/tests/subids/58_newusers_with_subids/data/subgid
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/data/subgid
rename to tests/subids/58_newusers_with_subids/data/subgid
diff --git a/tests/tests/subids/58_newusers_with_subids/data/subuid b/tests/subids/58_newusers_with_subids/data/subuid
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/data/subuid
rename to tests/subids/58_newusers_with_subids/data/subuid
diff --git a/tests/tests/subids/58_newusers_with_subids/newusers.test b/tests/subids/58_newusers_with_subids/newusers.test
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/newusers.test
rename to tests/subids/58_newusers_with_subids/newusers.test
diff --git a/tests/tests/subids/17_useradd_invalid_subgid_configuration3/config.txt b/tests/subids/59_newusers_no_subuid/config.txt
similarity index 100%
rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/config.txt
rename to tests/subids/59_newusers_no_subuid/config.txt
diff --git a/tests/tests/subids/58_newusers_with_subids/config/etc/group b/tests/subids/59_newusers_no_subuid/config/etc/group
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/config/etc/group
rename to tests/subids/59_newusers_no_subuid/config/etc/group
diff --git a/tests/tests/subids/58_newusers_with_subids/config/etc/gshadow b/tests/subids/59_newusers_no_subuid/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/config/etc/gshadow
rename to tests/subids/59_newusers_no_subuid/config/etc/gshadow
diff --git a/tests/tests/subids/59_newusers_no_subuid/config/etc/pam.d/common-password b/tests/subids/59_newusers_no_subuid/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/config/etc/pam.d/common-password
rename to tests/subids/59_newusers_no_subuid/config/etc/pam.d/common-password
diff --git a/tests/tests/subids/59_newusers_no_subuid/config/etc/pam.d/newusers b/tests/subids/59_newusers_no_subuid/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/config/etc/pam.d/newusers
rename to tests/subids/59_newusers_no_subuid/config/etc/pam.d/newusers
diff --git a/tests/tests/subids/58_newusers_with_subids/config/etc/passwd b/tests/subids/59_newusers_no_subuid/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/config/etc/passwd
rename to tests/subids/59_newusers_no_subuid/config/etc/passwd
diff --git a/tests/tests/subids/59_newusers_no_subuid/config/etc/shadow b/tests/subids/59_newusers_no_subuid/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/config/etc/shadow
rename to tests/subids/59_newusers_no_subuid/config/etc/shadow
diff --git a/tests/tests/subids/59_newusers_no_subuid/config/etc/subgid b/tests/subids/59_newusers_no_subuid/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/config/etc/subgid
rename to tests/subids/59_newusers_no_subuid/config/etc/subgid
diff --git a/tests/tests/subids/59_newusers_no_subuid/config/etc/subuid b/tests/subids/59_newusers_no_subuid/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/config/etc/subuid
rename to tests/subids/59_newusers_no_subuid/config/etc/subuid
diff --git a/tests/tests/subids/07_useradd_fill_gap_end/data/group b/tests/subids/59_newusers_no_subuid/data/group
similarity index 100%
rename from tests/tests/subids/07_useradd_fill_gap_end/data/group
rename to tests/subids/59_newusers_no_subuid/data/group
diff --git a/tests/tests/passwd/19_passwd_user_change_password/config/etc/gshadow b/tests/subids/59_newusers_no_subuid/data/gshadow
similarity index 100%
rename from tests/tests/passwd/19_passwd_user_change_password/config/etc/gshadow
rename to tests/subids/59_newusers_no_subuid/data/gshadow
diff --git a/tests/tests/subids/59_newusers_no_subuid/data/newusers.list b/tests/subids/59_newusers_no_subuid/data/newusers.list
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/data/newusers.list
rename to tests/subids/59_newusers_no_subuid/data/newusers.list
diff --git a/tests/tests/subids/59_newusers_no_subuid/data/passwd b/tests/subids/59_newusers_no_subuid/data/passwd
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/data/passwd
rename to tests/subids/59_newusers_no_subuid/data/passwd
diff --git a/tests/tests/subids/59_newusers_no_subuid/data/shadow b/tests/subids/59_newusers_no_subuid/data/shadow
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/data/shadow
rename to tests/subids/59_newusers_no_subuid/data/shadow
diff --git a/tests/tests/subids/59_newusers_no_subuid/data/subgid b/tests/subids/59_newusers_no_subuid/data/subgid
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/data/subgid
rename to tests/subids/59_newusers_no_subuid/data/subgid
diff --git a/tests/tests/subids/59_newusers_no_subuid/newusers.test b/tests/subids/59_newusers_no_subuid/newusers.test
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/newusers.test
rename to tests/subids/59_newusers_no_subuid/newusers.test
diff --git a/tests/tests/subids/18_useradd_min=max/config.txt b/tests/subids/60_newusers_no_subgid/config.txt
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/config.txt
rename to tests/subids/60_newusers_no_subgid/config.txt
diff --git a/tests/tests/subids/59_newusers_no_subuid/config/etc/group b/tests/subids/60_newusers_no_subgid/config/etc/group
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/config/etc/group
rename to tests/subids/60_newusers_no_subgid/config/etc/group
diff --git a/tests/tests/subids/59_newusers_no_subuid/config/etc/gshadow b/tests/subids/60_newusers_no_subgid/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/config/etc/gshadow
rename to tests/subids/60_newusers_no_subgid/config/etc/gshadow
diff --git a/tests/tests/subids/60_newusers_no_subgid/config/etc/pam.d/common-password b/tests/subids/60_newusers_no_subgid/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/config/etc/pam.d/common-password
rename to tests/subids/60_newusers_no_subgid/config/etc/pam.d/common-password
diff --git a/tests/tests/subids/60_newusers_no_subgid/config/etc/pam.d/newusers b/tests/subids/60_newusers_no_subgid/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/config/etc/pam.d/newusers
rename to tests/subids/60_newusers_no_subgid/config/etc/pam.d/newusers
diff --git a/tests/tests/subids/59_newusers_no_subuid/config/etc/passwd b/tests/subids/60_newusers_no_subgid/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/config/etc/passwd
rename to tests/subids/60_newusers_no_subgid/config/etc/passwd
diff --git a/tests/tests/subids/60_newusers_no_subgid/config/etc/shadow b/tests/subids/60_newusers_no_subgid/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/config/etc/shadow
rename to tests/subids/60_newusers_no_subgid/config/etc/shadow
diff --git a/tests/tests/subids/60_newusers_no_subgid/config/etc/subgid b/tests/subids/60_newusers_no_subgid/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/config/etc/subgid
rename to tests/subids/60_newusers_no_subgid/config/etc/subgid
diff --git a/tests/tests/subids/60_newusers_no_subgid/config/etc/subuid b/tests/subids/60_newusers_no_subgid/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/config/etc/subuid
rename to tests/subids/60_newusers_no_subgid/config/etc/subuid
diff --git a/tests/tests/subids/18_useradd_min=max/data/group b/tests/subids/60_newusers_no_subgid/data/group
similarity index 100%
rename from tests/tests/subids/18_useradd_min=max/data/group
rename to tests/subids/60_newusers_no_subgid/data/group
diff --git a/tests/tests/passwd/20_passwd_user_change_password_same_user/config/etc/gshadow b/tests/subids/60_newusers_no_subgid/data/gshadow
similarity index 100%
rename from tests/tests/passwd/20_passwd_user_change_password_same_user/config/etc/gshadow
rename to tests/subids/60_newusers_no_subgid/data/gshadow
diff --git a/tests/tests/subids/60_newusers_no_subgid/data/newusers.list b/tests/subids/60_newusers_no_subgid/data/newusers.list
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/data/newusers.list
rename to tests/subids/60_newusers_no_subgid/data/newusers.list
diff --git a/tests/tests/subids/60_newusers_no_subgid/data/passwd b/tests/subids/60_newusers_no_subgid/data/passwd
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/data/passwd
rename to tests/subids/60_newusers_no_subgid/data/passwd
diff --git a/tests/tests/subids/60_newusers_no_subgid/data/shadow b/tests/subids/60_newusers_no_subgid/data/shadow
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/data/shadow
rename to tests/subids/60_newusers_no_subgid/data/shadow
diff --git a/tests/tests/subids/60_newusers_no_subgid/data/subuid b/tests/subids/60_newusers_no_subgid/data/subuid
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/data/subuid
rename to tests/subids/60_newusers_no_subgid/data/subuid
diff --git a/tests/tests/subids/60_newusers_no_subgid/newusers.test b/tests/subids/60_newusers_no_subgid/newusers.test
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/newusers.test
rename to tests/subids/60_newusers_no_subgid/newusers.test
diff --git a/tests/tests/subids/19_useradd_locked_subuid/config.txt b/tests/subids/61_newusers_user_already_has_subgids/config.txt
similarity index 100%
rename from tests/tests/subids/19_useradd_locked_subuid/config.txt
rename to tests/subids/61_newusers_user_already_has_subgids/config.txt
diff --git a/tests/tests/subids/58_newusers_with_subids/data/group b/tests/subids/61_newusers_user_already_has_subgids/config/etc/group
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/data/group
rename to tests/subids/61_newusers_user_already_has_subgids/config/etc/group
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/gshadow b/tests/subids/61_newusers_user_already_has_subgids/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/gshadow
rename to tests/subids/61_newusers_user_already_has_subgids/config/etc/gshadow
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/pam.d/common-password b/tests/subids/61_newusers_user_already_has_subgids/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/pam.d/common-password
rename to tests/subids/61_newusers_user_already_has_subgids/config/etc/pam.d/common-password
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/pam.d/newusers b/tests/subids/61_newusers_user_already_has_subgids/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/pam.d/newusers
rename to tests/subids/61_newusers_user_already_has_subgids/config/etc/pam.d/newusers
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/passwd b/tests/subids/61_newusers_user_already_has_subgids/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/passwd
rename to tests/subids/61_newusers_user_already_has_subgids/config/etc/passwd
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/shadow b/tests/subids/61_newusers_user_already_has_subgids/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/shadow
rename to tests/subids/61_newusers_user_already_has_subgids/config/etc/shadow
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/subgid b/tests/subids/61_newusers_user_already_has_subgids/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/subgid
rename to tests/subids/61_newusers_user_already_has_subgids/config/etc/subgid
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/subuid b/tests/subids/61_newusers_user_already_has_subgids/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/subuid
rename to tests/subids/61_newusers_user_already_has_subgids/config/etc/subuid
diff --git a/tests/tests/subids/59_newusers_no_subuid/data/group b/tests/subids/61_newusers_user_already_has_subgids/data/group
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/data/group
rename to tests/subids/61_newusers_user_already_has_subgids/data/group
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/data/gshadow b/tests/subids/61_newusers_user_already_has_subgids/data/gshadow
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/data/gshadow
rename to tests/subids/61_newusers_user_already_has_subgids/data/gshadow
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/data/newusers.list b/tests/subids/61_newusers_user_already_has_subgids/data/newusers.list
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/data/newusers.list
rename to tests/subids/61_newusers_user_already_has_subgids/data/newusers.list
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/data/passwd b/tests/subids/61_newusers_user_already_has_subgids/data/passwd
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/data/passwd
rename to tests/subids/61_newusers_user_already_has_subgids/data/passwd
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/data/shadow b/tests/subids/61_newusers_user_already_has_subgids/data/shadow
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/data/shadow
rename to tests/subids/61_newusers_user_already_has_subgids/data/shadow
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/data/subuid b/tests/subids/61_newusers_user_already_has_subgids/data/subuid
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/data/subuid
rename to tests/subids/61_newusers_user_already_has_subgids/data/subuid
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/newusers.test b/tests/subids/61_newusers_user_already_has_subgids/newusers.test
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/newusers.test
rename to tests/subids/61_newusers_user_already_has_subgids/newusers.test
diff --git a/tests/tests/subids/20_useradd_locked_subgid/config.txt b/tests/subids/62_newusers_user_already_has_subuids/config.txt
similarity index 100%
rename from tests/tests/subids/20_useradd_locked_subgid/config.txt
rename to tests/subids/62_newusers_user_already_has_subuids/config.txt
diff --git a/tests/tests/subids/60_newusers_no_subgid/data/group b/tests/subids/62_newusers_user_already_has_subuids/config/etc/group
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/data/group
rename to tests/subids/62_newusers_user_already_has_subuids/config/etc/group
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/gshadow b/tests/subids/62_newusers_user_already_has_subuids/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/gshadow
rename to tests/subids/62_newusers_user_already_has_subuids/config/etc/gshadow
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/pam.d/common-password b/tests/subids/62_newusers_user_already_has_subuids/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/pam.d/common-password
rename to tests/subids/62_newusers_user_already_has_subuids/config/etc/pam.d/common-password
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/pam.d/newusers b/tests/subids/62_newusers_user_already_has_subuids/config/etc/pam.d/newusers
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/pam.d/newusers
rename to tests/subids/62_newusers_user_already_has_subuids/config/etc/pam.d/newusers
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/passwd b/tests/subids/62_newusers_user_already_has_subuids/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/passwd
rename to tests/subids/62_newusers_user_already_has_subuids/config/etc/passwd
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/shadow b/tests/subids/62_newusers_user_already_has_subuids/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/shadow
rename to tests/subids/62_newusers_user_already_has_subuids/config/etc/shadow
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/subgid b/tests/subids/62_newusers_user_already_has_subuids/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/subgid
rename to tests/subids/62_newusers_user_already_has_subuids/config/etc/subgid
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/subuid b/tests/subids/62_newusers_user_already_has_subuids/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/subuid
rename to tests/subids/62_newusers_user_already_has_subuids/config/etc/subuid
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/group b/tests/subids/62_newusers_user_already_has_subuids/data/group
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/group
rename to tests/subids/62_newusers_user_already_has_subuids/data/group
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/data/gshadow b/tests/subids/62_newusers_user_already_has_subuids/data/gshadow
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/data/gshadow
rename to tests/subids/62_newusers_user_already_has_subuids/data/gshadow
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/data/newusers.list b/tests/subids/62_newusers_user_already_has_subuids/data/newusers.list
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/data/newusers.list
rename to tests/subids/62_newusers_user_already_has_subuids/data/newusers.list
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/data/passwd b/tests/subids/62_newusers_user_already_has_subuids/data/passwd
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/data/passwd
rename to tests/subids/62_newusers_user_already_has_subuids/data/passwd
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/data/shadow b/tests/subids/62_newusers_user_already_has_subuids/data/shadow
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/data/shadow
rename to tests/subids/62_newusers_user_already_has_subuids/data/shadow
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/data/subgid b/tests/subids/62_newusers_user_already_has_subuids/data/subgid
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/data/subgid
rename to tests/subids/62_newusers_user_already_has_subuids/data/subgid
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/newusers.test b/tests/subids/62_newusers_user_already_has_subuids/newusers.test
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/newusers.test
rename to tests/subids/62_newusers_user_already_has_subuids/newusers.test
diff --git a/tests/tests/subids/41_usermod_locked_subuid/config.txt b/tests/subids/63_useradd_fill_gap4/config.txt
similarity index 100%
rename from tests/tests/subids/41_usermod_locked_subuid/config.txt
rename to tests/subids/63_useradd_fill_gap4/config.txt
diff --git a/tests/tests/subids/63_useradd_fill_gap4/config/etc/default/useradd b/tests/subids/63_useradd_fill_gap4/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/config/etc/default/useradd
rename to tests/subids/63_useradd_fill_gap4/config/etc/default/useradd
diff --git a/tests/tests/subids/60_newusers_no_subgid/config/etc/group b/tests/subids/63_useradd_fill_gap4/config/etc/group
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/config/etc/group
rename to tests/subids/63_useradd_fill_gap4/config/etc/group
diff --git a/tests/tests/subids/60_newusers_no_subgid/config/etc/gshadow b/tests/subids/63_useradd_fill_gap4/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/config/etc/gshadow
rename to tests/subids/63_useradd_fill_gap4/config/etc/gshadow
diff --git a/tests/tests/subids/60_newusers_no_subgid/config/etc/passwd b/tests/subids/63_useradd_fill_gap4/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/config/etc/passwd
rename to tests/subids/63_useradd_fill_gap4/config/etc/passwd
diff --git a/tests/tests/subids/63_useradd_fill_gap4/config/etc/shadow b/tests/subids/63_useradd_fill_gap4/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/config/etc/shadow
rename to tests/subids/63_useradd_fill_gap4/config/etc/shadow
diff --git a/tests/tests/subids/63_useradd_fill_gap4/config/etc/subgid b/tests/subids/63_useradd_fill_gap4/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/config/etc/subgid
rename to tests/subids/63_useradd_fill_gap4/config/etc/subgid
diff --git a/tests/tests/subids/63_useradd_fill_gap4/config/etc/subuid b/tests/subids/63_useradd_fill_gap4/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/config/etc/subuid
rename to tests/subids/63_useradd_fill_gap4/config/etc/subuid
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/data/group b/tests/subids/63_useradd_fill_gap4/data/group
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/data/group
rename to tests/subids/63_useradd_fill_gap4/data/group
diff --git a/tests/tests/subids/63_useradd_fill_gap4/data/gshadow b/tests/subids/63_useradd_fill_gap4/data/gshadow
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/data/gshadow
rename to tests/subids/63_useradd_fill_gap4/data/gshadow
diff --git a/tests/tests/subids/63_useradd_fill_gap4/data/passwd b/tests/subids/63_useradd_fill_gap4/data/passwd
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/data/passwd
rename to tests/subids/63_useradd_fill_gap4/data/passwd
diff --git a/tests/tests/subids/63_useradd_fill_gap4/data/shadow b/tests/subids/63_useradd_fill_gap4/data/shadow
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/data/shadow
rename to tests/subids/63_useradd_fill_gap4/data/shadow
diff --git a/tests/tests/subids/63_useradd_fill_gap4/data/subgid b/tests/subids/63_useradd_fill_gap4/data/subgid
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/data/subgid
rename to tests/subids/63_useradd_fill_gap4/data/subgid
diff --git a/tests/tests/subids/63_useradd_fill_gap4/data/subuid b/tests/subids/63_useradd_fill_gap4/data/subuid
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/data/subuid
rename to tests/subids/63_useradd_fill_gap4/data/subuid
diff --git a/tests/tests/subids/63_useradd_fill_gap4/useradd.test b/tests/subids/63_useradd_fill_gap4/useradd.test
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/useradd.test
rename to tests/subids/63_useradd_fill_gap4/useradd.test
diff --git a/tests/tests/subids/42_usermod_locked_subgid/config.txt b/tests/subids/64_useradd_fill_gap5/config.txt
similarity index 100%
rename from tests/tests/subids/42_usermod_locked_subgid/config.txt
rename to tests/subids/64_useradd_fill_gap5/config.txt
diff --git a/tests/tests/subids/64_useradd_fill_gap5/config/etc/default/useradd b/tests/subids/64_useradd_fill_gap5/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/config/etc/default/useradd
rename to tests/subids/64_useradd_fill_gap5/config/etc/default/useradd
diff --git a/tests/tests/subids/63_useradd_fill_gap4/config/etc/group b/tests/subids/64_useradd_fill_gap5/config/etc/group
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/config/etc/group
rename to tests/subids/64_useradd_fill_gap5/config/etc/group
diff --git a/tests/tests/subids/63_useradd_fill_gap4/config/etc/gshadow b/tests/subids/64_useradd_fill_gap5/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/config/etc/gshadow
rename to tests/subids/64_useradd_fill_gap5/config/etc/gshadow
diff --git a/tests/tests/subids/63_useradd_fill_gap4/config/etc/passwd b/tests/subids/64_useradd_fill_gap5/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/config/etc/passwd
rename to tests/subids/64_useradd_fill_gap5/config/etc/passwd
diff --git a/tests/tests/subids/64_useradd_fill_gap5/config/etc/shadow b/tests/subids/64_useradd_fill_gap5/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/config/etc/shadow
rename to tests/subids/64_useradd_fill_gap5/config/etc/shadow
diff --git a/tests/tests/subids/64_useradd_fill_gap5/config/etc/subgid b/tests/subids/64_useradd_fill_gap5/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/config/etc/subgid
rename to tests/subids/64_useradd_fill_gap5/config/etc/subgid
diff --git a/tests/tests/subids/64_useradd_fill_gap5/config/etc/subuid b/tests/subids/64_useradd_fill_gap5/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/config/etc/subuid
rename to tests/subids/64_useradd_fill_gap5/config/etc/subuid
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/group b/tests/subids/64_useradd_fill_gap5/data/group
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/group
rename to tests/subids/64_useradd_fill_gap5/data/group
diff --git a/tests/tests/subids/64_useradd_fill_gap5/data/gshadow b/tests/subids/64_useradd_fill_gap5/data/gshadow
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/data/gshadow
rename to tests/subids/64_useradd_fill_gap5/data/gshadow
diff --git a/tests/tests/subids/64_useradd_fill_gap5/data/passwd b/tests/subids/64_useradd_fill_gap5/data/passwd
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/data/passwd
rename to tests/subids/64_useradd_fill_gap5/data/passwd
diff --git a/tests/tests/subids/64_useradd_fill_gap5/data/shadow b/tests/subids/64_useradd_fill_gap5/data/shadow
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/data/shadow
rename to tests/subids/64_useradd_fill_gap5/data/shadow
diff --git a/tests/tests/subids/64_useradd_fill_gap5/data/subgid b/tests/subids/64_useradd_fill_gap5/data/subgid
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/data/subgid
rename to tests/subids/64_useradd_fill_gap5/data/subgid
diff --git a/tests/tests/subids/64_useradd_fill_gap5/data/subuid b/tests/subids/64_useradd_fill_gap5/data/subuid
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/data/subuid
rename to tests/subids/64_useradd_fill_gap5/data/subuid
diff --git a/tests/tests/subids/64_useradd_fill_gap5/useradd.test b/tests/subids/64_useradd_fill_gap5/useradd.test
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/useradd.test
rename to tests/subids/64_useradd_fill_gap5/useradd.test
diff --git a/tests/tests/subids/43_usermod_-w_no_subgid/config.txt b/tests/subids/65_useradd_fill_gap6/config.txt
similarity index 100%
rename from tests/tests/subids/43_usermod_-w_no_subgid/config.txt
rename to tests/subids/65_useradd_fill_gap6/config.txt
diff --git a/tests/tests/subids/65_useradd_fill_gap6/config/etc/default/useradd b/tests/subids/65_useradd_fill_gap6/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/config/etc/default/useradd
rename to tests/subids/65_useradd_fill_gap6/config/etc/default/useradd
diff --git a/tests/tests/subids/64_useradd_fill_gap5/config/etc/group b/tests/subids/65_useradd_fill_gap6/config/etc/group
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/config/etc/group
rename to tests/subids/65_useradd_fill_gap6/config/etc/group
diff --git a/tests/tests/subids/64_useradd_fill_gap5/config/etc/gshadow b/tests/subids/65_useradd_fill_gap6/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/config/etc/gshadow
rename to tests/subids/65_useradd_fill_gap6/config/etc/gshadow
diff --git a/tests/tests/subids/64_useradd_fill_gap5/config/etc/passwd b/tests/subids/65_useradd_fill_gap6/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/config/etc/passwd
rename to tests/subids/65_useradd_fill_gap6/config/etc/passwd
diff --git a/tests/tests/subids/65_useradd_fill_gap6/config/etc/shadow b/tests/subids/65_useradd_fill_gap6/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/config/etc/shadow
rename to tests/subids/65_useradd_fill_gap6/config/etc/shadow
diff --git a/tests/tests/subids/65_useradd_fill_gap6/config/etc/subgid b/tests/subids/65_useradd_fill_gap6/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/config/etc/subgid
rename to tests/subids/65_useradd_fill_gap6/config/etc/subgid
diff --git a/tests/tests/subids/65_useradd_fill_gap6/config/etc/subuid b/tests/subids/65_useradd_fill_gap6/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/config/etc/subuid
rename to tests/subids/65_useradd_fill_gap6/config/etc/subuid
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/data/group b/tests/subids/65_useradd_fill_gap6/data/group
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/data/group
rename to tests/subids/65_useradd_fill_gap6/data/group
diff --git a/tests/tests/subids/65_useradd_fill_gap6/data/gshadow b/tests/subids/65_useradd_fill_gap6/data/gshadow
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/data/gshadow
rename to tests/subids/65_useradd_fill_gap6/data/gshadow
diff --git a/tests/tests/subids/65_useradd_fill_gap6/data/passwd b/tests/subids/65_useradd_fill_gap6/data/passwd
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/data/passwd
rename to tests/subids/65_useradd_fill_gap6/data/passwd
diff --git a/tests/tests/subids/65_useradd_fill_gap6/data/shadow b/tests/subids/65_useradd_fill_gap6/data/shadow
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/data/shadow
rename to tests/subids/65_useradd_fill_gap6/data/shadow
diff --git a/tests/tests/subids/65_useradd_fill_gap6/data/subgid b/tests/subids/65_useradd_fill_gap6/data/subgid
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/data/subgid
rename to tests/subids/65_useradd_fill_gap6/data/subgid
diff --git a/tests/tests/subids/65_useradd_fill_gap6/data/subuid b/tests/subids/65_useradd_fill_gap6/data/subuid
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/data/subuid
rename to tests/subids/65_useradd_fill_gap6/data/subuid
diff --git a/tests/tests/subids/65_useradd_fill_gap6/useradd.test b/tests/subids/65_useradd_fill_gap6/useradd.test
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/useradd.test
rename to tests/subids/65_useradd_fill_gap6/useradd.test
diff --git a/tests/tests/subids/44_usermod_-W_no_subgid/config.txt b/tests/subids/66_subordinate_range_cmp/config.txt
similarity index 100%
rename from tests/tests/subids/44_usermod_-W_no_subgid/config.txt
rename to tests/subids/66_subordinate_range_cmp/config.txt
diff --git a/tests/tests/subids/66_subordinate_range_cmp/config/etc/default/useradd b/tests/subids/66_subordinate_range_cmp/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/config/etc/default/useradd
rename to tests/subids/66_subordinate_range_cmp/config/etc/default/useradd
diff --git a/tests/tests/subids/65_useradd_fill_gap6/config/etc/group b/tests/subids/66_subordinate_range_cmp/config/etc/group
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/config/etc/group
rename to tests/subids/66_subordinate_range_cmp/config/etc/group
diff --git a/tests/tests/subids/65_useradd_fill_gap6/config/etc/gshadow b/tests/subids/66_subordinate_range_cmp/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/config/etc/gshadow
rename to tests/subids/66_subordinate_range_cmp/config/etc/gshadow
diff --git a/tests/tests/subids/65_useradd_fill_gap6/config/etc/passwd b/tests/subids/66_subordinate_range_cmp/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/config/etc/passwd
rename to tests/subids/66_subordinate_range_cmp/config/etc/passwd
diff --git a/tests/tests/subids/66_subordinate_range_cmp/config/etc/shadow b/tests/subids/66_subordinate_range_cmp/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/config/etc/shadow
rename to tests/subids/66_subordinate_range_cmp/config/etc/shadow
diff --git a/tests/tests/subids/66_subordinate_range_cmp/config/etc/subgid b/tests/subids/66_subordinate_range_cmp/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/config/etc/subgid
rename to tests/subids/66_subordinate_range_cmp/config/etc/subgid
diff --git a/tests/tests/subids/66_subordinate_range_cmp/config/etc/subuid b/tests/subids/66_subordinate_range_cmp/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/config/etc/subuid
rename to tests/subids/66_subordinate_range_cmp/config/etc/subuid
diff --git a/tests/tests/subids/63_useradd_fill_gap4/data/group b/tests/subids/66_subordinate_range_cmp/data/group
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/data/group
rename to tests/subids/66_subordinate_range_cmp/data/group
diff --git a/tests/tests/subids/66_subordinate_range_cmp/data/gshadow b/tests/subids/66_subordinate_range_cmp/data/gshadow
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/data/gshadow
rename to tests/subids/66_subordinate_range_cmp/data/gshadow
diff --git a/tests/tests/subids/66_subordinate_range_cmp/data/passwd b/tests/subids/66_subordinate_range_cmp/data/passwd
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/data/passwd
rename to tests/subids/66_subordinate_range_cmp/data/passwd
diff --git a/tests/tests/subids/66_subordinate_range_cmp/data/shadow b/tests/subids/66_subordinate_range_cmp/data/shadow
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/data/shadow
rename to tests/subids/66_subordinate_range_cmp/data/shadow
diff --git a/tests/tests/subids/66_subordinate_range_cmp/data/subgid b/tests/subids/66_subordinate_range_cmp/data/subgid
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/data/subgid
rename to tests/subids/66_subordinate_range_cmp/data/subgid
diff --git a/tests/tests/subids/66_subordinate_range_cmp/data/subuid b/tests/subids/66_subordinate_range_cmp/data/subuid
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/data/subuid
rename to tests/subids/66_subordinate_range_cmp/data/subuid
diff --git a/tests/tests/subids/66_subordinate_range_cmp/useradd.test b/tests/subids/66_subordinate_range_cmp/useradd.test
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/useradd.test
rename to tests/subids/66_subordinate_range_cmp/useradd.test
diff --git a/tests/tests/subids/45_usermod_-v_no_subgid/config.txt b/tests/subids/67_invalid_subuid_file1/config.txt
similarity index 100%
rename from tests/tests/subids/45_usermod_-v_no_subgid/config.txt
rename to tests/subids/67_invalid_subuid_file1/config.txt
diff --git a/tests/tests/subids/67_invalid_subuid_file1/config/etc/default/useradd b/tests/subids/67_invalid_subuid_file1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/config/etc/default/useradd
rename to tests/subids/67_invalid_subuid_file1/config/etc/default/useradd
diff --git a/tests/tests/subids/66_subordinate_range_cmp/config/etc/group b/tests/subids/67_invalid_subuid_file1/config/etc/group
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/config/etc/group
rename to tests/subids/67_invalid_subuid_file1/config/etc/group
diff --git a/tests/tests/subids/66_subordinate_range_cmp/config/etc/gshadow b/tests/subids/67_invalid_subuid_file1/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/config/etc/gshadow
rename to tests/subids/67_invalid_subuid_file1/config/etc/gshadow
diff --git a/tests/tests/subids/66_subordinate_range_cmp/config/etc/passwd b/tests/subids/67_invalid_subuid_file1/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/config/etc/passwd
rename to tests/subids/67_invalid_subuid_file1/config/etc/passwd
diff --git a/tests/tests/subids/67_invalid_subuid_file1/config/etc/shadow b/tests/subids/67_invalid_subuid_file1/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/config/etc/shadow
rename to tests/subids/67_invalid_subuid_file1/config/etc/shadow
diff --git a/tests/tests/subids/67_invalid_subuid_file1/config/etc/subgid b/tests/subids/67_invalid_subuid_file1/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/config/etc/subgid
rename to tests/subids/67_invalid_subuid_file1/config/etc/subgid
diff --git a/tests/tests/subids/67_invalid_subuid_file1/config/etc/subuid b/tests/subids/67_invalid_subuid_file1/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/config/etc/subuid
rename to tests/subids/67_invalid_subuid_file1/config/etc/subuid
diff --git a/tests/tests/subids/64_useradd_fill_gap5/data/group b/tests/subids/67_invalid_subuid_file1/data/group
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/data/group
rename to tests/subids/67_invalid_subuid_file1/data/group
diff --git a/tests/tests/subids/67_invalid_subuid_file1/data/gshadow b/tests/subids/67_invalid_subuid_file1/data/gshadow
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/data/gshadow
rename to tests/subids/67_invalid_subuid_file1/data/gshadow
diff --git a/tests/tests/subids/67_invalid_subuid_file1/data/passwd b/tests/subids/67_invalid_subuid_file1/data/passwd
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/data/passwd
rename to tests/subids/67_invalid_subuid_file1/data/passwd
diff --git a/tests/tests/subids/67_invalid_subuid_file1/data/shadow b/tests/subids/67_invalid_subuid_file1/data/shadow
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/data/shadow
rename to tests/subids/67_invalid_subuid_file1/data/shadow
diff --git a/tests/tests/subids/67_invalid_subuid_file1/data/subgid b/tests/subids/67_invalid_subuid_file1/data/subgid
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/data/subgid
rename to tests/subids/67_invalid_subuid_file1/data/subgid
diff --git a/tests/tests/subids/67_invalid_subuid_file1/data/subuid b/tests/subids/67_invalid_subuid_file1/data/subuid
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/data/subuid
rename to tests/subids/67_invalid_subuid_file1/data/subuid
diff --git a/tests/tests/subids/67_invalid_subuid_file1/useradd.test b/tests/subids/67_invalid_subuid_file1/useradd.test
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/useradd.test
rename to tests/subids/67_invalid_subuid_file1/useradd.test
diff --git a/tests/tests/subids/46_usermod_-V_no_subgid/config.txt b/tests/subids/68_invalid_subuid_file2/config.txt
similarity index 100%
rename from tests/tests/subids/46_usermod_-V_no_subgid/config.txt
rename to tests/subids/68_invalid_subuid_file2/config.txt
diff --git a/tests/tests/subids/68_invalid_subuid_file2/config/etc/default/useradd b/tests/subids/68_invalid_subuid_file2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/config/etc/default/useradd
rename to tests/subids/68_invalid_subuid_file2/config/etc/default/useradd
diff --git a/tests/tests/subids/67_invalid_subuid_file1/config/etc/group b/tests/subids/68_invalid_subuid_file2/config/etc/group
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/config/etc/group
rename to tests/subids/68_invalid_subuid_file2/config/etc/group
diff --git a/tests/tests/subids/67_invalid_subuid_file1/config/etc/gshadow b/tests/subids/68_invalid_subuid_file2/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/config/etc/gshadow
rename to tests/subids/68_invalid_subuid_file2/config/etc/gshadow
diff --git a/tests/tests/subids/67_invalid_subuid_file1/config/etc/passwd b/tests/subids/68_invalid_subuid_file2/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/config/etc/passwd
rename to tests/subids/68_invalid_subuid_file2/config/etc/passwd
diff --git a/tests/tests/subids/68_invalid_subuid_file2/config/etc/shadow b/tests/subids/68_invalid_subuid_file2/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/config/etc/shadow
rename to tests/subids/68_invalid_subuid_file2/config/etc/shadow
diff --git a/tests/tests/subids/68_invalid_subuid_file2/config/etc/subgid b/tests/subids/68_invalid_subuid_file2/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/config/etc/subgid
rename to tests/subids/68_invalid_subuid_file2/config/etc/subgid
diff --git a/tests/tests/subids/68_invalid_subuid_file2/config/etc/subuid b/tests/subids/68_invalid_subuid_file2/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/config/etc/subuid
rename to tests/subids/68_invalid_subuid_file2/config/etc/subuid
diff --git a/tests/tests/subids/65_useradd_fill_gap6/data/group b/tests/subids/68_invalid_subuid_file2/data/group
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/data/group
rename to tests/subids/68_invalid_subuid_file2/data/group
diff --git a/tests/tests/subids/68_invalid_subuid_file2/data/gshadow b/tests/subids/68_invalid_subuid_file2/data/gshadow
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/data/gshadow
rename to tests/subids/68_invalid_subuid_file2/data/gshadow
diff --git a/tests/tests/subids/68_invalid_subuid_file2/data/passwd b/tests/subids/68_invalid_subuid_file2/data/passwd
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/data/passwd
rename to tests/subids/68_invalid_subuid_file2/data/passwd
diff --git a/tests/tests/subids/68_invalid_subuid_file2/data/shadow b/tests/subids/68_invalid_subuid_file2/data/shadow
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/data/shadow
rename to tests/subids/68_invalid_subuid_file2/data/shadow
diff --git a/tests/tests/subids/68_invalid_subuid_file2/data/subgid b/tests/subids/68_invalid_subuid_file2/data/subgid
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/data/subgid
rename to tests/subids/68_invalid_subuid_file2/data/subgid
diff --git a/tests/tests/subids/68_invalid_subuid_file2/data/subuid b/tests/subids/68_invalid_subuid_file2/data/subuid
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/data/subuid
rename to tests/subids/68_invalid_subuid_file2/data/subuid
diff --git a/tests/tests/subids/68_invalid_subuid_file2/useradd.test b/tests/subids/68_invalid_subuid_file2/useradd.test
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/useradd.test
rename to tests/subids/68_invalid_subuid_file2/useradd.test
diff --git a/tests/tests/subids/58_newusers_with_subids/config.txt b/tests/subids/69_invalid_subuid_file3/config.txt
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/config.txt
rename to tests/subids/69_invalid_subuid_file3/config.txt
diff --git a/tests/tests/subids/69_invalid_subuid_file3/config/etc/default/useradd b/tests/subids/69_invalid_subuid_file3/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/config/etc/default/useradd
rename to tests/subids/69_invalid_subuid_file3/config/etc/default/useradd
diff --git a/tests/tests/subids/68_invalid_subuid_file2/config/etc/group b/tests/subids/69_invalid_subuid_file3/config/etc/group
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/config/etc/group
rename to tests/subids/69_invalid_subuid_file3/config/etc/group
diff --git a/tests/tests/subids/68_invalid_subuid_file2/config/etc/gshadow b/tests/subids/69_invalid_subuid_file3/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/config/etc/gshadow
rename to tests/subids/69_invalid_subuid_file3/config/etc/gshadow
diff --git a/tests/tests/subids/68_invalid_subuid_file2/config/etc/passwd b/tests/subids/69_invalid_subuid_file3/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/config/etc/passwd
rename to tests/subids/69_invalid_subuid_file3/config/etc/passwd
diff --git a/tests/tests/subids/69_invalid_subuid_file3/config/etc/shadow b/tests/subids/69_invalid_subuid_file3/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/config/etc/shadow
rename to tests/subids/69_invalid_subuid_file3/config/etc/shadow
diff --git a/tests/tests/subids/69_invalid_subuid_file3/config/etc/subgid b/tests/subids/69_invalid_subuid_file3/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/config/etc/subgid
rename to tests/subids/69_invalid_subuid_file3/config/etc/subgid
diff --git a/tests/tests/subids/69_invalid_subuid_file3/config/etc/subuid b/tests/subids/69_invalid_subuid_file3/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/config/etc/subuid
rename to tests/subids/69_invalid_subuid_file3/config/etc/subuid
diff --git a/tests/tests/subids/66_subordinate_range_cmp/data/group b/tests/subids/69_invalid_subuid_file3/data/group
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/data/group
rename to tests/subids/69_invalid_subuid_file3/data/group
diff --git a/tests/tests/subids/69_invalid_subuid_file3/data/gshadow b/tests/subids/69_invalid_subuid_file3/data/gshadow
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/data/gshadow
rename to tests/subids/69_invalid_subuid_file3/data/gshadow
diff --git a/tests/tests/subids/69_invalid_subuid_file3/data/passwd b/tests/subids/69_invalid_subuid_file3/data/passwd
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/data/passwd
rename to tests/subids/69_invalid_subuid_file3/data/passwd
diff --git a/tests/tests/subids/69_invalid_subuid_file3/data/shadow b/tests/subids/69_invalid_subuid_file3/data/shadow
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/data/shadow
rename to tests/subids/69_invalid_subuid_file3/data/shadow
diff --git a/tests/tests/subids/69_invalid_subuid_file3/data/subgid b/tests/subids/69_invalid_subuid_file3/data/subgid
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/data/subgid
rename to tests/subids/69_invalid_subuid_file3/data/subgid
diff --git a/tests/tests/subids/69_invalid_subuid_file3/data/subuid b/tests/subids/69_invalid_subuid_file3/data/subuid
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/data/subuid
rename to tests/subids/69_invalid_subuid_file3/data/subuid
diff --git a/tests/tests/subids/69_invalid_subuid_file3/useradd.test b/tests/subids/69_invalid_subuid_file3/useradd.test
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/useradd.test
rename to tests/subids/69_invalid_subuid_file3/useradd.test
diff --git a/tests/tests/subids/59_newusers_no_subuid/config.txt b/tests/subids/70_invalid_subuid_file4/config.txt
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/config.txt
rename to tests/subids/70_invalid_subuid_file4/config.txt
diff --git a/tests/tests/subids/70_invalid_subuid_file4/config/etc/default/useradd b/tests/subids/70_invalid_subuid_file4/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/config/etc/default/useradd
rename to tests/subids/70_invalid_subuid_file4/config/etc/default/useradd
diff --git a/tests/tests/subids/69_invalid_subuid_file3/config/etc/group b/tests/subids/70_invalid_subuid_file4/config/etc/group
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/config/etc/group
rename to tests/subids/70_invalid_subuid_file4/config/etc/group
diff --git a/tests/tests/subids/69_invalid_subuid_file3/config/etc/gshadow b/tests/subids/70_invalid_subuid_file4/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/config/etc/gshadow
rename to tests/subids/70_invalid_subuid_file4/config/etc/gshadow
diff --git a/tests/tests/subids/69_invalid_subuid_file3/config/etc/passwd b/tests/subids/70_invalid_subuid_file4/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/config/etc/passwd
rename to tests/subids/70_invalid_subuid_file4/config/etc/passwd
diff --git a/tests/tests/subids/70_invalid_subuid_file4/config/etc/shadow b/tests/subids/70_invalid_subuid_file4/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/config/etc/shadow
rename to tests/subids/70_invalid_subuid_file4/config/etc/shadow
diff --git a/tests/tests/subids/70_invalid_subuid_file4/config/etc/subgid b/tests/subids/70_invalid_subuid_file4/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/config/etc/subgid
rename to tests/subids/70_invalid_subuid_file4/config/etc/subgid
diff --git a/tests/tests/subids/70_invalid_subuid_file4/config/etc/subuid b/tests/subids/70_invalid_subuid_file4/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/config/etc/subuid
rename to tests/subids/70_invalid_subuid_file4/config/etc/subuid
diff --git a/tests/tests/subids/67_invalid_subuid_file1/data/group b/tests/subids/70_invalid_subuid_file4/data/group
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/data/group
rename to tests/subids/70_invalid_subuid_file4/data/group
diff --git a/tests/tests/subids/70_invalid_subuid_file4/data/gshadow b/tests/subids/70_invalid_subuid_file4/data/gshadow
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/data/gshadow
rename to tests/subids/70_invalid_subuid_file4/data/gshadow
diff --git a/tests/tests/subids/70_invalid_subuid_file4/data/passwd b/tests/subids/70_invalid_subuid_file4/data/passwd
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/data/passwd
rename to tests/subids/70_invalid_subuid_file4/data/passwd
diff --git a/tests/tests/subids/70_invalid_subuid_file4/data/shadow b/tests/subids/70_invalid_subuid_file4/data/shadow
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/data/shadow
rename to tests/subids/70_invalid_subuid_file4/data/shadow
diff --git a/tests/tests/subids/70_invalid_subuid_file4/data/subgid b/tests/subids/70_invalid_subuid_file4/data/subgid
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/data/subgid
rename to tests/subids/70_invalid_subuid_file4/data/subgid
diff --git a/tests/tests/subids/70_invalid_subuid_file4/data/subuid b/tests/subids/70_invalid_subuid_file4/data/subuid
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/data/subuid
rename to tests/subids/70_invalid_subuid_file4/data/subuid
diff --git a/tests/tests/subids/70_invalid_subuid_file4/useradd.test b/tests/subids/70_invalid_subuid_file4/useradd.test
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/useradd.test
rename to tests/subids/70_invalid_subuid_file4/useradd.test
diff --git a/tests/tests/subids/60_newusers_no_subgid/config.txt b/tests/subids/71_useradd_subids_for_system/config.txt
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/config.txt
rename to tests/subids/71_useradd_subids_for_system/config.txt
diff --git a/tests/tests/subids/71_useradd_subids_for_system/config/etc/default/useradd b/tests/subids/71_useradd_subids_for_system/config/etc/default/useradd
similarity index 100%
rename from tests/tests/subids/71_useradd_subids_for_system/config/etc/default/useradd
rename to tests/subids/71_useradd_subids_for_system/config/etc/default/useradd
diff --git a/tests/tests/subids/70_invalid_subuid_file4/config/etc/group b/tests/subids/71_useradd_subids_for_system/config/etc/group
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/config/etc/group
rename to tests/subids/71_useradd_subids_for_system/config/etc/group
diff --git a/tests/tests/subids/70_invalid_subuid_file4/config/etc/gshadow b/tests/subids/71_useradd_subids_for_system/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/config/etc/gshadow
rename to tests/subids/71_useradd_subids_for_system/config/etc/gshadow
diff --git a/tests/tests/subids/70_invalid_subuid_file4/config/etc/passwd b/tests/subids/71_useradd_subids_for_system/config/etc/passwd
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/config/etc/passwd
rename to tests/subids/71_useradd_subids_for_system/config/etc/passwd
diff --git a/tests/tests/subids/71_useradd_subids_for_system/config/etc/shadow b/tests/subids/71_useradd_subids_for_system/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/71_useradd_subids_for_system/config/etc/shadow
rename to tests/subids/71_useradd_subids_for_system/config/etc/shadow
diff --git a/tests/tests/subids/71_useradd_subids_for_system/config/etc/subgid b/tests/subids/71_useradd_subids_for_system/config/etc/subgid
similarity index 100%
rename from tests/tests/subids/71_useradd_subids_for_system/config/etc/subgid
rename to tests/subids/71_useradd_subids_for_system/config/etc/subgid
diff --git a/tests/tests/subids/71_useradd_subids_for_system/config/etc/subuid b/tests/subids/71_useradd_subids_for_system/config/etc/subuid
similarity index 100%
rename from tests/tests/subids/71_useradd_subids_for_system/config/etc/subuid
rename to tests/subids/71_useradd_subids_for_system/config/etc/subuid
diff --git a/tests/tests/subids/71_useradd_subids_for_system/data/subgid b/tests/subids/71_useradd_subids_for_system/data/subgid
similarity index 100%
rename from tests/tests/subids/71_useradd_subids_for_system/data/subgid
rename to tests/subids/71_useradd_subids_for_system/data/subgid
diff --git a/tests/tests/subids/71_useradd_subids_for_system/data/subuid b/tests/subids/71_useradd_subids_for_system/data/subuid
similarity index 100%
rename from tests/tests/subids/71_useradd_subids_for_system/data/subuid
rename to tests/subids/71_useradd_subids_for_system/data/subuid
diff --git a/tests/tests/subids/71_useradd_subids_for_system/useradd.test b/tests/subids/71_useradd_subids_for_system/useradd.test
similarity index 100%
rename from tests/tests/subids/71_useradd_subids_for_system/useradd.test
rename to tests/subids/71_useradd_subids_for_system/useradd.test
diff --git a/tests/tests/cptools/01/data/group.new b/tests/tests/cptools/01/data/group.new
deleted file mode 100644
index db5f1341..00000000
--- a/tests/tests/cptools/01/data/group.new
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-test:x:10000:
diff --git a/tests/tests/cptools/01/data/gshadow.new b/tests/tests/cptools/01/data/gshadow.new
deleted file mode 100644
index 3c9bae92..00000000
--- a/tests/tests/cptools/01/data/gshadow.new
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-test:x::
diff --git a/tests/tests/cptools/01/data/passwd.new b/tests/tests/cptools/01/data/passwd.new
deleted file mode 100644
index 148b7944..00000000
--- a/tests/tests/cptools/01/data/passwd.new
+++ /dev/null
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-test:x:10002:10002::/tmp:/bin/false
diff --git a/tests/tests/cptools/01/data/shadow.new b/tests/tests/cptools/01/data/shadow.new
deleted file mode 100644
index c6e351ee..00000000
--- a/tests/tests/cptools/01/data/shadow.new
+++ /dev/null
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-test:!:10:0:99999:7:::
diff --git a/tests/tests/cptools/01/run1 b/tests/tests/cptools/01/run1
deleted file mode 100755
index 26fc0440..00000000
--- a/tests/tests/cptools/01/run1
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-# Rational:
-# Test that useradd can add an user and userdel removes it.
-
-save()
-{
-	[ ! -d tmp ] && mkdir tmp
-	for i in passwd group shadow gshadow
-	do
-		[ -f /etc/$i  ] && cp /etc/$i  tmp/$i
-	done
-
-	true
-}
-
-restore()
-{
-	for i in passwd group shadow gshadow
-	do
-		[ -f tmp/$i  ] && cp tmp/$i  /etc/$i  && rm tmp/$i
-	done
-	rmdir tmp
-}
-
-save
-
-# restore the files on exit
-trap 'restore' 0
-
-for i in passwd group shadow gshadow
-do
-	cp data/$i /etc
-done
-
-lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ")
-lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")
-lines_group=$(wc -l /etc/group | cut -f1 -d" ")
-lines_gshadow=$(wc -l /etc/gshadow | cut -f1 -d" ")
-
-echo -n "Copy passwd.new "
-cppw data/passwd.new
-echo "OK"
-
-echo -n "test if the password file was copied"
-diff -au /etc/passwd data/passwd.new
-echo "  OK"
-
-echo -n "check that the other files were not modified"
-diff -au /etc/group data/group
-diff -au /etc/gshadow data/gshadow
-diff -au /etc/shadow data/shadow
-echo "  OK"
diff --git a/tests/tests/cptools/01/run2 b/tests/tests/cptools/01/run2
deleted file mode 100755
index c42238e6..00000000
--- a/tests/tests/cptools/01/run2
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-# Rational:
-# Test that useradd can add an user and userdel removes it.
-
-save()
-{
-	[ ! -d tmp ] && mkdir tmp
-	for i in passwd group shadow gshadow
-	do
-		[ -f /etc/$i  ] && cp /etc/$i  tmp/$i
-	done
-
-	true
-}
-
-restore()
-{
-	for i in passwd group shadow gshadow
-	do
-		[ -f tmp/$i  ] && cp tmp/$i  /etc/$i  && rm tmp/$i
-	done
-	rmdir tmp
-}
-
-save
-
-# restore the files on exit
-trap 'restore' 0
-
-for i in passwd group shadow gshadow
-do
-	cp data/$i /etc
-done
-
-lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ")
-lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")
-lines_group=$(wc -l /etc/group | cut -f1 -d" ")
-lines_gshadow=$(wc -l /etc/gshadow | cut -f1 -d" ")
-
-echo -n "Copy group.new "
-cpgr data/group.new
-echo "OK"
-
-echo -n "test if the password file was copied"
-diff -au /etc/group data/group.new
-echo "  OK"
-
-echo -n "check that the other files were not modified"
-diff -au /etc/gshadow data/gshadow
-diff -au /etc/passwd data/passwd
-diff -au /etc/shadow data/shadow
-echo "  OK"
diff --git a/tests/tests/cptools/01/run3 b/tests/tests/cptools/01/run3
deleted file mode 100755
index d213e477..00000000
--- a/tests/tests/cptools/01/run3
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-# Rational:
-# Test that useradd can add an user and userdel removes it.
-
-save()
-{
-	[ ! -d tmp ] && mkdir tmp
-	for i in passwd group shadow gshadow
-	do
-		[ -f /etc/$i  ] && cp /etc/$i  tmp/$i
-	done
-
-	true
-}
-
-restore()
-{
-	for i in passwd group shadow gshadow
-	do
-		[ -f tmp/$i  ] && cp tmp/$i  /etc/$i  && rm tmp/$i
-	done
-	rmdir tmp
-}
-
-save
-
-# restore the files on exit
-trap 'restore' 0
-
-for i in passwd group shadow gshadow
-do
-	cp data/$i /etc
-done
-
-lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ")
-lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")
-lines_group=$(wc -l /etc/group | cut -f1 -d" ")
-lines_gshadow=$(wc -l /etc/gshadow | cut -f1 -d" ")
-
-echo -n "Copy shadow.new "
-cppw -s data/shadow.new
-echo "OK"
-
-echo -n "test if the password file was copied"
-diff -au /etc/shadow data/shadow.new
-echo "  OK"
-
-echo -n "check that the other files were not modified"
-diff -au /etc/group data/group
-diff -au /etc/gshadow data/gshadow
-diff -au /etc/passwd data/passwd
-echo "  OK"
diff --git a/tests/tests/cptools/01/run4 b/tests/tests/cptools/01/run4
deleted file mode 100755
index 7cc3fb8d..00000000
--- a/tests/tests/cptools/01/run4
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-# Rational:
-# Test that useradd can add an user and userdel removes it.
-
-save()
-{
-	[ ! -d tmp ] && mkdir tmp
-	for i in passwd group shadow gshadow
-	do
-		[ -f /etc/$i  ] && cp /etc/$i  tmp/$i
-	done
-
-	true
-}
-
-restore()
-{
-	for i in passwd group shadow gshadow
-	do
-		[ -f tmp/$i  ] && cp tmp/$i  /etc/$i  && rm tmp/$i
-	done
-	rmdir tmp
-}
-
-save
-
-# restore the files on exit
-trap 'restore' 0
-
-for i in passwd group shadow gshadow
-do
-	cp data/$i /etc
-done
-
-lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ")
-lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")
-lines_group=$(wc -l /etc/group | cut -f1 -d" ")
-lines_gshadow=$(wc -l /etc/gshadow | cut -f1 -d" ")
-
-echo -n "Copy gshadow.new "
-cpgr -s data/gshadow.new
-echo "OK"
-
-echo -n "test if the password file was copied"
-diff -au /etc/gshadow data/gshadow.new
-echo "  OK"
-
-echo -n "check that the other files were not modified"
-diff -au /etc/group data/group
-diff -au /etc/passwd data/passwd
-diff -au /etc/shadow data/shadow
-echo "  OK"
diff --git a/tests/tests/cptools/02_cppw_usage/config/etc/group b/tests/tests/cptools/02_cppw_usage/config/etc/group
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/02_cppw_usage/config/etc/gshadow b/tests/tests/cptools/02_cppw_usage/config/etc/gshadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/02_cppw_usage/config/etc/passwd b/tests/tests/cptools/02_cppw_usage/config/etc/passwd
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/02_cppw_usage/config/etc/shadow b/tests/tests/cptools/02_cppw_usage/config/etc/shadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/02_cppw_usage/cppw.test b/tests/tests/cptools/02_cppw_usage/cppw.test
deleted file mode 100755
index ef3b77f2..00000000
--- a/tests/tests/cptools/02_cppw_usage/cppw.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw can displays its usage message"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Get cppw usage (cppw -h)..."
-cppw -h >tmp/usage.out
-echo "OK"
-
-echo "cppw reported:"
-echo "======================================================================="
-cat tmp/usage.out
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/usage.out tmp/usage.out
-echo "usage message OK."
-rm -f tmp/usage.out
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/tests/cptools/02_cppw_usage/data/usage.out b/tests/tests/cptools/02_cppw_usage/data/usage.out
deleted file mode 100644
index 9efb2a70..00000000
--- a/tests/tests/cptools/02_cppw_usage/data/usage.out
+++ /dev/null
@@ -1,3 +0,0 @@
-Usage:
-`cppw <file>' copys over /etc/passwd   `cppw -s <file>' copys over /etc/shadow
-`cpgr <file>' copys over /etc/group    `cpgr -s <file>' copys over /etc/gshadow
diff --git a/tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/group b/tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/group
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/gshadow b/tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/gshadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/passwd b/tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/passwd
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/shadow b/tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/shadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/03_cppw_usage_invalid_option/cppw.test b/tests/tests/cptools/03_cppw_usage_invalid_option/cppw.test
deleted file mode 100755
index c6d41e98..00000000
--- a/tests/tests/cptools/03_cppw_usage_invalid_option/cppw.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw reports usage of invalid option"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use wrong cppw option (cppw -Z)..."
-/usr/sbin/cppw -Z 2>tmp/usage.out && exit 1 || {
-	status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "2"
-echo "OK"
-
-echo "cppw reported:"
-echo "======================================================================="
-cat tmp/usage.out
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/usage.out tmp/usage.out
-echo "usage message OK."
-rm -f tmp/usage.out
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/tests/cptools/03_cppw_usage_invalid_option/data/usage.out b/tests/tests/cptools/03_cppw_usage_invalid_option/data/usage.out
deleted file mode 100644
index 633ff23d..00000000
--- a/tests/tests/cptools/03_cppw_usage_invalid_option/data/usage.out
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/sbin/cppw: invalid option -- 'Z'
-Usage:
-`cppw <file>' copys over /etc/passwd   `cppw -s <file>' copys over /etc/shadow
-`cpgr <file>' copys over /etc/group    `cpgr -s <file>' copys over /etc/gshadow
diff --git a/tests/tests/cptools/04_cppw_no_file_argument/config/etc/group b/tests/tests/cptools/04_cppw_no_file_argument/config/etc/group
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/04_cppw_no_file_argument/config/etc/gshadow b/tests/tests/cptools/04_cppw_no_file_argument/config/etc/gshadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/04_cppw_no_file_argument/config/etc/passwd b/tests/tests/cptools/04_cppw_no_file_argument/config/etc/passwd
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/04_cppw_no_file_argument/config/etc/shadow b/tests/tests/cptools/04_cppw_no_file_argument/config/etc/shadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/04_cppw_no_file_argument/cppw.test b/tests/tests/cptools/04_cppw_no_file_argument/cppw.test
deleted file mode 100755
index 7ccef735..00000000
--- a/tests/tests/cptools/04_cppw_no_file_argument/cppw.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw reports an error if no files are provided"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use cppw without a file argument (cppw)..."
-cppw 2>tmp/usage.out && exit 1 || {
-	status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "cppw reported:"
-echo "======================================================================="
-cat tmp/usage.out
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/usage.out tmp/usage.out
-echo "usage message OK."
-rm -f tmp/usage.out
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/tests/cptools/04_cppw_no_file_argument/data/usage.out b/tests/tests/cptools/04_cppw_no_file_argument/data/usage.out
deleted file mode 100644
index 808df395..00000000
--- a/tests/tests/cptools/04_cppw_no_file_argument/data/usage.out
+++ /dev/null
@@ -1,2 +0,0 @@
-cppw: wrong number of arguments, -h for usage
-cppw: no changes
diff --git a/tests/tests/cptools/05_cppw_2_files/config/etc/passwd b/tests/tests/cptools/05_cppw_2_files/config/etc/passwd
deleted file mode 100644
index ae3eda3f..00000000
--- a/tests/tests/cptools/05_cppw_2_files/config/etc/passwd
+++ /dev/null
@@ -1,21 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-myuser:x:424242:424242::/home:/bin/sh
-myuser2:x:424243:424242::/home:/bin/sh
diff --git a/tests/tests/cptools/05_cppw_2_files/config/etc/shadow b/tests/tests/cptools/05_cppw_2_files/config/etc/shadow
deleted file mode 100644
index f004fa26..00000000
--- a/tests/tests/cptools/05_cppw_2_files/config/etc/shadow
+++ /dev/null
@@ -1,21 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7:::
-myuser2:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7:::
diff --git a/tests/tests/cptools/05_cppw_2_files/cppw.test b/tests/tests/cptools/05_cppw_2_files/cppw.test
deleted file mode 100755
index 49ca1d57..00000000
--- a/tests/tests/cptools/05_cppw_2_files/cppw.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw reports an error if 2 files are provided"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use cppw with 2 files (cppw data/passwd data/passwd)..."
-cppw data/passwd data/passwd 2>tmp/usage.out && exit 1 || {
-	status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "cppw reported:"
-echo "======================================================================="
-cat tmp/usage.out
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/usage.out tmp/usage.out
-echo "usage message OK."
-rm -f tmp/usage.out
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/tests/cptools/05_cppw_2_files/data/passwd b/tests/tests/cptools/05_cppw_2_files/data/passwd
deleted file mode 100644
index e8e3c399..00000000
--- a/tests/tests/cptools/05_cppw_2_files/data/passwd
+++ /dev/null
@@ -1,17 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
diff --git a/tests/tests/cptools/05_cppw_2_files/data/usage.out b/tests/tests/cptools/05_cppw_2_files/data/usage.out
deleted file mode 100644
index 808df395..00000000
--- a/tests/tests/cptools/05_cppw_2_files/data/usage.out
+++ /dev/null
@@ -1,2 +0,0 @@
-cppw: wrong number of arguments, -h for usage
-cppw: no changes
diff --git a/tests/tests/cptools/06_cppw_no_file/config/etc/group b/tests/tests/cptools/06_cppw_no_file/config/etc/group
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/06_cppw_no_file/config/etc/gshadow b/tests/tests/cptools/06_cppw_no_file/config/etc/gshadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/06_cppw_no_file/config/etc/passwd b/tests/tests/cptools/06_cppw_no_file/config/etc/passwd
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/06_cppw_no_file/config/etc/shadow b/tests/tests/cptools/06_cppw_no_file/config/etc/shadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/06_cppw_no_file/cppw.test b/tests/tests/cptools/06_cppw_no_file/cppw.test
deleted file mode 100755
index f4adb89c..00000000
--- a/tests/tests/cptools/06_cppw_no_file/cppw.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw reports an error if no files are provided"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use cppw with a nonexistent file (cppw data/passwd)..."
-cppw data/passwd 2>tmp/usage.out && exit 1 || {
-	status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "cppw reported:"
-echo "======================================================================="
-cat tmp/usage.out
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/usage.out tmp/usage.out
-echo "usage message OK."
-rm -f tmp/usage.out
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/tests/cptools/06_cppw_no_file/data/usage.out b/tests/tests/cptools/06_cppw_no_file/data/usage.out
deleted file mode 100644
index 133dea3e..00000000
--- a/tests/tests/cptools/06_cppw_no_file/data/usage.out
+++ /dev/null
@@ -1,2 +0,0 @@
-cppw: data/passwd: No such file or directory
-cppw: /etc/passwd is unchanged
diff --git a/tests/tests/cptools/07_cppw_locked_passwd/config/etc/group b/tests/tests/cptools/07_cppw_locked_passwd/config/etc/group
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/07_cppw_locked_passwd/config/etc/gshadow b/tests/tests/cptools/07_cppw_locked_passwd/config/etc/gshadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/07_cppw_locked_passwd/config/etc/passwd b/tests/tests/cptools/07_cppw_locked_passwd/config/etc/passwd
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/07_cppw_locked_passwd/config/etc/shadow b/tests/tests/cptools/07_cppw_locked_passwd/config/etc/shadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/07_cppw_locked_passwd/cppw.test b/tests/tests/cptools/07_cppw_locked_passwd/cppw.test
deleted file mode 100755
index 366618e0..00000000
--- a/tests/tests/cptools/07_cppw_locked_passwd/cppw.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw checks if the password file is locked"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create lock file for /etc/passwd..."
-touch /etc/passwd.lock
-echo "done"
-
-echo -n "Use cppw (cppw data/passwd)..."
-cppw data/passwd 2>tmp/usage.out && exit 1 || {
-	status=$?
-}
-echo "OK"
-
-rm -f /etc/passwd.lock
-
-echo -n "Check returned status ($status)..."
-test "$status" = "5"
-echo "OK"
-
-echo "cppw reported:"
-echo "======================================================================="
-cat tmp/usage.out
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/usage.out tmp/usage.out
-echo "usage message OK."
-rm -f tmp/usage.out
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/tests/cptools/07_cppw_locked_passwd/data/passwd b/tests/tests/cptools/07_cppw_locked_passwd/data/passwd
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/07_cppw_locked_passwd/data/usage.out b/tests/tests/cptools/07_cppw_locked_passwd/data/usage.out
deleted file mode 100644
index c99e46a1..00000000
--- a/tests/tests/cptools/07_cppw_locked_passwd/data/usage.out
+++ /dev/null
@@ -1,3 +0,0 @@
-cppw: existing lock file /etc/passwd.lock without a PID
-cppw: Couldn't lock file
-cppw: /etc/passwd is unchanged
diff --git a/tests/tests/cptools/08_cppw-p/config/etc/group b/tests/tests/cptools/08_cppw-p/config/etc/group
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/08_cppw-p/config/etc/gshadow b/tests/tests/cptools/08_cppw-p/config/etc/gshadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/08_cppw-p/config/etc/passwd b/tests/tests/cptools/08_cppw-p/config/etc/passwd
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/08_cppw-p/config/etc/shadow b/tests/tests/cptools/08_cppw-p/config/etc/shadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/08_cppw-p/cppw.test b/tests/tests/cptools/08_cppw-p/cppw.test
deleted file mode 100755
index d4ee8646..00000000
--- a/tests/tests/cptools/08_cppw-p/cppw.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw -p option"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use cppw -p (cppw -p data/passwd)..."
-cppw -p data/passwd
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl data/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/tests/cptools/08_cppw-p/data/passwd b/tests/tests/cptools/08_cppw-p/data/passwd
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/09_cppw-g/cppw.test b/tests/tests/cptools/09_cppw-g/cppw.test
deleted file mode 100755
index 7ac6d16c..00000000
--- a/tests/tests/cptools/09_cppw-g/cppw.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw can copy the group file"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use cppw -g (cppw -g data/group)..."
-cppw -g data/group
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl data/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/tests/cptools/09_cppw-g/data/group b/tests/tests/cptools/09_cppw-g/data/group
deleted file mode 100644
index 11b5c118..00000000
--- a/tests/tests/cptools/09_cppw-g/data/group
+++ /dev/null
@@ -1,39 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
diff --git a/tests/tests/cptools/10_cppw-g-s/cppw.test b/tests/tests/cptools/10_cppw-g-s/cppw.test
deleted file mode 100755
index 602c34ac..00000000
--- a/tests/tests/cptools/10_cppw-g-s/cppw.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw can copy the gshadow file"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use cppw -g -s (cppw -g -s data/gshadow)..."
-cppw -g -s data/gshadow
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl data/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/tests/cptools/10_cppw-g-s/data/gshadow b/tests/tests/cptools/10_cppw-g-s/data/gshadow
deleted file mode 100644
index 93fc0558..00000000
--- a/tests/tests/cptools/10_cppw-g-s/data/gshadow
+++ /dev/null
@@ -1,39 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
diff --git a/tests/tests/cptools/11_cppw-p-s/cppw.test b/tests/tests/cptools/11_cppw-p-s/cppw.test
deleted file mode 100755
index 3c68f056..00000000
--- a/tests/tests/cptools/11_cppw-p-s/cppw.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw can copy the shadow file"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use cppw -p -s (cppw -p -s data/shadow)..."
-cppw -p -s data/shadow
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl data/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/tests/cptools/11_cppw-p-s/data/shadow b/tests/tests/cptools/11_cppw-p-s/data/shadow
deleted file mode 100644
index 62144232..00000000
--- a/tests/tests/cptools/11_cppw-p-s/data/shadow
+++ /dev/null
@@ -1,16 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/group b/tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/group
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/gshadow b/tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/gshadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/passwd b/tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/passwd
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/shadow b/tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/shadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/cppw.test b/tests/tests/cptools/12_cppw-s_no_shadow_file/cppw.test
deleted file mode 100755
index a0c2095b..00000000
--- a/tests/tests/cptools/12_cppw-s_no_shadow_file/cppw.test
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw can copy a shadow file even if there were no shadow file"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Remove /etc/shadow..."
-rm -f /etc/shadow
-echo "done"
-
-echo -n "Use cppw (cppw -s data/shadow)..."
-cppw -s data/shadow 2>tmp/cppw.err && exit 1 || {
-	status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "cppw reported:"
-echo "======================================================================="
-cat tmp/cppw.err
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/cppw.err tmp/cppw.err
-echo "usage message OK."
-rm -f tmp/cppw.err
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-test ! -f /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/data/cppw.err b/tests/tests/cptools/12_cppw-s_no_shadow_file/data/cppw.err
deleted file mode 100644
index 0c7d649e..00000000
--- a/tests/tests/cptools/12_cppw-s_no_shadow_file/data/cppw.err
+++ /dev/null
@@ -1,2 +0,0 @@
-cppw: /etc/shadow: No such file or directory
-cppw: /etc/shadow is unchanged
diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/data/shadow b/tests/tests/cptools/12_cppw-s_no_shadow_file/data/shadow
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/cppw.test b/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/cppw.test
deleted file mode 100755
index 57aa57b3..00000000
--- a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/cppw.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "cppw report failures when it cannot open the input passwd file"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Copy data/passwd (cppw data/passwd)..."
-LD_PRELOAD=../../../common/fopen_failure.so FAILURE_PATH=data/passwd /usr/sbin/cppw data/passwd 2>tmp/cppw.err && exit 1 || {
-	status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "cppw reported:"
-echo "======================================================================="
-cat tmp/cppw.err
-echo "======================================================================="
-echo -n "Check that there were a failure message..."
-diff -au data/cppw.err tmp/cppw.err
-echo "error message OK."
-rm -f tmp/cppw.err
-
-echo -n "Check the passwd file..."
-../../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/data/cppw.err b/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/data/cppw.err
deleted file mode 100644
index 3816592a..00000000
--- a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/data/cppw.err
+++ /dev/null
@@ -1,3 +0,0 @@
-fopen64 FAILURE data/passwd r ...
-cppw: data/passwd: Input/output error
-cppw: /etc/passwd is unchanged
diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/data/passwd b/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/data/passwd
deleted file mode 100644
index e8e3c399..00000000
--- a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/data/passwd
+++ /dev/null
@@ -1,17 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/cppw.test b/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/cppw.test
deleted file mode 100755
index 5ae4ef01..00000000
--- a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/cppw.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "cppw report failures when it cannot open the input passwd file"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Copy data/passwd (cppw data/passwd)..."
-LD_PRELOAD=../../../common/fopen_failure.so FAILURE_PATH=/etc/passwd.new cppw data/passwd 2>tmp/cppw.err && exit 1 || {
-	status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "cppw reported:"
-echo "======================================================================="
-cat tmp/cppw.err
-echo "======================================================================="
-echo -n "Check that there were a failure message..."
-diff -au data/cppw.err tmp/cppw.err
-echo "error message OK."
-rm -f tmp/cppw.err
-
-echo -n "Check the passwd file..."
-../../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/data/cppw.err b/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/data/cppw.err
deleted file mode 100644
index 78606fd5..00000000
--- a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/data/cppw.err
+++ /dev/null
@@ -1,3 +0,0 @@
-fopen64 FAILURE /etc/passwd.new w ...
-cppw: Couldn't make copy: Input/output error
-cppw: /etc/passwd is unchanged
diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/data/passwd b/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/data/passwd
deleted file mode 100644
index e8e3c399..00000000
--- a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/data/passwd
+++ /dev/null
@@ -1,17 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/cppw.test b/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/cppw.test
deleted file mode 100755
index 2e809a7d..00000000
--- a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/cppw.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "cppw report failures to write the passwd file"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Copy data/passwd (cppw data/passwd)..."
-LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/passwd cppw data/passwd 2>tmp/cppw.err && exit 1 || {
-	status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "cppw reported:"
-echo "======================================================================="
-cat tmp/cppw.err
-echo "======================================================================="
-echo -n "Check that there were a failure message..."
-diff -au data/cppw.err tmp/cppw.err
-echo "error message OK."
-rm -f tmp/cppw.err
-
-echo -n "Check the passwd file..."
-../../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/data/cppw.err b/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/data/cppw.err
deleted file mode 100644
index 7e27e3e4..00000000
--- a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/data/cppw.err
+++ /dev/null
@@ -1,3 +0,0 @@
-rename FAILURE /etc/passwd.new /etc/passwd
-cppw: can't copy /etc/passwd.new: Input/output error)
-cppw: /etc/passwd is unchanged
diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/data/passwd b/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/data/passwd
deleted file mode 100644
index e8e3c399..00000000
--- a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/data/passwd
+++ /dev/null
@@ -1,17 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
diff --git a/tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/passwd b/tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/passwd
deleted file mode 100644
index 8656be41..00000000
--- a/tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/passwd
+++ /dev/null
@@ -1,20 +0,0 @@
-root:*:0:0:root:/root:/bin/bash
-daemon:*:1:1:daemon:/usr/sbin:/bin/sh
-bin:*:2:2:bin:/bin:/bin/sh
-sys:*:3:3:sys:/dev:/bin/sh
-sync:*:4:65534:sync:/bin:/bin/sync
-games:*:5:60:games:/usr/games:/bin/sh
-man:*:6:12:man:/var/cache/man:/bin/sh
-lp:*:7:7:lp:/var/spool/lpd:/bin/sh
-mail:*:8:8:mail:/var/mail:/bin/sh
-news:*:9:9:news:/var/spool/news:/bin/sh
-uucp:*:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:*:13:13:proxy:/bin:/bin/sh
-www-data:*:33:33:www-data:/var/www:/bin/sh
-backup:*:34:34:backup:/var/backups:/bin/sh
-list:*:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:*:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:*:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:*:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:*:102:102::/var/spool/exim4:/bin/false
-foo:abc:1000:1000::/nonexistent:/bin/sh
diff --git a/tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config.txt b/tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config.txt
deleted file mode 100644
index e9e4bbed..00000000
--- a/tests/tests/grouptools/groupmod/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-group foo, GID 1000
diff --git a/tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config.txt b/tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config.txt
deleted file mode 100644
index e9e4bbed..00000000
--- a/tests/tests/grouptools/groupmod/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-group foo, GID 1000
diff --git a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config.txt b/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config.txt
deleted file mode 100644
index e9e4bbed..00000000
--- a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-group foo, GID 1000
diff --git a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/login.defs b/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/login.defs
deleted file mode 100644
index cf181ac0..00000000
--- a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/login.defs
+++ /dev/null
@@ -1,314 +0,0 @@
-#
-# /etc/login.defs - Configuration control definitions for the login package.
-#
-# Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
-# If unspecified, some arbitrary (and possibly incorrect) value will
-# be assumed.  All other items are optional - if not specified then
-# the described action or option will be inhibited.
-#
-# Comment lines (lines beginning with "#") and blank lines are ignored.
-#
-# Modified for Linux.  --marekm
-
-# REQUIRED for useradd/userdel/usermod
-#   Directory where mailboxes reside, _or_ name of file, relative to the
-#   home directory.  If you _do_ define MAIL_DIR and MAIL_FILE,
-#   MAIL_DIR takes precedence.
-#
-#   Essentially:
-#      - MAIL_DIR defines the location of users mail spool files
-#        (for mbox use) by appending the username to MAIL_DIR as defined
-#        below.
-#      - MAIL_FILE defines the location of the users mail spool files as the
-#        fully-qualified filename obtained by prepending the user home
-#        directory before $MAIL_FILE
-#
-# NOTE: This is no more used for setting up users MAIL environment variable
-#       which is, starting from shadow 4.0.12-1 in Debian, entirely the
-#       job of the pam_mail PAM modules
-#       See default PAM configuration files provided for
-#       login, su, etc.
-#
-# This is a temporary situation: setting these variables will soon
-# move to /etc/default/useradd and the variables will then be
-# no more supported
-MAIL_DIR        /var/mail
-#MAIL_FILE      .mail
-
-#
-# Enable logging and display of /var/log/faillog login failure info.
-# This option conflicts with the pam_tally PAM module.
-#
-FAILLOG_ENAB		yes
-
-#
-# Enable display of unknown usernames when login failures are recorded.
-#
-# WARNING: Unknown usernames may become world readable. 
-# See #290803 and #298773 for details about how this could become a security
-# concern
-LOG_UNKFAIL_ENAB	no
-
-#
-# Enable logging of successful logins
-#
-LOG_OK_LOGINS		no
-
-#
-# Enable "syslog" logging of su activity - in addition to sulog file logging.
-# SYSLOG_SG_ENAB does the same for newgrp and sg.
-#
-SYSLOG_SU_ENAB		yes
-SYSLOG_SG_ENAB		yes
-
-#
-# If defined, all su activity is logged to this file.
-#
-#SULOG_FILE	/var/log/sulog
-
-#
-# If defined, file which maps tty line to TERM environment parameter.
-# Each line of the file is in a format something like "vt100  tty01".
-#
-#TTYTYPE_FILE	/etc/ttytype
-
-#
-# If defined, login failures will be logged here in a utmp format
-# last, when invoked as lastb, will read /var/log/btmp, so...
-#
-FTMP_FILE	/var/log/btmp
-
-#
-# If defined, the command name to display when running "su -".  For
-# example, if this is defined as "su" then a "ps" will display the
-# command is "-su".  If not defined, then "ps" would display the
-# name of the shell actually being run, e.g. something like "-sh".
-#
-SU_NAME		su
-
-#
-# If defined, file which inhibits all the usual chatter during the login
-# sequence.  If a full pathname, then hushed mode will be enabled if the
-# user's name or shell are found in the file.  If not a full pathname, then
-# hushed mode will be enabled if the file exists in the user's home directory.
-#
-HUSHLOGIN_FILE	.hushlogin
-#HUSHLOGIN_FILE	/etc/hushlogins
-
-#
-# *REQUIRED*  The default PATH settings, for superuser and normal users.
-#
-# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH	PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV_PATH	PATH=/usr/local/bin:/usr/bin:/bin:/usr/games
-
-#
-# Terminal permissions
-#
-#	TTYGROUP	Login tty will be assigned this group ownership.
-#	TTYPERM		Login tty will be set to this permission.
-#
-# If you have a "write" program which is "setgid" to a special group
-# which owns the terminals, define TTYGROUP to the group number and
-# TTYPERM to 0620.  Otherwise leave TTYGROUP commented out and assign
-# TTYPERM to either 622 or 600.
-#
-# In Debian /usr/bin/bsd-write or similar programs are setgid tty
-# However, the default and recommended value for TTYPERM is still 0600
-# to not allow anyone to write to anyone else console or terminal
-
-# Users can still allow other people to write them by issuing 
-# the "mesg y" command.
-
-TTYGROUP	tty
-TTYPERM		0600
-
-#
-# Login configuration initializations:
-#
-#	ERASECHAR	Terminal ERASE character ('\010' = backspace).
-#	KILLCHAR	Terminal KILL character ('\025' = CTRL/U).
-#	UMASK		Default "umask" value.
-#
-# The ERASECHAR and KILLCHAR are used only on System V machines.
-# 
-# UMASK usage is discouraged because it catches only some classes of user
-# entries to system, in fact only those made through login(1), while setting
-# umask in shell rc file will catch also logins through su, cron, ssh etc.
-#
-# At the same time, using shell rc to set umask won't catch entries which use
-# non-shell executables in place of login shell, like /usr/sbin/pppd for "ppp"
-# user and alike.
-#
-# Therefore the use of pam_umask is recommended (Debian package libpam-umask)
-# as the solution which catches all these cases on PAM-enabled systems.
-# 
-# This avoids the confusion created by having the umask set
-# in two different places -- in login.defs and shell rc files (i.e.
-# /etc/profile).
-#
-# For discussion, see #314539 and #248150 as well as the thread starting at
-# http://lists.debian.org/debian-devel/2005/06/msg01598.html
-#
-# Prefix these values with "0" to get octal, "0x" to get hexadecimal.
-#
-ERASECHAR	0177
-KILLCHAR	025
-# 022 is the "historical" value in Debian for UMASK when it was used
-# 027, or even 077, could be considered better for privacy
-# There is no One True Answer here : each sysadmin must make up their
-# mind.
-#UMASK		022
-
-#
-# Password aging controls:
-#
-#	PASS_MAX_DAYS	Maximum number of days a password may be used.
-#	PASS_MIN_DAYS	Minimum number of days allowed between password changes.
-#	PASS_WARN_AGE	Number of days warning given before a password expires.
-#
-PASS_MAX_DAYS	99999
-PASS_MIN_DAYS	0
-PASS_WARN_AGE	7
-
-#
-# Min/max values for automatic uid selection in useradd
-#
-UID_MIN			 1000
-UID_MAX			60000
-
-#
-# Min/max values for automatic gid selection in groupadd
-#
-GID_MIN			  100
-GID_MAX			60000
-
-#
-# Max number of login retries if password is bad. This will most likely be
-# overridden by PAM, since the default pam_unix module has it's own built
-# in of 3 retries. However, this is a safe fallback in case you are using
-# an authentication module that does not enforce PAM_MAXTRIES.
-#
-LOGIN_RETRIES		5
-
-#
-# Max time in seconds for login
-#
-LOGIN_TIMEOUT		60
-
-#
-# Which fields may be changed by regular users using chfn - use
-# any combination of letters "frwh" (full name, room number, work
-# phone, home phone).  If not defined, no changes are allowed.
-# For backward compatibility, "yes" = "rwh" and "no" = "frwh".
-# 
-CHFN_RESTRICT		rwh
-
-#
-# Should login be allowed if we can't cd to the home directory?
-# Default is no.
-#
-DEFAULT_HOME	yes
-
-#
-# If defined, this command is run when removing a user.
-# It should remove any at/cron/print jobs etc. owned by
-# the user to be removed (passed as the first argument).
-#
-#USERDEL_CMD	/usr/sbin/userdel_local
-
-#
-# This enables userdel to remove user groups if no members exist.
-#
-# Other former uses of this variable such as setting the umask when
-# user==primary group are not used in PAM environments, thus in Debian
-#
-USERGROUPS_ENAB yes
-
-#
-# Instead of the real user shell, the program specified by this parameter
-# will be launched, although its visible name (argv[0]) will be the shell's.
-# The program may do whatever it wants (logging, additional authentification,
-# banner, ...) before running the actual shell.
-#
-# FAKE_SHELL /bin/fakeshell
-
-#
-# If defined, either full pathname of a file containing device names or
-# a ":" delimited list of device names.  Root logins will be allowed only
-# upon these devices.
-#
-# This variable is used by login and su.
-#
-#CONSOLE	/etc/consoles
-#CONSOLE	console:tty01:tty02:tty03:tty04
-
-#
-# List of groups to add to the user's supplementary group set
-# when logging in on the console (as determined by the CONSOLE
-# setting).  Default is none.
-#
-# Use with caution - it is possible for users to gain permanent
-# access to these groups, even when not logged in on the console.
-# How to do it is left as an exercise for the reader...
-#
-# This variable is used by login and su.
-#
-#CONSOLE_GROUPS		floppy:audio:cdrom
-
-#
-# Only works if compiled with MD5_CRYPT defined:
-# If set to "yes", new passwords will be encrypted using the MD5-based
-# algorithm compatible with the one used by recent releases of FreeBSD.
-# It supports passwords of unlimited length and longer salt strings.
-# Set to "no" if you need to copy encrypted passwords to other systems
-# which don't understand the new algorithm.  Default is "no".
-#
-# This variable is used by chpasswd, gpasswd and newusers.
-#
-#MD5_CRYPT_ENAB	no
-
-################# OBSOLETED BY PAM ##############
-#						#
-# These options are now handled by PAM. Please	#
-# edit the appropriate file in /etc/pam.d/ to	#
-# enable the equivalents of them.
-#
-###############
-
-#MOTD_FILE
-#DIALUPS_CHECK_ENAB
-#LASTLOG_ENAB
-#MAIL_CHECK_ENAB
-#OBSCURE_CHECKS_ENAB
-#PORTTIME_CHECKS_ENAB
-#SU_WHEEL_ONLY
-#PASS_CHANGE_TRIES
-#PASS_ALWAYS_WARN
-#ENVIRON_FILE
-#NOLOGINS_FILE
-#ISSUE_FILE
-#PASS_MIN_LEN
-#PASS_MAX_LEN
-#ULIMIT
-#ENV_HZ
-#CHFN_AUTH
-#CHSH_AUTH
-#FAIL_DELAY
-
-################# OBSOLETED #######################
-#						  #
-# These options are no more handled by shadow.    #
-#                                                 #
-# Shadow utilities will display a warning if they #
-# still appear.                                   #
-#                                                 #
-###################################################
-
-# CLOSE_SESSIONS
-# LOGIN_STRING
-# NO_PASSWORD_CONSOLE
-# QMAIL_DIR
-
-
-
diff --git a/tests/tests/libsubid/04_nss/Makefile b/tests/tests/libsubid/04_nss/Makefile
deleted file mode 100644
index dd5acf72..00000000
--- a/tests/tests/libsubid/04_nss/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-all: test_nss libsubid_zzz.so
-
-test_nss: test_nss.c ../../../lib/nss.c
-	gcc -c -I../../../lib/ -I../../.. -o test_nss.o test_nss.c
-	gcc -o test_nss test_nss.o ../../../lib/.libs/libshadow.a -ldl
-
-libsubid_zzz.so: libsubid_zzz.c
-	gcc -c -I../../../lib/ -I../../.. -I../../../libsubid libsubid_zzz.c
-	gcc -L../../../libsubid -shared -o libsubid_zzz.so libsubid_zzz.o ../../../lib/.libs/libshadow.a -ldl
-
-clean:
-	rm -f *.o *.so test_nss
diff --git a/tests/tests/su/04/config/etc/login.defs b/tests/tests/su/04/config/etc/login.defs
deleted file mode 100644
index cf181ac0..00000000
--- a/tests/tests/su/04/config/etc/login.defs
+++ /dev/null
@@ -1,314 +0,0 @@
-#
-# /etc/login.defs - Configuration control definitions for the login package.
-#
-# Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
-# If unspecified, some arbitrary (and possibly incorrect) value will
-# be assumed.  All other items are optional - if not specified then
-# the described action or option will be inhibited.
-#
-# Comment lines (lines beginning with "#") and blank lines are ignored.
-#
-# Modified for Linux.  --marekm
-
-# REQUIRED for useradd/userdel/usermod
-#   Directory where mailboxes reside, _or_ name of file, relative to the
-#   home directory.  If you _do_ define MAIL_DIR and MAIL_FILE,
-#   MAIL_DIR takes precedence.
-#
-#   Essentially:
-#      - MAIL_DIR defines the location of users mail spool files
-#        (for mbox use) by appending the username to MAIL_DIR as defined
-#        below.
-#      - MAIL_FILE defines the location of the users mail spool files as the
-#        fully-qualified filename obtained by prepending the user home
-#        directory before $MAIL_FILE
-#
-# NOTE: This is no more used for setting up users MAIL environment variable
-#       which is, starting from shadow 4.0.12-1 in Debian, entirely the
-#       job of the pam_mail PAM modules
-#       See default PAM configuration files provided for
-#       login, su, etc.
-#
-# This is a temporary situation: setting these variables will soon
-# move to /etc/default/useradd and the variables will then be
-# no more supported
-MAIL_DIR        /var/mail
-#MAIL_FILE      .mail
-
-#
-# Enable logging and display of /var/log/faillog login failure info.
-# This option conflicts with the pam_tally PAM module.
-#
-FAILLOG_ENAB		yes
-
-#
-# Enable display of unknown usernames when login failures are recorded.
-#
-# WARNING: Unknown usernames may become world readable. 
-# See #290803 and #298773 for details about how this could become a security
-# concern
-LOG_UNKFAIL_ENAB	no
-
-#
-# Enable logging of successful logins
-#
-LOG_OK_LOGINS		no
-
-#
-# Enable "syslog" logging of su activity - in addition to sulog file logging.
-# SYSLOG_SG_ENAB does the same for newgrp and sg.
-#
-SYSLOG_SU_ENAB		yes
-SYSLOG_SG_ENAB		yes
-
-#
-# If defined, all su activity is logged to this file.
-#
-#SULOG_FILE	/var/log/sulog
-
-#
-# If defined, file which maps tty line to TERM environment parameter.
-# Each line of the file is in a format something like "vt100  tty01".
-#
-#TTYTYPE_FILE	/etc/ttytype
-
-#
-# If defined, login failures will be logged here in a utmp format
-# last, when invoked as lastb, will read /var/log/btmp, so...
-#
-FTMP_FILE	/var/log/btmp
-
-#
-# If defined, the command name to display when running "su -".  For
-# example, if this is defined as "su" then a "ps" will display the
-# command is "-su".  If not defined, then "ps" would display the
-# name of the shell actually being run, e.g. something like "-sh".
-#
-SU_NAME		su
-
-#
-# If defined, file which inhibits all the usual chatter during the login
-# sequence.  If a full pathname, then hushed mode will be enabled if the
-# user's name or shell are found in the file.  If not a full pathname, then
-# hushed mode will be enabled if the file exists in the user's home directory.
-#
-HUSHLOGIN_FILE	.hushlogin
-#HUSHLOGIN_FILE	/etc/hushlogins
-
-#
-# *REQUIRED*  The default PATH settings, for superuser and normal users.
-#
-# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH	PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV_PATH	PATH=/usr/local/bin:/usr/bin:/bin:/usr/games
-
-#
-# Terminal permissions
-#
-#	TTYGROUP	Login tty will be assigned this group ownership.
-#	TTYPERM		Login tty will be set to this permission.
-#
-# If you have a "write" program which is "setgid" to a special group
-# which owns the terminals, define TTYGROUP to the group number and
-# TTYPERM to 0620.  Otherwise leave TTYGROUP commented out and assign
-# TTYPERM to either 622 or 600.
-#
-# In Debian /usr/bin/bsd-write or similar programs are setgid tty
-# However, the default and recommended value for TTYPERM is still 0600
-# to not allow anyone to write to anyone else console or terminal
-
-# Users can still allow other people to write them by issuing 
-# the "mesg y" command.
-
-TTYGROUP	tty
-TTYPERM		0600
-
-#
-# Login configuration initializations:
-#
-#	ERASECHAR	Terminal ERASE character ('\010' = backspace).
-#	KILLCHAR	Terminal KILL character ('\025' = CTRL/U).
-#	UMASK		Default "umask" value.
-#
-# The ERASECHAR and KILLCHAR are used only on System V machines.
-# 
-# UMASK usage is discouraged because it catches only some classes of user
-# entries to system, in fact only those made through login(1), while setting
-# umask in shell rc file will catch also logins through su, cron, ssh etc.
-#
-# At the same time, using shell rc to set umask won't catch entries which use
-# non-shell executables in place of login shell, like /usr/sbin/pppd for "ppp"
-# user and alike.
-#
-# Therefore the use of pam_umask is recommended (Debian package libpam-umask)
-# as the solution which catches all these cases on PAM-enabled systems.
-# 
-# This avoids the confusion created by having the umask set
-# in two different places -- in login.defs and shell rc files (i.e.
-# /etc/profile).
-#
-# For discussion, see #314539 and #248150 as well as the thread starting at
-# http://lists.debian.org/debian-devel/2005/06/msg01598.html
-#
-# Prefix these values with "0" to get octal, "0x" to get hexadecimal.
-#
-ERASECHAR	0177
-KILLCHAR	025
-# 022 is the "historical" value in Debian for UMASK when it was used
-# 027, or even 077, could be considered better for privacy
-# There is no One True Answer here : each sysadmin must make up their
-# mind.
-#UMASK		022
-
-#
-# Password aging controls:
-#
-#	PASS_MAX_DAYS	Maximum number of days a password may be used.
-#	PASS_MIN_DAYS	Minimum number of days allowed between password changes.
-#	PASS_WARN_AGE	Number of days warning given before a password expires.
-#
-PASS_MAX_DAYS	99999
-PASS_MIN_DAYS	0
-PASS_WARN_AGE	7
-
-#
-# Min/max values for automatic uid selection in useradd
-#
-UID_MIN			 1000
-UID_MAX			60000
-
-#
-# Min/max values for automatic gid selection in groupadd
-#
-GID_MIN			  100
-GID_MAX			60000
-
-#
-# Max number of login retries if password is bad. This will most likely be
-# overridden by PAM, since the default pam_unix module has it's own built
-# in of 3 retries. However, this is a safe fallback in case you are using
-# an authentication module that does not enforce PAM_MAXTRIES.
-#
-LOGIN_RETRIES		5
-
-#
-# Max time in seconds for login
-#
-LOGIN_TIMEOUT		60
-
-#
-# Which fields may be changed by regular users using chfn - use
-# any combination of letters "frwh" (full name, room number, work
-# phone, home phone).  If not defined, no changes are allowed.
-# For backward compatibility, "yes" = "rwh" and "no" = "frwh".
-# 
-CHFN_RESTRICT		rwh
-
-#
-# Should login be allowed if we can't cd to the home directory?
-# Default is no.
-#
-DEFAULT_HOME	yes
-
-#
-# If defined, this command is run when removing a user.
-# It should remove any at/cron/print jobs etc. owned by
-# the user to be removed (passed as the first argument).
-#
-#USERDEL_CMD	/usr/sbin/userdel_local
-
-#
-# This enables userdel to remove user groups if no members exist.
-#
-# Other former uses of this variable such as setting the umask when
-# user==primary group are not used in PAM environments, thus in Debian
-#
-USERGROUPS_ENAB yes
-
-#
-# Instead of the real user shell, the program specified by this parameter
-# will be launched, although its visible name (argv[0]) will be the shell's.
-# The program may do whatever it wants (logging, additional authentification,
-# banner, ...) before running the actual shell.
-#
-# FAKE_SHELL /bin/fakeshell
-
-#
-# If defined, either full pathname of a file containing device names or
-# a ":" delimited list of device names.  Root logins will be allowed only
-# upon these devices.
-#
-# This variable is used by login and su.
-#
-#CONSOLE	/etc/consoles
-#CONSOLE	console:tty01:tty02:tty03:tty04
-
-#
-# List of groups to add to the user's supplementary group set
-# when logging in on the console (as determined by the CONSOLE
-# setting).  Default is none.
-#
-# Use with caution - it is possible for users to gain permanent
-# access to these groups, even when not logged in on the console.
-# How to do it is left as an exercise for the reader...
-#
-# This variable is used by login and su.
-#
-#CONSOLE_GROUPS		floppy:audio:cdrom
-
-#
-# Only works if compiled with MD5_CRYPT defined:
-# If set to "yes", new passwords will be encrypted using the MD5-based
-# algorithm compatible with the one used by recent releases of FreeBSD.
-# It supports passwords of unlimited length and longer salt strings.
-# Set to "no" if you need to copy encrypted passwords to other systems
-# which don't understand the new algorithm.  Default is "no".
-#
-# This variable is used by chpasswd, gpasswd and newusers.
-#
-#MD5_CRYPT_ENAB	no
-
-################# OBSOLETED BY PAM ##############
-#						#
-# These options are now handled by PAM. Please	#
-# edit the appropriate file in /etc/pam.d/ to	#
-# enable the equivalents of them.
-#
-###############
-
-#MOTD_FILE
-#DIALUPS_CHECK_ENAB
-#LASTLOG_ENAB
-#MAIL_CHECK_ENAB
-#OBSCURE_CHECKS_ENAB
-#PORTTIME_CHECKS_ENAB
-#SU_WHEEL_ONLY
-#PASS_CHANGE_TRIES
-#PASS_ALWAYS_WARN
-#ENVIRON_FILE
-#NOLOGINS_FILE
-#ISSUE_FILE
-#PASS_MIN_LEN
-#PASS_MAX_LEN
-#ULIMIT
-#ENV_HZ
-#CHFN_AUTH
-#CHSH_AUTH
-#FAIL_DELAY
-
-################# OBSOLETED #######################
-#						  #
-# These options are no more handled by shadow.    #
-#                                                 #
-# Shadow utilities will display a warning if they #
-# still appear.                                   #
-#                                                 #
-###################################################
-
-# CLOSE_SESSIONS
-# LOGIN_STRING
-# NO_PASSWORD_CONSOLE
-# QMAIL_DIR
-
-
-
diff --git a/tests/tests/su/06/config/etc/login.defs b/tests/tests/su/06/config/etc/login.defs
deleted file mode 100644
index cf181ac0..00000000
--- a/tests/tests/su/06/config/etc/login.defs
+++ /dev/null
@@ -1,314 +0,0 @@
-#
-# /etc/login.defs - Configuration control definitions for the login package.
-#
-# Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
-# If unspecified, some arbitrary (and possibly incorrect) value will
-# be assumed.  All other items are optional - if not specified then
-# the described action or option will be inhibited.
-#
-# Comment lines (lines beginning with "#") and blank lines are ignored.
-#
-# Modified for Linux.  --marekm
-
-# REQUIRED for useradd/userdel/usermod
-#   Directory where mailboxes reside, _or_ name of file, relative to the
-#   home directory.  If you _do_ define MAIL_DIR and MAIL_FILE,
-#   MAIL_DIR takes precedence.
-#
-#   Essentially:
-#      - MAIL_DIR defines the location of users mail spool files
-#        (for mbox use) by appending the username to MAIL_DIR as defined
-#        below.
-#      - MAIL_FILE defines the location of the users mail spool files as the
-#        fully-qualified filename obtained by prepending the user home
-#        directory before $MAIL_FILE
-#
-# NOTE: This is no more used for setting up users MAIL environment variable
-#       which is, starting from shadow 4.0.12-1 in Debian, entirely the
-#       job of the pam_mail PAM modules
-#       See default PAM configuration files provided for
-#       login, su, etc.
-#
-# This is a temporary situation: setting these variables will soon
-# move to /etc/default/useradd and the variables will then be
-# no more supported
-MAIL_DIR        /var/mail
-#MAIL_FILE      .mail
-
-#
-# Enable logging and display of /var/log/faillog login failure info.
-# This option conflicts with the pam_tally PAM module.
-#
-FAILLOG_ENAB		yes
-
-#
-# Enable display of unknown usernames when login failures are recorded.
-#
-# WARNING: Unknown usernames may become world readable. 
-# See #290803 and #298773 for details about how this could become a security
-# concern
-LOG_UNKFAIL_ENAB	no
-
-#
-# Enable logging of successful logins
-#
-LOG_OK_LOGINS		no
-
-#
-# Enable "syslog" logging of su activity - in addition to sulog file logging.
-# SYSLOG_SG_ENAB does the same for newgrp and sg.
-#
-SYSLOG_SU_ENAB		yes
-SYSLOG_SG_ENAB		yes
-
-#
-# If defined, all su activity is logged to this file.
-#
-#SULOG_FILE	/var/log/sulog
-
-#
-# If defined, file which maps tty line to TERM environment parameter.
-# Each line of the file is in a format something like "vt100  tty01".
-#
-#TTYTYPE_FILE	/etc/ttytype
-
-#
-# If defined, login failures will be logged here in a utmp format
-# last, when invoked as lastb, will read /var/log/btmp, so...
-#
-FTMP_FILE	/var/log/btmp
-
-#
-# If defined, the command name to display when running "su -".  For
-# example, if this is defined as "su" then a "ps" will display the
-# command is "-su".  If not defined, then "ps" would display the
-# name of the shell actually being run, e.g. something like "-sh".
-#
-SU_NAME		su
-
-#
-# If defined, file which inhibits all the usual chatter during the login
-# sequence.  If a full pathname, then hushed mode will be enabled if the
-# user's name or shell are found in the file.  If not a full pathname, then
-# hushed mode will be enabled if the file exists in the user's home directory.
-#
-HUSHLOGIN_FILE	.hushlogin
-#HUSHLOGIN_FILE	/etc/hushlogins
-
-#
-# *REQUIRED*  The default PATH settings, for superuser and normal users.
-#
-# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH	PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV_PATH	PATH=/usr/local/bin:/usr/bin:/bin:/usr/games
-
-#
-# Terminal permissions
-#
-#	TTYGROUP	Login tty will be assigned this group ownership.
-#	TTYPERM		Login tty will be set to this permission.
-#
-# If you have a "write" program which is "setgid" to a special group
-# which owns the terminals, define TTYGROUP to the group number and
-# TTYPERM to 0620.  Otherwise leave TTYGROUP commented out and assign
-# TTYPERM to either 622 or 600.
-#
-# In Debian /usr/bin/bsd-write or similar programs are setgid tty
-# However, the default and recommended value for TTYPERM is still 0600
-# to not allow anyone to write to anyone else console or terminal
-
-# Users can still allow other people to write them by issuing 
-# the "mesg y" command.
-
-TTYGROUP	tty
-TTYPERM		0600
-
-#
-# Login configuration initializations:
-#
-#	ERASECHAR	Terminal ERASE character ('\010' = backspace).
-#	KILLCHAR	Terminal KILL character ('\025' = CTRL/U).
-#	UMASK		Default "umask" value.
-#
-# The ERASECHAR and KILLCHAR are used only on System V machines.
-# 
-# UMASK usage is discouraged because it catches only some classes of user
-# entries to system, in fact only those made through login(1), while setting
-# umask in shell rc file will catch also logins through su, cron, ssh etc.
-#
-# At the same time, using shell rc to set umask won't catch entries which use
-# non-shell executables in place of login shell, like /usr/sbin/pppd for "ppp"
-# user and alike.
-#
-# Therefore the use of pam_umask is recommended (Debian package libpam-umask)
-# as the solution which catches all these cases on PAM-enabled systems.
-# 
-# This avoids the confusion created by having the umask set
-# in two different places -- in login.defs and shell rc files (i.e.
-# /etc/profile).
-#
-# For discussion, see #314539 and #248150 as well as the thread starting at
-# http://lists.debian.org/debian-devel/2005/06/msg01598.html
-#
-# Prefix these values with "0" to get octal, "0x" to get hexadecimal.
-#
-ERASECHAR	0177
-KILLCHAR	025
-# 022 is the "historical" value in Debian for UMASK when it was used
-# 027, or even 077, could be considered better for privacy
-# There is no One True Answer here : each sysadmin must make up their
-# mind.
-#UMASK		022
-
-#
-# Password aging controls:
-#
-#	PASS_MAX_DAYS	Maximum number of days a password may be used.
-#	PASS_MIN_DAYS	Minimum number of days allowed between password changes.
-#	PASS_WARN_AGE	Number of days warning given before a password expires.
-#
-PASS_MAX_DAYS	99999
-PASS_MIN_DAYS	0
-PASS_WARN_AGE	7
-
-#
-# Min/max values for automatic uid selection in useradd
-#
-UID_MIN			 1000
-UID_MAX			60000
-
-#
-# Min/max values for automatic gid selection in groupadd
-#
-GID_MIN			  100
-GID_MAX			60000
-
-#
-# Max number of login retries if password is bad. This will most likely be
-# overridden by PAM, since the default pam_unix module has it's own built
-# in of 3 retries. However, this is a safe fallback in case you are using
-# an authentication module that does not enforce PAM_MAXTRIES.
-#
-LOGIN_RETRIES		5
-
-#
-# Max time in seconds for login
-#
-LOGIN_TIMEOUT		60
-
-#
-# Which fields may be changed by regular users using chfn - use
-# any combination of letters "frwh" (full name, room number, work
-# phone, home phone).  If not defined, no changes are allowed.
-# For backward compatibility, "yes" = "rwh" and "no" = "frwh".
-# 
-CHFN_RESTRICT		rwh
-
-#
-# Should login be allowed if we can't cd to the home directory?
-# Default is no.
-#
-DEFAULT_HOME	yes
-
-#
-# If defined, this command is run when removing a user.
-# It should remove any at/cron/print jobs etc. owned by
-# the user to be removed (passed as the first argument).
-#
-#USERDEL_CMD	/usr/sbin/userdel_local
-
-#
-# This enables userdel to remove user groups if no members exist.
-#
-# Other former uses of this variable such as setting the umask when
-# user==primary group are not used in PAM environments, thus in Debian
-#
-USERGROUPS_ENAB yes
-
-#
-# Instead of the real user shell, the program specified by this parameter
-# will be launched, although its visible name (argv[0]) will be the shell's.
-# The program may do whatever it wants (logging, additional authentification,
-# banner, ...) before running the actual shell.
-#
-# FAKE_SHELL /bin/fakeshell
-
-#
-# If defined, either full pathname of a file containing device names or
-# a ":" delimited list of device names.  Root logins will be allowed only
-# upon these devices.
-#
-# This variable is used by login and su.
-#
-#CONSOLE	/etc/consoles
-#CONSOLE	console:tty01:tty02:tty03:tty04
-
-#
-# List of groups to add to the user's supplementary group set
-# when logging in on the console (as determined by the CONSOLE
-# setting).  Default is none.
-#
-# Use with caution - it is possible for users to gain permanent
-# access to these groups, even when not logged in on the console.
-# How to do it is left as an exercise for the reader...
-#
-# This variable is used by login and su.
-#
-#CONSOLE_GROUPS		floppy:audio:cdrom
-
-#
-# Only works if compiled with MD5_CRYPT defined:
-# If set to "yes", new passwords will be encrypted using the MD5-based
-# algorithm compatible with the one used by recent releases of FreeBSD.
-# It supports passwords of unlimited length and longer salt strings.
-# Set to "no" if you need to copy encrypted passwords to other systems
-# which don't understand the new algorithm.  Default is "no".
-#
-# This variable is used by chpasswd, gpasswd and newusers.
-#
-#MD5_CRYPT_ENAB	no
-
-################# OBSOLETED BY PAM ##############
-#						#
-# These options are now handled by PAM. Please	#
-# edit the appropriate file in /etc/pam.d/ to	#
-# enable the equivalents of them.
-#
-###############
-
-#MOTD_FILE
-#DIALUPS_CHECK_ENAB
-#LASTLOG_ENAB
-#MAIL_CHECK_ENAB
-#OBSCURE_CHECKS_ENAB
-#PORTTIME_CHECKS_ENAB
-#SU_WHEEL_ONLY
-#PASS_CHANGE_TRIES
-#PASS_ALWAYS_WARN
-#ENVIRON_FILE
-#NOLOGINS_FILE
-#ISSUE_FILE
-#PASS_MIN_LEN
-#PASS_MAX_LEN
-#ULIMIT
-#ENV_HZ
-#CHFN_AUTH
-#CHSH_AUTH
-#FAIL_DELAY
-
-################# OBSOLETED #######################
-#						  #
-# These options are no more handled by shadow.    #
-#                                                 #
-# Shadow utilities will display a warning if they #
-# still appear.                                   #
-#                                                 #
-###################################################
-
-# CLOSE_SESSIONS
-# LOGIN_STRING
-# NO_PASSWORD_CONSOLE
-# QMAIL_DIR
-
-
-
diff --git a/tests/tests/unit/.deps/test_adds-test_adds.Po b/tests/tests/unit/.deps/test_adds-test_adds.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/tests/tests/unit/.deps/test_adds-test_adds.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/tests/tests/unit/.deps/test_atoi_strtoi-test_atoi_strtoi.Po b/tests/tests/unit/.deps/test_atoi_strtoi-test_atoi_strtoi.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/tests/tests/unit/.deps/test_atoi_strtoi-test_atoi_strtoi.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/tests/tests/unit/.deps/test_chkname-test_chkname.Po b/tests/tests/unit/.deps/test_chkname-test_chkname.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/tests/tests/unit/.deps/test_chkname-test_chkname.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/tests/tests/unit/.deps/test_logind-test_logind.Po b/tests/tests/unit/.deps/test_logind-test_logind.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/tests/tests/unit/.deps/test_logind-test_logind.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/tests/tests/unit/.deps/test_sprintf-test_sprintf.Po b/tests/tests/unit/.deps/test_sprintf-test_sprintf.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/tests/tests/unit/.deps/test_sprintf-test_sprintf.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/tests/tests/unit/.deps/test_strncpy-test_strncpy.Po b/tests/tests/unit/.deps/test_strncpy-test_strncpy.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/tests/tests/unit/.deps/test_strncpy-test_strncpy.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/tests/tests/unit/.deps/test_strtcpy-test_strtcpy.Po b/tests/tests/unit/.deps/test_strtcpy-test_strtcpy.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/tests/tests/unit/.deps/test_strtcpy-test_strtcpy.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/tests/tests/unit/.deps/test_xasprintf-test_xasprintf.Po b/tests/tests/unit/.deps/test_xasprintf-test_xasprintf.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/tests/tests/unit/.deps/test_xasprintf-test_xasprintf.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/tests/tests/unit/.deps/test_zustr2stp-test_zustr2stp.Po b/tests/tests/unit/.deps/test_zustr2stp-test_zustr2stp.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/tests/tests/unit/.deps/test_zustr2stp-test_zustr2stp.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/tests/tests/unit/.gitignore b/tests/tests/unit/.gitignore
deleted file mode 100644
index f331069e..00000000
--- a/tests/tests/unit/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# General files applicable to all test files
-*.log
-*.trs
-
-# Specific files to be added each time a new file is included
-test_logind
\ No newline at end of file
diff --git a/tests/tests/unit/Makefile b/tests/tests/unit/Makefile
deleted file mode 100644
index 7b02b729..00000000
--- a/tests/tests/unit/Makefile
+++ /dev/null
@@ -1,1701 +0,0 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
-# tests/unit/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/shadow
-pkgincludedir = $(includedir)/shadow
-pkglibdir = $(libdir)/shadow
-pkglibexecdir = $(libexecdir)/shadow
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = x86_64-pc-linux-gnu
-host_triplet = x86_64-pc-linux-gnu
-#check_PROGRAMS = test_adds$(EXEEXT) \
-#	test_atoi_strtoi$(EXEEXT) \
-#	test_chkname$(EXEEXT) test_sprintf$(EXEEXT) \
-#	test_strncpy$(EXEEXT) test_strtcpy$(EXEEXT) \
-#	test_xasprintf$(EXEEXT) \
-#	test_zustr2stp$(EXEEXT) $(am__EXEEXT_1)
-#am__append_1 = \
-#    test_logind
-
-subdir = tests/unit
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-#am__EXEEXT_1 =  \
-#	test_logind$(EXEEXT)
-am__test_adds_SOURCES_DIST = ../../lib/adds.c test_adds.c
-am__dirstamp = $(am__leading_dot)dirstamp
-#am_test_adds_OBJECTS =  \
-#	../../lib/test_adds-adds.$(OBJEXT) \
-#	test_adds-test_adds.$(OBJEXT)
-test_adds_OBJECTS = $(am_test_adds_OBJECTS)
-am__DEPENDENCIES_1 =
-#test_adds_DEPENDENCIES = $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-test_adds_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_adds_CFLAGS) \
-	$(CFLAGS) $(test_adds_LDFLAGS) $(LDFLAGS) -o $@
-am__test_atoi_strtoi_SOURCES_DIST = ../../lib/atoi/strtoi.c \
-	test_atoi_strtoi.c
-#am_test_atoi_strtoi_OBJECTS = ../../lib/atoi/test_atoi_strtoi-strtoi.$(OBJEXT) \
-#	test_atoi_strtoi-test_atoi_strtoi.$(OBJEXT)
-test_atoi_strtoi_OBJECTS = $(am_test_atoi_strtoi_OBJECTS)
-#test_atoi_strtoi_DEPENDENCIES =  \
-#	$(am__DEPENDENCIES_1)
-test_atoi_strtoi_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_atoi_strtoi_CFLAGS) $(CFLAGS) \
-	$(test_atoi_strtoi_LDFLAGS) $(LDFLAGS) -o $@
-am__test_chkname_SOURCES_DIST = ../../lib/chkname.c test_chkname.c
-#am_test_chkname_OBJECTS =  \
-#	../../lib/test_chkname-chkname.$(OBJEXT) \
-#	test_chkname-test_chkname.$(OBJEXT)
-test_chkname_OBJECTS = $(am_test_chkname_OBJECTS)
-#test_chkname_DEPENDENCIES = $(am__DEPENDENCIES_1)
-test_chkname_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_chkname_CFLAGS) \
-	$(CFLAGS) $(test_chkname_LDFLAGS) $(LDFLAGS) -o $@
-am__test_logind_SOURCES_DIST = ../../lib/logind.c test_logind.c
-#am_test_logind_OBJECTS =  \
-#	../../lib/test_logind-logind.$(OBJEXT) \
-#	test_logind-test_logind.$(OBJEXT)
-test_logind_OBJECTS = $(am_test_logind_OBJECTS)
-#test_logind_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-#	$(am__DEPENDENCIES_1)
-test_logind_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_logind_CFLAGS) \
-	$(CFLAGS) $(test_logind_LDFLAGS) $(LDFLAGS) -o $@
-am__test_sprintf_SOURCES_DIST = ../../lib/string/sprintf.c \
-	test_sprintf.c
-#am_test_sprintf_OBJECTS = ../../lib/string/test_sprintf-sprintf.$(OBJEXT) \
-#	test_sprintf-test_sprintf.$(OBJEXT)
-test_sprintf_OBJECTS = $(am_test_sprintf_OBJECTS)
-#test_sprintf_DEPENDENCIES = $(am__DEPENDENCIES_1)
-test_sprintf_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_sprintf_CFLAGS) \
-	$(CFLAGS) $(test_sprintf_LDFLAGS) $(LDFLAGS) -o $@
-am__test_strncpy_SOURCES_DIST = test_strncpy.c
-#am_test_strncpy_OBJECTS =  \
-#	test_strncpy-test_strncpy.$(OBJEXT)
-test_strncpy_OBJECTS = $(am_test_strncpy_OBJECTS)
-#test_strncpy_DEPENDENCIES = $(am__DEPENDENCIES_1)
-test_strncpy_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_strncpy_CFLAGS) \
-	$(CFLAGS) $(test_strncpy_LDFLAGS) $(LDFLAGS) -o $@
-am__test_strtcpy_SOURCES_DIST = ../../lib/string/strtcpy.c \
-	test_strtcpy.c
-#am_test_strtcpy_OBJECTS = ../../lib/string/test_strtcpy-strtcpy.$(OBJEXT) \
-#	test_strtcpy-test_strtcpy.$(OBJEXT)
-test_strtcpy_OBJECTS = $(am_test_strtcpy_OBJECTS)
-#test_strtcpy_DEPENDENCIES = $(am__DEPENDENCIES_1)
-test_strtcpy_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_strtcpy_CFLAGS) \
-	$(CFLAGS) $(test_strtcpy_LDFLAGS) $(LDFLAGS) -o $@
-am__test_xasprintf_SOURCES_DIST = ../../lib/string/sprintf.c \
-	test_xasprintf.c
-#am_test_xasprintf_OBJECTS = ../../lib/string/test_xasprintf-sprintf.$(OBJEXT) \
-#	test_xasprintf-test_xasprintf.$(OBJEXT)
-test_xasprintf_OBJECTS = $(am_test_xasprintf_OBJECTS)
-#test_xasprintf_DEPENDENCIES = $(am__DEPENDENCIES_1)
-test_xasprintf_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_xasprintf_CFLAGS) $(CFLAGS) $(test_xasprintf_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am__test_zustr2stp_SOURCES_DIST = test_zustr2stp.c
-#am_test_zustr2stp_OBJECTS =  \
-#	test_zustr2stp-test_zustr2stp.$(OBJEXT)
-test_zustr2stp_OBJECTS = $(am_test_zustr2stp_OBJECTS)
-#test_zustr2stp_DEPENDENCIES = $(am__DEPENDENCIES_1)
-test_zustr2stp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_zustr2stp_CFLAGS) $(CFLAGS) $(test_zustr2stp_LDFLAGS) \
-	$(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_$(V))
-am__v_P_ = $(am__v_P_$(AM_DEFAULT_VERBOSITY))
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I. -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ../../lib/$(DEPDIR)/test_adds-adds.Po \
-	../../lib/$(DEPDIR)/test_chkname-chkname.Po \
-	../../lib/$(DEPDIR)/test_logind-logind.Po \
-	../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po \
-	../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po \
-	../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po \
-	../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po \
-	./$(DEPDIR)/test_adds-test_adds.Po \
-	./$(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po \
-	./$(DEPDIR)/test_chkname-test_chkname.Po \
-	./$(DEPDIR)/test_logind-test_logind.Po \
-	./$(DEPDIR)/test_sprintf-test_sprintf.Po \
-	./$(DEPDIR)/test_strncpy-test_strncpy.Po \
-	./$(DEPDIR)/test_strtcpy-test_strtcpy.Po \
-	./$(DEPDIR)/test_xasprintf-test_xasprintf.Po \
-	./$(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-SOURCES = $(test_adds_SOURCES) $(test_atoi_strtoi_SOURCES) \
-	$(test_chkname_SOURCES) $(test_logind_SOURCES) \
-	$(test_sprintf_SOURCES) $(test_strncpy_SOURCES) \
-	$(test_strtcpy_SOURCES) $(test_xasprintf_SOURCES) \
-	$(test_zustr2stp_SOURCES)
-DIST_SOURCES = $(am__test_adds_SOURCES_DIST) \
-	$(am__test_atoi_strtoi_SOURCES_DIST) \
-	$(am__test_chkname_SOURCES_DIST) \
-	$(am__test_logind_SOURCES_DIST) \
-	$(am__test_sprintf_SOURCES_DIST) \
-	$(am__test_strncpy_SOURCES_DIST) \
-	$(am__test_strtcpy_SOURCES_DIST) \
-	$(am__test_xasprintf_SOURCES_DIST) \
-	$(am__test_zustr2stp_SOURCES_DIST)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red=''; \
-    grn=''; \
-    lgn=''; \
-    blu=''; \
-    mgn=''; \
-    brg=''; \
-    std=''; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-TEST_EXTENSIONS =  .test
-LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:.log=.log)
-TEST_LOGS = $(am__test_logs2:.test.log=.log)
-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
-	$(TEST_LOG_FLAGS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
-	$(top_srcdir)/test-driver
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} '/home/serge/src/shadow/missing' aclocal-1.16
-AMTAR = $${TAR-tar}
-AM_DEFAULT_VERBOSITY = 0
-AR = ar
-AUTOCONF = ${SHELL} '/home/serge/src/shadow/missing' autoconf
-AUTOHEADER = ${SHELL} '/home/serge/src/shadow/missing' autoheader
-AUTOMAKE = ${SHELL} '/home/serge/src/shadow/missing' automake-1.16
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -O2 -Wall -Wextra -Werror=implicit-function-declaration -Werror=implicit-int -Werror=incompatible-pointer-types -Werror=int-conversion -Wno-expansion-to-defined -Wno-unknown-attributes -Wno-unknown-warning-option
-CMOCKA_CFLAGS = 
-CMOCKA_LIBS = 
-CPP = gcc -E
-CPPFLAGS = 
-CSCOPE = cscope
-CTAGS = ctags
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DLLTOOL = false
-DSYMUTIL = 
-DUMPBIN = 
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-ECONF_CPPFLAGS = 
-EGREP = /usr/bin/grep -E
-ETAGS = etags
-EXEEXT = 
-FGREP = /usr/bin/grep -F
-GETTEXT_MACRO_VERSION = 0.19
-GMSGFMT = /usr/bin/msgfmt
-GMSGFMT_015 = /usr/bin/msgfmt
-GREP = /usr/bin/grep
-GROUP_NAME_MAX_LENGTH = 32
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-INTLLIBS = 
-INTL_MACOSX_LIBS = 
-LD = /usr/bin/ld -m elf_x86_64
-LDFLAGS = 
-LIBACL = -lacl
-LIBADD_DL =  
-LIBADD_DLD_LINK = 
-LIBADD_DLOPEN = 
-LIBADD_SHL_LOAD = 
-LIBATTR = -lattr
-LIBAUDIT = -laudit
-LIBBSD = 
-LIBBSD_CFLAGS = -DLIBBSD_OVERLAY -isystem /usr/include/bsd
-LIBBSD_LIBS = -lbsd
-LIBCRYPT = -lcrypt
-LIBECONF = 
-LIBICONV = -liconv
-LIBINTL = 
-LIBMD = 
-LIBOBJS =  ${LIBOBJDIR}sgetgrent$U.o ${LIBOBJDIR}sgetpwent$U.o
-LIBPAM = 
-LIBS = -lbsd 
-LIBSELINUX = -lselinux
-LIBSEMANAGE = -lsemanage
-LIBSKEY = 
-LIBSUBID_ABI = 5.0.0
-LIBSUBID_ABI_MAJOR = 5
-LIBSUBID_ABI_MICRO = 0
-LIBSUBID_ABI_MINOR = 0
-LIBSYSTEMD = -lsystemd
-LIBTCB = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIPO = 
-LIYESCRYPT = -lcrypt
-LN_S = ln -s
-LTLIBICONV = -liconv
-LTLIBINTL = 
-LTLIBOBJS =  ${LIBOBJDIR}sgetgrent$U.lo ${LIBOBJDIR}sgetpwent$U.lo
-LT_DLLOADERS =  dlopen.la
-LT_DLPREOPEN = -dlpreopen dlopen.la 
-LT_SYS_LIBRARY_PATH = 
-MAINT = 
-MAKEINFO = ${SHELL} '/home/serge/src/shadow/missing' makeinfo
-MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
-MSGFMT = /usr/bin/msgfmt
-MSGFMT_015 = /usr/bin/msgfmt
-MSGMERGE = /usr/bin/msgmerge
-NM = /usr/bin/nm -B
-NMEDIT = 
-OBJDUMP = objdump
-OBJEXT = o
-OTOOL = 
-OTOOL64 = 
-PACKAGE = shadow
-PACKAGE_BUGREPORT = pkg-shadow-devel@lists.alioth.debian.org
-PACKAGE_NAME = shadow
-PACKAGE_STRING = shadow 4.16.0
-PACKAGE_TARNAME = shadow
-PACKAGE_URL = https://github.com/shadow-maint/shadow
-PACKAGE_VERSION = 4.16.0
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-PKG_CONFIG_LIBDIR = 
-PKG_CONFIG_PATH = 
-POSUB = po
-RANLIB = ranlib
-SED = /usr/bin/sed
-SET_MAKE = 
-SHELL = /bin/bash
-STRIP = strip
-USE_NLS = yes
-VENDORDIR = 
-VERSION = 4.16.0
-XGETTEXT = /usr/bin/xgettext
-XGETTEXT_015 = /usr/bin/xgettext
-XGETTEXT_EXTRA_OPTIONS = 
-XMLCATALOG = /usr/bin/xmlcatalog
-XML_CATALOG_FILE = /etc/xml/catalog
-XSLTPROC = /usr/bin/xsltproc
-YACC = bison -y
-YFLAGS = 
-abs_builddir = /home/serge/src/shadow/tests/unit
-abs_srcdir = /home/serge/src/shadow/tests/unit
-abs_top_builddir = /home/serge/src/shadow
-abs_top_srcdir = /home/serge/src/shadow
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_DUMPBIN = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = tar --format=posix -chf - "$$tardir"
-am__untar = tar -xf -
-bindir = ${exec_prefix}/bin
-build = x86_64-pc-linux-gnu
-build_alias = 
-build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = pc
-builddir = .
-capcmd = 
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = 
-host = x86_64-pc-linux-gnu
-host_alias = 
-host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = pc
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/serge/src/shadow/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = $(MKDIR_P)
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr
-program_transform_name = s,x,x,
-psdir = ${docdir}
-runstatedir = ${localstatedir}/run
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias = 
-top_build_prefix = ../../
-top_builddir = ../..
-top_srcdir = ../..
-AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)
-#TESTS = $(check_PROGRAMS)
-#test_adds_SOURCES = \
-#    ../../lib/adds.c \
-#    test_adds.c \
-#    $(NULL)
-
-#test_adds_CFLAGS = \
-#    $(AM_FLAGS) \
-#    $(NULL)
-
-#test_adds_LDFLAGS = \
-#    $(NULL)
-
-#test_adds_LDADD = \
-#    $(CMOCKA_LIBS) \
-#    $(NULL)
-
-#test_atoi_strtoi_SOURCES = \
-#    ../../lib/atoi/strtoi.c \
-#    test_atoi_strtoi.c \
-#    $(NULL)
-
-#test_atoi_strtoi_CFLAGS = \
-#    $(AM_CFLAGS) \
-#    $(NULL)
-
-#test_atoi_strtoi_LDFLAGS = \
-#    $(NULL)
-
-#test_atoi_strtoi_LDADD = \
-#    $(CMOCKA_LIBS) \
-#    $(NULL)
-
-#test_chkname_SOURCES = \
-#    ../../lib/chkname.c \
-#    test_chkname.c \
-#    $(NULL)
-
-#test_chkname_CFLAGS = \
-#    $(AM_CFLAGS) \
-#    $(NULL)
-
-#test_chkname_LDFLAGS = \
-#    $(NULL)
-
-#test_chkname_LDADD = \
-#    $(CMOCKA_LIBS) \
-#    $(NULL)
-
-#test_logind_SOURCES = \
-#    ../../lib/logind.c \
-#    test_logind.c \
-#    $(NULL)
-
-#test_logind_CFLAGS = \
-#    $(AM_CFLAGS) \
-#    -lsystemd \
-#    $(NULL)
-
-#test_logind_LDFLAGS = \
-#    -Wl,-wrap,prefix_getpwnam \
-#    -Wl,-wrap,sd_uid_get_sessions \
-#    $(NULL)
-
-#test_logind_LDADD = \
-#    $(CMOCKA_LIBS) \
-#    $(LIBSYSTEMD) \
-#    $(NULL)
-
-#test_sprintf_SOURCES = \
-#    ../../lib/string/sprintf.c \
-#    test_sprintf.c \
-#    $(NULL)
-
-#test_sprintf_CFLAGS = \
-#    $(AM_CFLAGS) \
-#    $(NULL)
-
-#test_sprintf_LDFLAGS = \
-#    $(NULL)
-
-#test_sprintf_LDADD = \
-#    $(CMOCKA_LIBS) \
-#    $(NULL)
-
-#test_strncpy_SOURCES = \
-#    test_strncpy.c \
-#    $(NULL)
-
-#test_strncpy_CFLAGS = \
-#    $(AM_CFLAGS) \
-#    $(NULL)
-
-#test_strncpy_LDFLAGS = \
-#    $(NULL)
-
-#test_strncpy_LDADD = \
-#    $(CMOCKA_LIBS) \
-#    $(NULL)
-
-#test_strtcpy_SOURCES = \
-#    ../../lib/string/strtcpy.c \
-#    test_strtcpy.c \
-#    $(NULL)
-
-#test_strtcpy_CFLAGS = \
-#    $(AM_CFLAGS) \
-#    $(NULL)
-
-#test_strtcpy_LDFLAGS = \
-#    $(NULL)
-
-#test_strtcpy_LDADD = \
-#    $(CMOCKA_LIBS) \
-#    $(NULL)
-
-#test_xasprintf_SOURCES = \
-#    ../../lib/string/sprintf.c \
-#    test_xasprintf.c \
-#    $(NULL)
-
-#test_xasprintf_CFLAGS = \
-#    $(AM_CFLAGS) \
-#    $(NULL)
-
-#test_xasprintf_LDFLAGS = \
-#    -Wl,-wrap,vasprintf \
-#    -Wl,-wrap,exit \
-#    $(NULL)
-
-#test_xasprintf_LDADD = \
-#    $(CMOCKA_LIBS) \
-#    $(NULL)
-
-#test_zustr2stp_SOURCES = \
-#    test_zustr2stp.c \
-#    $(NULL)
-
-#test_zustr2stp_CFLAGS = \
-#    $(AM_CFLAGS) \
-#    $(NULL)
-
-#test_zustr2stp_LDFLAGS = \
-#    $(NULL)
-
-#test_zustr2stp_LDADD = \
-#    $(CMOCKA_LIBS) \
-#    $(NULL)
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/unit/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign tests/unit/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-../../lib/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib
-	@: > ../../lib/$(am__dirstamp)
-../../lib/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib/$(DEPDIR)
-	@: > ../../lib/$(DEPDIR)/$(am__dirstamp)
-../../lib/test_adds-adds.$(OBJEXT): ../../lib/$(am__dirstamp) \
-	../../lib/$(DEPDIR)/$(am__dirstamp)
-
-test_adds$(EXEEXT): $(test_adds_OBJECTS) $(test_adds_DEPENDENCIES) $(EXTRA_test_adds_DEPENDENCIES) 
-	@rm -f test_adds$(EXEEXT)
-	$(AM_V_CCLD)$(test_adds_LINK) $(test_adds_OBJECTS) $(test_adds_LDADD) $(LIBS)
-../../lib/atoi/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib/atoi
-	@: > ../../lib/atoi/$(am__dirstamp)
-../../lib/atoi/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib/atoi/$(DEPDIR)
-	@: > ../../lib/atoi/$(DEPDIR)/$(am__dirstamp)
-../../lib/atoi/test_atoi_strtoi-strtoi.$(OBJEXT):  \
-	../../lib/atoi/$(am__dirstamp) \
-	../../lib/atoi/$(DEPDIR)/$(am__dirstamp)
-
-test_atoi_strtoi$(EXEEXT): $(test_atoi_strtoi_OBJECTS) $(test_atoi_strtoi_DEPENDENCIES) $(EXTRA_test_atoi_strtoi_DEPENDENCIES) 
-	@rm -f test_atoi_strtoi$(EXEEXT)
-	$(AM_V_CCLD)$(test_atoi_strtoi_LINK) $(test_atoi_strtoi_OBJECTS) $(test_atoi_strtoi_LDADD) $(LIBS)
-../../lib/test_chkname-chkname.$(OBJEXT): ../../lib/$(am__dirstamp) \
-	../../lib/$(DEPDIR)/$(am__dirstamp)
-
-test_chkname$(EXEEXT): $(test_chkname_OBJECTS) $(test_chkname_DEPENDENCIES) $(EXTRA_test_chkname_DEPENDENCIES) 
-	@rm -f test_chkname$(EXEEXT)
-	$(AM_V_CCLD)$(test_chkname_LINK) $(test_chkname_OBJECTS) $(test_chkname_LDADD) $(LIBS)
-../../lib/test_logind-logind.$(OBJEXT): ../../lib/$(am__dirstamp) \
-	../../lib/$(DEPDIR)/$(am__dirstamp)
-
-test_logind$(EXEEXT): $(test_logind_OBJECTS) $(test_logind_DEPENDENCIES) $(EXTRA_test_logind_DEPENDENCIES) 
-	@rm -f test_logind$(EXEEXT)
-	$(AM_V_CCLD)$(test_logind_LINK) $(test_logind_OBJECTS) $(test_logind_LDADD) $(LIBS)
-../../lib/string/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib/string
-	@: > ../../lib/string/$(am__dirstamp)
-../../lib/string/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib/string/$(DEPDIR)
-	@: > ../../lib/string/$(DEPDIR)/$(am__dirstamp)
-../../lib/string/test_sprintf-sprintf.$(OBJEXT):  \
-	../../lib/string/$(am__dirstamp) \
-	../../lib/string/$(DEPDIR)/$(am__dirstamp)
-
-test_sprintf$(EXEEXT): $(test_sprintf_OBJECTS) $(test_sprintf_DEPENDENCIES) $(EXTRA_test_sprintf_DEPENDENCIES) 
-	@rm -f test_sprintf$(EXEEXT)
-	$(AM_V_CCLD)$(test_sprintf_LINK) $(test_sprintf_OBJECTS) $(test_sprintf_LDADD) $(LIBS)
-
-test_strncpy$(EXEEXT): $(test_strncpy_OBJECTS) $(test_strncpy_DEPENDENCIES) $(EXTRA_test_strncpy_DEPENDENCIES) 
-	@rm -f test_strncpy$(EXEEXT)
-	$(AM_V_CCLD)$(test_strncpy_LINK) $(test_strncpy_OBJECTS) $(test_strncpy_LDADD) $(LIBS)
-../../lib/string/test_strtcpy-strtcpy.$(OBJEXT):  \
-	../../lib/string/$(am__dirstamp) \
-	../../lib/string/$(DEPDIR)/$(am__dirstamp)
-
-test_strtcpy$(EXEEXT): $(test_strtcpy_OBJECTS) $(test_strtcpy_DEPENDENCIES) $(EXTRA_test_strtcpy_DEPENDENCIES) 
-	@rm -f test_strtcpy$(EXEEXT)
-	$(AM_V_CCLD)$(test_strtcpy_LINK) $(test_strtcpy_OBJECTS) $(test_strtcpy_LDADD) $(LIBS)
-../../lib/string/test_xasprintf-sprintf.$(OBJEXT):  \
-	../../lib/string/$(am__dirstamp) \
-	../../lib/string/$(DEPDIR)/$(am__dirstamp)
-
-test_xasprintf$(EXEEXT): $(test_xasprintf_OBJECTS) $(test_xasprintf_DEPENDENCIES) $(EXTRA_test_xasprintf_DEPENDENCIES) 
-	@rm -f test_xasprintf$(EXEEXT)
-	$(AM_V_CCLD)$(test_xasprintf_LINK) $(test_xasprintf_OBJECTS) $(test_xasprintf_LDADD) $(LIBS)
-
-test_zustr2stp$(EXEEXT): $(test_zustr2stp_OBJECTS) $(test_zustr2stp_DEPENDENCIES) $(EXTRA_test_zustr2stp_DEPENDENCIES) 
-	@rm -f test_zustr2stp$(EXEEXT)
-	$(AM_V_CCLD)$(test_zustr2stp_LINK) $(test_zustr2stp_OBJECTS) $(test_zustr2stp_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-	-rm -f ../../lib/*.$(OBJEXT)
-	-rm -f ../../lib/atoi/*.$(OBJEXT)
-	-rm -f ../../lib/string/*.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-include ../../lib/$(DEPDIR)/test_adds-adds.Po # am--include-marker
-include ../../lib/$(DEPDIR)/test_chkname-chkname.Po # am--include-marker
-include ../../lib/$(DEPDIR)/test_logind-logind.Po # am--include-marker
-include ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po # am--include-marker
-include ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po # am--include-marker
-include ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po # am--include-marker
-include ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po # am--include-marker
-include ./$(DEPDIR)/test_adds-test_adds.Po # am--include-marker
-include ./$(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po # am--include-marker
-include ./$(DEPDIR)/test_chkname-test_chkname.Po # am--include-marker
-include ./$(DEPDIR)/test_logind-test_logind.Po # am--include-marker
-include ./$(DEPDIR)/test_sprintf-test_sprintf.Po # am--include-marker
-include ./$(DEPDIR)/test_strncpy-test_strncpy.Po # am--include-marker
-include ./$(DEPDIR)/test_strtcpy-test_strtcpy.Po # am--include-marker
-include ./$(DEPDIR)/test_xasprintf-test_xasprintf.Po # am--include-marker
-include ./$(DEPDIR)/test_zustr2stp-test_zustr2stp.Po # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
-
-.c.o:
-	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-	$(am__mv) $$depbase.Tpo $$depbase.Po
-#	$(AM_V_CC)source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-	$(am__mv) $$depbase.Tpo $$depbase.Po
-#	$(AM_V_CC)source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-	$(am__mv) $$depbase.Tpo $$depbase.Plo
-#	$(AM_V_CC)source='$<' object='$@' libtool=yes \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(LTCOMPILE) -c -o $@ $<
-
-../../lib/test_adds-adds.o: ../../lib/adds.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -MT ../../lib/test_adds-adds.o -MD -MP -MF ../../lib/$(DEPDIR)/test_adds-adds.Tpo -c -o ../../lib/test_adds-adds.o `test -f '../../lib/adds.c' || echo '$(srcdir)/'`../../lib/adds.c
-	$(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/test_adds-adds.Tpo ../../lib/$(DEPDIR)/test_adds-adds.Po
-#	$(AM_V_CC)source='../../lib/adds.c' object='../../lib/test_adds-adds.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -c -o ../../lib/test_adds-adds.o `test -f '../../lib/adds.c' || echo '$(srcdir)/'`../../lib/adds.c
-
-../../lib/test_adds-adds.obj: ../../lib/adds.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -MT ../../lib/test_adds-adds.obj -MD -MP -MF ../../lib/$(DEPDIR)/test_adds-adds.Tpo -c -o ../../lib/test_adds-adds.obj `if test -f '../../lib/adds.c'; then $(CYGPATH_W) '../../lib/adds.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/adds.c'; fi`
-	$(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/test_adds-adds.Tpo ../../lib/$(DEPDIR)/test_adds-adds.Po
-#	$(AM_V_CC)source='../../lib/adds.c' object='../../lib/test_adds-adds.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -c -o ../../lib/test_adds-adds.obj `if test -f '../../lib/adds.c'; then $(CYGPATH_W) '../../lib/adds.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/adds.c'; fi`
-
-test_adds-test_adds.o: test_adds.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -MT test_adds-test_adds.o -MD -MP -MF $(DEPDIR)/test_adds-test_adds.Tpo -c -o test_adds-test_adds.o `test -f 'test_adds.c' || echo '$(srcdir)/'`test_adds.c
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_adds-test_adds.Tpo $(DEPDIR)/test_adds-test_adds.Po
-#	$(AM_V_CC)source='test_adds.c' object='test_adds-test_adds.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -c -o test_adds-test_adds.o `test -f 'test_adds.c' || echo '$(srcdir)/'`test_adds.c
-
-test_adds-test_adds.obj: test_adds.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -MT test_adds-test_adds.obj -MD -MP -MF $(DEPDIR)/test_adds-test_adds.Tpo -c -o test_adds-test_adds.obj `if test -f 'test_adds.c'; then $(CYGPATH_W) 'test_adds.c'; else $(CYGPATH_W) '$(srcdir)/test_adds.c'; fi`
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_adds-test_adds.Tpo $(DEPDIR)/test_adds-test_adds.Po
-#	$(AM_V_CC)source='test_adds.c' object='test_adds-test_adds.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -c -o test_adds-test_adds.obj `if test -f 'test_adds.c'; then $(CYGPATH_W) 'test_adds.c'; else $(CYGPATH_W) '$(srcdir)/test_adds.c'; fi`
-
-../../lib/atoi/test_atoi_strtoi-strtoi.o: ../../lib/atoi/strtoi.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT ../../lib/atoi/test_atoi_strtoi-strtoi.o -MD -MP -MF ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo -c -o ../../lib/atoi/test_atoi_strtoi-strtoi.o `test -f '../../lib/atoi/strtoi.c' || echo '$(srcdir)/'`../../lib/atoi/strtoi.c
-	$(AM_V_at)$(am__mv) ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
-#	$(AM_V_CC)source='../../lib/atoi/strtoi.c' object='../../lib/atoi/test_atoi_strtoi-strtoi.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -c -o ../../lib/atoi/test_atoi_strtoi-strtoi.o `test -f '../../lib/atoi/strtoi.c' || echo '$(srcdir)/'`../../lib/atoi/strtoi.c
-
-../../lib/atoi/test_atoi_strtoi-strtoi.obj: ../../lib/atoi/strtoi.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT ../../lib/atoi/test_atoi_strtoi-strtoi.obj -MD -MP -MF ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo -c -o ../../lib/atoi/test_atoi_strtoi-strtoi.obj `if test -f '../../lib/atoi/strtoi.c'; then $(CYGPATH_W) '../../lib/atoi/strtoi.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/atoi/strtoi.c'; fi`
-	$(AM_V_at)$(am__mv) ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
-#	$(AM_V_CC)source='../../lib/atoi/strtoi.c' object='../../lib/atoi/test_atoi_strtoi-strtoi.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -c -o ../../lib/atoi/test_atoi_strtoi-strtoi.obj `if test -f '../../lib/atoi/strtoi.c'; then $(CYGPATH_W) '../../lib/atoi/strtoi.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/atoi/strtoi.c'; fi`
-
-test_atoi_strtoi-test_atoi_strtoi.o: test_atoi_strtoi.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT test_atoi_strtoi-test_atoi_strtoi.o -MD -MP -MF $(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Tpo -c -o test_atoi_strtoi-test_atoi_strtoi.o `test -f 'test_atoi_strtoi.c' || echo '$(srcdir)/'`test_atoi_strtoi.c
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Tpo $(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po
-#	$(AM_V_CC)source='test_atoi_strtoi.c' object='test_atoi_strtoi-test_atoi_strtoi.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -c -o test_atoi_strtoi-test_atoi_strtoi.o `test -f 'test_atoi_strtoi.c' || echo '$(srcdir)/'`test_atoi_strtoi.c
-
-test_atoi_strtoi-test_atoi_strtoi.obj: test_atoi_strtoi.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT test_atoi_strtoi-test_atoi_strtoi.obj -MD -MP -MF $(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Tpo -c -o test_atoi_strtoi-test_atoi_strtoi.obj `if test -f 'test_atoi_strtoi.c'; then $(CYGPATH_W) 'test_atoi_strtoi.c'; else $(CYGPATH_W) '$(srcdir)/test_atoi_strtoi.c'; fi`
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Tpo $(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po
-#	$(AM_V_CC)source='test_atoi_strtoi.c' object='test_atoi_strtoi-test_atoi_strtoi.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -c -o test_atoi_strtoi-test_atoi_strtoi.obj `if test -f 'test_atoi_strtoi.c'; then $(CYGPATH_W) 'test_atoi_strtoi.c'; else $(CYGPATH_W) '$(srcdir)/test_atoi_strtoi.c'; fi`
-
-../../lib/test_chkname-chkname.o: ../../lib/chkname.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -MT ../../lib/test_chkname-chkname.o -MD -MP -MF ../../lib/$(DEPDIR)/test_chkname-chkname.Tpo -c -o ../../lib/test_chkname-chkname.o `test -f '../../lib/chkname.c' || echo '$(srcdir)/'`../../lib/chkname.c
-	$(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/test_chkname-chkname.Tpo ../../lib/$(DEPDIR)/test_chkname-chkname.Po
-#	$(AM_V_CC)source='../../lib/chkname.c' object='../../lib/test_chkname-chkname.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -c -o ../../lib/test_chkname-chkname.o `test -f '../../lib/chkname.c' || echo '$(srcdir)/'`../../lib/chkname.c
-
-../../lib/test_chkname-chkname.obj: ../../lib/chkname.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -MT ../../lib/test_chkname-chkname.obj -MD -MP -MF ../../lib/$(DEPDIR)/test_chkname-chkname.Tpo -c -o ../../lib/test_chkname-chkname.obj `if test -f '../../lib/chkname.c'; then $(CYGPATH_W) '../../lib/chkname.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/chkname.c'; fi`
-	$(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/test_chkname-chkname.Tpo ../../lib/$(DEPDIR)/test_chkname-chkname.Po
-#	$(AM_V_CC)source='../../lib/chkname.c' object='../../lib/test_chkname-chkname.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -c -o ../../lib/test_chkname-chkname.obj `if test -f '../../lib/chkname.c'; then $(CYGPATH_W) '../../lib/chkname.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/chkname.c'; fi`
-
-test_chkname-test_chkname.o: test_chkname.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -MT test_chkname-test_chkname.o -MD -MP -MF $(DEPDIR)/test_chkname-test_chkname.Tpo -c -o test_chkname-test_chkname.o `test -f 'test_chkname.c' || echo '$(srcdir)/'`test_chkname.c
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_chkname-test_chkname.Tpo $(DEPDIR)/test_chkname-test_chkname.Po
-#	$(AM_V_CC)source='test_chkname.c' object='test_chkname-test_chkname.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -c -o test_chkname-test_chkname.o `test -f 'test_chkname.c' || echo '$(srcdir)/'`test_chkname.c
-
-test_chkname-test_chkname.obj: test_chkname.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -MT test_chkname-test_chkname.obj -MD -MP -MF $(DEPDIR)/test_chkname-test_chkname.Tpo -c -o test_chkname-test_chkname.obj `if test -f 'test_chkname.c'; then $(CYGPATH_W) 'test_chkname.c'; else $(CYGPATH_W) '$(srcdir)/test_chkname.c'; fi`
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_chkname-test_chkname.Tpo $(DEPDIR)/test_chkname-test_chkname.Po
-#	$(AM_V_CC)source='test_chkname.c' object='test_chkname-test_chkname.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -c -o test_chkname-test_chkname.obj `if test -f 'test_chkname.c'; then $(CYGPATH_W) 'test_chkname.c'; else $(CYGPATH_W) '$(srcdir)/test_chkname.c'; fi`
-
-../../lib/test_logind-logind.o: ../../lib/logind.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -MT ../../lib/test_logind-logind.o -MD -MP -MF ../../lib/$(DEPDIR)/test_logind-logind.Tpo -c -o ../../lib/test_logind-logind.o `test -f '../../lib/logind.c' || echo '$(srcdir)/'`../../lib/logind.c
-	$(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/test_logind-logind.Tpo ../../lib/$(DEPDIR)/test_logind-logind.Po
-#	$(AM_V_CC)source='../../lib/logind.c' object='../../lib/test_logind-logind.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -c -o ../../lib/test_logind-logind.o `test -f '../../lib/logind.c' || echo '$(srcdir)/'`../../lib/logind.c
-
-../../lib/test_logind-logind.obj: ../../lib/logind.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -MT ../../lib/test_logind-logind.obj -MD -MP -MF ../../lib/$(DEPDIR)/test_logind-logind.Tpo -c -o ../../lib/test_logind-logind.obj `if test -f '../../lib/logind.c'; then $(CYGPATH_W) '../../lib/logind.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/logind.c'; fi`
-	$(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/test_logind-logind.Tpo ../../lib/$(DEPDIR)/test_logind-logind.Po
-#	$(AM_V_CC)source='../../lib/logind.c' object='../../lib/test_logind-logind.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -c -o ../../lib/test_logind-logind.obj `if test -f '../../lib/logind.c'; then $(CYGPATH_W) '../../lib/logind.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/logind.c'; fi`
-
-test_logind-test_logind.o: test_logind.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -MT test_logind-test_logind.o -MD -MP -MF $(DEPDIR)/test_logind-test_logind.Tpo -c -o test_logind-test_logind.o `test -f 'test_logind.c' || echo '$(srcdir)/'`test_logind.c
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_logind-test_logind.Tpo $(DEPDIR)/test_logind-test_logind.Po
-#	$(AM_V_CC)source='test_logind.c' object='test_logind-test_logind.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -c -o test_logind-test_logind.o `test -f 'test_logind.c' || echo '$(srcdir)/'`test_logind.c
-
-test_logind-test_logind.obj: test_logind.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -MT test_logind-test_logind.obj -MD -MP -MF $(DEPDIR)/test_logind-test_logind.Tpo -c -o test_logind-test_logind.obj `if test -f 'test_logind.c'; then $(CYGPATH_W) 'test_logind.c'; else $(CYGPATH_W) '$(srcdir)/test_logind.c'; fi`
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_logind-test_logind.Tpo $(DEPDIR)/test_logind-test_logind.Po
-#	$(AM_V_CC)source='test_logind.c' object='test_logind-test_logind.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -c -o test_logind-test_logind.obj `if test -f 'test_logind.c'; then $(CYGPATH_W) 'test_logind.c'; else $(CYGPATH_W) '$(srcdir)/test_logind.c'; fi`
-
-../../lib/string/test_sprintf-sprintf.o: ../../lib/string/sprintf.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_sprintf-sprintf.o -MD -MP -MF ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Tpo -c -o ../../lib/string/test_sprintf-sprintf.o `test -f '../../lib/string/sprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf.c
-	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Tpo ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po
-#	$(AM_V_CC)source='../../lib/string/sprintf.c' object='../../lib/string/test_sprintf-sprintf.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_sprintf-sprintf.o `test -f '../../lib/string/sprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf.c
-
-../../lib/string/test_sprintf-sprintf.obj: ../../lib/string/sprintf.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_sprintf-sprintf.obj -MD -MP -MF ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Tpo -c -o ../../lib/string/test_sprintf-sprintf.obj `if test -f '../../lib/string/sprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf.c'; fi`
-	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Tpo ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po
-#	$(AM_V_CC)source='../../lib/string/sprintf.c' object='../../lib/string/test_sprintf-sprintf.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_sprintf-sprintf.obj `if test -f '../../lib/string/sprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf.c'; fi`
-
-test_sprintf-test_sprintf.o: test_sprintf.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -MT test_sprintf-test_sprintf.o -MD -MP -MF $(DEPDIR)/test_sprintf-test_sprintf.Tpo -c -o test_sprintf-test_sprintf.o `test -f 'test_sprintf.c' || echo '$(srcdir)/'`test_sprintf.c
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_sprintf-test_sprintf.Tpo $(DEPDIR)/test_sprintf-test_sprintf.Po
-#	$(AM_V_CC)source='test_sprintf.c' object='test_sprintf-test_sprintf.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -c -o test_sprintf-test_sprintf.o `test -f 'test_sprintf.c' || echo '$(srcdir)/'`test_sprintf.c
-
-test_sprintf-test_sprintf.obj: test_sprintf.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -MT test_sprintf-test_sprintf.obj -MD -MP -MF $(DEPDIR)/test_sprintf-test_sprintf.Tpo -c -o test_sprintf-test_sprintf.obj `if test -f 'test_sprintf.c'; then $(CYGPATH_W) 'test_sprintf.c'; else $(CYGPATH_W) '$(srcdir)/test_sprintf.c'; fi`
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_sprintf-test_sprintf.Tpo $(DEPDIR)/test_sprintf-test_sprintf.Po
-#	$(AM_V_CC)source='test_sprintf.c' object='test_sprintf-test_sprintf.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -c -o test_sprintf-test_sprintf.obj `if test -f 'test_sprintf.c'; then $(CYGPATH_W) 'test_sprintf.c'; else $(CYGPATH_W) '$(srcdir)/test_sprintf.c'; fi`
-
-test_strncpy-test_strncpy.o: test_strncpy.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strncpy_CFLAGS) $(CFLAGS) -MT test_strncpy-test_strncpy.o -MD -MP -MF $(DEPDIR)/test_strncpy-test_strncpy.Tpo -c -o test_strncpy-test_strncpy.o `test -f 'test_strncpy.c' || echo '$(srcdir)/'`test_strncpy.c
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_strncpy-test_strncpy.Tpo $(DEPDIR)/test_strncpy-test_strncpy.Po
-#	$(AM_V_CC)source='test_strncpy.c' object='test_strncpy-test_strncpy.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strncpy_CFLAGS) $(CFLAGS) -c -o test_strncpy-test_strncpy.o `test -f 'test_strncpy.c' || echo '$(srcdir)/'`test_strncpy.c
-
-test_strncpy-test_strncpy.obj: test_strncpy.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strncpy_CFLAGS) $(CFLAGS) -MT test_strncpy-test_strncpy.obj -MD -MP -MF $(DEPDIR)/test_strncpy-test_strncpy.Tpo -c -o test_strncpy-test_strncpy.obj `if test -f 'test_strncpy.c'; then $(CYGPATH_W) 'test_strncpy.c'; else $(CYGPATH_W) '$(srcdir)/test_strncpy.c'; fi`
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_strncpy-test_strncpy.Tpo $(DEPDIR)/test_strncpy-test_strncpy.Po
-#	$(AM_V_CC)source='test_strncpy.c' object='test_strncpy-test_strncpy.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strncpy_CFLAGS) $(CFLAGS) -c -o test_strncpy-test_strncpy.obj `if test -f 'test_strncpy.c'; then $(CYGPATH_W) 'test_strncpy.c'; else $(CYGPATH_W) '$(srcdir)/test_strncpy.c'; fi`
-
-../../lib/string/test_strtcpy-strtcpy.o: ../../lib/string/strtcpy.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_strtcpy-strtcpy.o -MD -MP -MF ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Tpo -c -o ../../lib/string/test_strtcpy-strtcpy.o `test -f '../../lib/string/strtcpy.c' || echo '$(srcdir)/'`../../lib/string/strtcpy.c
-	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Tpo ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po
-#	$(AM_V_CC)source='../../lib/string/strtcpy.c' object='../../lib/string/test_strtcpy-strtcpy.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_strtcpy-strtcpy.o `test -f '../../lib/string/strtcpy.c' || echo '$(srcdir)/'`../../lib/string/strtcpy.c
-
-../../lib/string/test_strtcpy-strtcpy.obj: ../../lib/string/strtcpy.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_strtcpy-strtcpy.obj -MD -MP -MF ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Tpo -c -o ../../lib/string/test_strtcpy-strtcpy.obj `if test -f '../../lib/string/strtcpy.c'; then $(CYGPATH_W) '../../lib/string/strtcpy.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/strtcpy.c'; fi`
-	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Tpo ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po
-#	$(AM_V_CC)source='../../lib/string/strtcpy.c' object='../../lib/string/test_strtcpy-strtcpy.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_strtcpy-strtcpy.obj `if test -f '../../lib/string/strtcpy.c'; then $(CYGPATH_W) '../../lib/string/strtcpy.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/strtcpy.c'; fi`
-
-test_strtcpy-test_strtcpy.o: test_strtcpy.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -MT test_strtcpy-test_strtcpy.o -MD -MP -MF $(DEPDIR)/test_strtcpy-test_strtcpy.Tpo -c -o test_strtcpy-test_strtcpy.o `test -f 'test_strtcpy.c' || echo '$(srcdir)/'`test_strtcpy.c
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_strtcpy-test_strtcpy.Tpo $(DEPDIR)/test_strtcpy-test_strtcpy.Po
-#	$(AM_V_CC)source='test_strtcpy.c' object='test_strtcpy-test_strtcpy.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -c -o test_strtcpy-test_strtcpy.o `test -f 'test_strtcpy.c' || echo '$(srcdir)/'`test_strtcpy.c
-
-test_strtcpy-test_strtcpy.obj: test_strtcpy.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -MT test_strtcpy-test_strtcpy.obj -MD -MP -MF $(DEPDIR)/test_strtcpy-test_strtcpy.Tpo -c -o test_strtcpy-test_strtcpy.obj `if test -f 'test_strtcpy.c'; then $(CYGPATH_W) 'test_strtcpy.c'; else $(CYGPATH_W) '$(srcdir)/test_strtcpy.c'; fi`
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_strtcpy-test_strtcpy.Tpo $(DEPDIR)/test_strtcpy-test_strtcpy.Po
-#	$(AM_V_CC)source='test_strtcpy.c' object='test_strtcpy-test_strtcpy.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -c -o test_strtcpy-test_strtcpy.obj `if test -f 'test_strtcpy.c'; then $(CYGPATH_W) 'test_strtcpy.c'; else $(CYGPATH_W) '$(srcdir)/test_strtcpy.c'; fi`
-
-../../lib/string/test_xasprintf-sprintf.o: ../../lib/string/sprintf.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_xasprintf-sprintf.o -MD -MP -MF ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Tpo -c -o ../../lib/string/test_xasprintf-sprintf.o `test -f '../../lib/string/sprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf.c
-	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Tpo ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po
-#	$(AM_V_CC)source='../../lib/string/sprintf.c' object='../../lib/string/test_xasprintf-sprintf.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_xasprintf-sprintf.o `test -f '../../lib/string/sprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf.c
-
-../../lib/string/test_xasprintf-sprintf.obj: ../../lib/string/sprintf.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_xasprintf-sprintf.obj -MD -MP -MF ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Tpo -c -o ../../lib/string/test_xasprintf-sprintf.obj `if test -f '../../lib/string/sprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf.c'; fi`
-	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Tpo ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po
-#	$(AM_V_CC)source='../../lib/string/sprintf.c' object='../../lib/string/test_xasprintf-sprintf.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_xasprintf-sprintf.obj `if test -f '../../lib/string/sprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf.c'; fi`
-
-test_xasprintf-test_xasprintf.o: test_xasprintf.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -MT test_xasprintf-test_xasprintf.o -MD -MP -MF $(DEPDIR)/test_xasprintf-test_xasprintf.Tpo -c -o test_xasprintf-test_xasprintf.o `test -f 'test_xasprintf.c' || echo '$(srcdir)/'`test_xasprintf.c
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_xasprintf-test_xasprintf.Tpo $(DEPDIR)/test_xasprintf-test_xasprintf.Po
-#	$(AM_V_CC)source='test_xasprintf.c' object='test_xasprintf-test_xasprintf.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -c -o test_xasprintf-test_xasprintf.o `test -f 'test_xasprintf.c' || echo '$(srcdir)/'`test_xasprintf.c
-
-test_xasprintf-test_xasprintf.obj: test_xasprintf.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -MT test_xasprintf-test_xasprintf.obj -MD -MP -MF $(DEPDIR)/test_xasprintf-test_xasprintf.Tpo -c -o test_xasprintf-test_xasprintf.obj `if test -f 'test_xasprintf.c'; then $(CYGPATH_W) 'test_xasprintf.c'; else $(CYGPATH_W) '$(srcdir)/test_xasprintf.c'; fi`
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_xasprintf-test_xasprintf.Tpo $(DEPDIR)/test_xasprintf-test_xasprintf.Po
-#	$(AM_V_CC)source='test_xasprintf.c' object='test_xasprintf-test_xasprintf.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -c -o test_xasprintf-test_xasprintf.obj `if test -f 'test_xasprintf.c'; then $(CYGPATH_W) 'test_xasprintf.c'; else $(CYGPATH_W) '$(srcdir)/test_xasprintf.c'; fi`
-
-test_zustr2stp-test_zustr2stp.o: test_zustr2stp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_zustr2stp_CFLAGS) $(CFLAGS) -MT test_zustr2stp-test_zustr2stp.o -MD -MP -MF $(DEPDIR)/test_zustr2stp-test_zustr2stp.Tpo -c -o test_zustr2stp-test_zustr2stp.o `test -f 'test_zustr2stp.c' || echo '$(srcdir)/'`test_zustr2stp.c
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_zustr2stp-test_zustr2stp.Tpo $(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
-#	$(AM_V_CC)source='test_zustr2stp.c' object='test_zustr2stp-test_zustr2stp.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_zustr2stp_CFLAGS) $(CFLAGS) -c -o test_zustr2stp-test_zustr2stp.o `test -f 'test_zustr2stp.c' || echo '$(srcdir)/'`test_zustr2stp.c
-
-test_zustr2stp-test_zustr2stp.obj: test_zustr2stp.c
-	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_zustr2stp_CFLAGS) $(CFLAGS) -MT test_zustr2stp-test_zustr2stp.obj -MD -MP -MF $(DEPDIR)/test_zustr2stp-test_zustr2stp.Tpo -c -o test_zustr2stp-test_zustr2stp.obj `if test -f 'test_zustr2stp.c'; then $(CYGPATH_W) 'test_zustr2stp.c'; else $(CYGPATH_W) '$(srcdir)/test_zustr2stp.c'; fi`
-	$(AM_V_at)$(am__mv) $(DEPDIR)/test_zustr2stp-test_zustr2stp.Tpo $(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
-#	$(AM_V_CC)source='test_zustr2stp.c' object='test_zustr2stp-test_zustr2stp.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(AM_V_CC_no)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_zustr2stp_CFLAGS) $(CFLAGS) -c -o test_zustr2stp-test_zustr2stp.obj `if test -f 'test_zustr2stp.c'; then $(CYGPATH_W) 'test_zustr2stp.c'; else $(CYGPATH_W) '$(srcdir)/test_zustr2stp.c'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	elif test -n "$$redo_logs"; then \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-
-check-TESTS: $(check_PROGRAMS)
-	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
-	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
-	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
-	exit $$?;
-recheck: all $(check_PROGRAMS)
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-test_adds.log: test_adds$(EXEEXT)
-	@p='test_adds$(EXEEXT)'; \
-	b='test_adds'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_atoi_strtoi.log: test_atoi_strtoi$(EXEEXT)
-	@p='test_atoi_strtoi$(EXEEXT)'; \
-	b='test_atoi_strtoi'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_chkname.log: test_chkname$(EXEEXT)
-	@p='test_chkname$(EXEEXT)'; \
-	b='test_chkname'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_sprintf.log: test_sprintf$(EXEEXT)
-	@p='test_sprintf$(EXEEXT)'; \
-	b='test_sprintf'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_strncpy.log: test_strncpy$(EXEEXT)
-	@p='test_strncpy$(EXEEXT)'; \
-	b='test_strncpy'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_strtcpy.log: test_strtcpy$(EXEEXT)
-	@p='test_strtcpy$(EXEEXT)'; \
-	b='test_strtcpy'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_xasprintf.log: test_xasprintf$(EXEEXT)
-	@p='test_xasprintf$(EXEEXT)'; \
-	b='test_xasprintf'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_zustr2stp.log: test_zustr2stp$(EXEEXT)
-	@p='test_zustr2stp$(EXEEXT)'; \
-	b='test_zustr2stp'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_logind.log: test_logind$(EXEEXT)
-	@p='test_logind$(EXEEXT)'; \
-	b='test_logind'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-.test.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-#.test$(EXEEXT).log:
-#	@p='$<'; \
-#	$(am__set_b); \
-#	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-#	--log-file $$b.log --trs-file $$b.trs \
-#	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-#	"$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f ../../lib/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ../../lib/$(am__dirstamp)
-	-rm -f ../../lib/atoi/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ../../lib/atoi/$(am__dirstamp)
-	-rm -f ../../lib/string/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ../../lib/string/$(am__dirstamp)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-		-rm -f ../../lib/$(DEPDIR)/test_adds-adds.Po
-	-rm -f ../../lib/$(DEPDIR)/test_chkname-chkname.Po
-	-rm -f ../../lib/$(DEPDIR)/test_logind-logind.Po
-	-rm -f ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po
-	-rm -f ./$(DEPDIR)/test_adds-test_adds.Po
-	-rm -f ./$(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po
-	-rm -f ./$(DEPDIR)/test_chkname-test_chkname.Po
-	-rm -f ./$(DEPDIR)/test_logind-test_logind.Po
-	-rm -f ./$(DEPDIR)/test_sprintf-test_sprintf.Po
-	-rm -f ./$(DEPDIR)/test_strncpy-test_strncpy.Po
-	-rm -f ./$(DEPDIR)/test_strtcpy-test_strtcpy.Po
-	-rm -f ./$(DEPDIR)/test_xasprintf-test_xasprintf.Po
-	-rm -f ./$(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-		-rm -f ../../lib/$(DEPDIR)/test_adds-adds.Po
-	-rm -f ../../lib/$(DEPDIR)/test_chkname-chkname.Po
-	-rm -f ../../lib/$(DEPDIR)/test_logind-logind.Po
-	-rm -f ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po
-	-rm -f ./$(DEPDIR)/test_adds-test_adds.Po
-	-rm -f ./$(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po
-	-rm -f ./$(DEPDIR)/test_chkname-test_chkname.Po
-	-rm -f ./$(DEPDIR)/test_logind-test_logind.Po
-	-rm -f ./$(DEPDIR)/test_sprintf-test_sprintf.Po
-	-rm -f ./$(DEPDIR)/test_strncpy-test_strncpy.Po
-	-rm -f ./$(DEPDIR)/test_strtcpy-test_strtcpy.Po
-	-rm -f ./$(DEPDIR)/test_xasprintf-test_xasprintf.Po
-	-rm -f ./$(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
-	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	recheck tags tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/tests/tests/unit/Makefile.am b/tests/tests/unit/Makefile.am
deleted file mode 100644
index d89367a3..00000000
--- a/tests/tests/unit/Makefile.am
+++ /dev/null
@@ -1,145 +0,0 @@
-AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)
-
-if HAVE_CMOCKA
-TESTS = $(check_PROGRAMS)
-
-check_PROGRAMS = \
-    test_adds \
-    test_atoi_strtoi \
-    test_chkname \
-    test_sprintf \
-    test_strncpy \
-    test_strtcpy \
-    test_xasprintf \
-    test_zustr2stp
-
-if ENABLE_LOGIND
-check_PROGRAMS += \
-    test_logind
-endif # ENABLE_LOGIND
-
-check_PROGRAMS += \
-    $(NULL)
-
-test_adds_SOURCES = \
-    ../../lib/adds.c \
-    test_adds.c \
-    $(NULL)
-test_adds_CFLAGS = \
-    $(AM_FLAGS) \
-    $(NULL)
-test_adds_LDFLAGS = \
-    $(NULL)
-test_adds_LDADD = \
-    $(CMOCKA_LIBS) \
-    $(NULL)
-
-test_atoi_strtoi_SOURCES = \
-    ../../lib/atoi/strtoi.c \
-    test_atoi_strtoi.c \
-    $(NULL)
-test_atoi_strtoi_CFLAGS = \
-    $(AM_CFLAGS) \
-    $(NULL)
-test_atoi_strtoi_LDFLAGS = \
-    $(NULL)
-test_atoi_strtoi_LDADD = \
-    $(CMOCKA_LIBS) \
-    $(NULL)
-
-test_chkname_SOURCES = \
-    ../../lib/chkname.c \
-    test_chkname.c \
-    $(NULL)
-test_chkname_CFLAGS = \
-    $(AM_CFLAGS) \
-    $(NULL)
-test_chkname_LDFLAGS = \
-    $(NULL)
-test_chkname_LDADD = \
-    $(CMOCKA_LIBS) \
-    $(NULL)
-
-test_logind_SOURCES = \
-    ../../lib/logind.c \
-    test_logind.c \
-    $(NULL)
-test_logind_CFLAGS = \
-    $(AM_CFLAGS) \
-    -lsystemd \
-    $(NULL)
-test_logind_LDFLAGS = \
-    -Wl,-wrap,prefix_getpwnam \
-    -Wl,-wrap,sd_uid_get_sessions \
-    $(NULL)
-test_logind_LDADD = \
-    $(CMOCKA_LIBS) \
-    $(LIBSYSTEMD) \
-    $(NULL)
-
-test_sprintf_SOURCES = \
-    ../../lib/string/sprintf.c \
-    test_sprintf.c \
-    $(NULL)
-test_sprintf_CFLAGS = \
-    $(AM_CFLAGS) \
-    $(NULL)
-test_sprintf_LDFLAGS = \
-    $(NULL)
-test_sprintf_LDADD = \
-    $(CMOCKA_LIBS) \
-    $(NULL)
-
-test_strncpy_SOURCES = \
-    test_strncpy.c \
-    $(NULL)
-test_strncpy_CFLAGS = \
-    $(AM_CFLAGS) \
-    $(NULL)
-test_strncpy_LDFLAGS = \
-    $(NULL)
-test_strncpy_LDADD = \
-    $(CMOCKA_LIBS) \
-    $(NULL)
-
-test_strtcpy_SOURCES = \
-    ../../lib/string/strtcpy.c \
-    test_strtcpy.c \
-    $(NULL)
-test_strtcpy_CFLAGS = \
-    $(AM_CFLAGS) \
-    $(NULL)
-test_strtcpy_LDFLAGS = \
-    $(NULL)
-test_strtcpy_LDADD = \
-    $(CMOCKA_LIBS) \
-    $(NULL)
-
-test_xasprintf_SOURCES = \
-    ../../lib/string/sprintf.c \
-    test_xasprintf.c \
-    $(NULL)
-test_xasprintf_CFLAGS = \
-    $(AM_CFLAGS) \
-    $(NULL)
-test_xasprintf_LDFLAGS = \
-    -Wl,-wrap,vasprintf \
-    -Wl,-wrap,exit \
-    $(NULL)
-test_xasprintf_LDADD = \
-    $(CMOCKA_LIBS) \
-    $(NULL)
-
-test_zustr2stp_SOURCES = \
-    test_zustr2stp.c \
-    $(NULL)
-test_zustr2stp_CFLAGS = \
-    $(AM_CFLAGS) \
-    $(NULL)
-test_zustr2stp_LDFLAGS = \
-    $(NULL)
-test_zustr2stp_LDADD = \
-    $(CMOCKA_LIBS) \
-    $(NULL)
-
-endif # HAVE_CMOCKA
diff --git a/tests/tests/unit/Makefile.in b/tests/tests/unit/Makefile.in
deleted file mode 100644
index b1087141..00000000
--- a/tests/tests/unit/Makefile.in
+++ /dev/null
@@ -1,1701 +0,0 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@HAVE_CMOCKA_TRUE@check_PROGRAMS = test_adds$(EXEEXT) \
-@HAVE_CMOCKA_TRUE@	test_atoi_strtoi$(EXEEXT) \
-@HAVE_CMOCKA_TRUE@	test_chkname$(EXEEXT) test_sprintf$(EXEEXT) \
-@HAVE_CMOCKA_TRUE@	test_strncpy$(EXEEXT) test_strtcpy$(EXEEXT) \
-@HAVE_CMOCKA_TRUE@	test_xasprintf$(EXEEXT) \
-@HAVE_CMOCKA_TRUE@	test_zustr2stp$(EXEEXT) $(am__EXEEXT_1)
-@ENABLE_LOGIND_TRUE@@HAVE_CMOCKA_TRUE@am__append_1 = \
-@ENABLE_LOGIND_TRUE@@HAVE_CMOCKA_TRUE@    test_logind
-
-subdir = tests/unit
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-@ENABLE_LOGIND_TRUE@@HAVE_CMOCKA_TRUE@am__EXEEXT_1 =  \
-@ENABLE_LOGIND_TRUE@@HAVE_CMOCKA_TRUE@	test_logind$(EXEEXT)
-am__test_adds_SOURCES_DIST = ../../lib/adds.c test_adds.c
-am__dirstamp = $(am__leading_dot)dirstamp
-@HAVE_CMOCKA_TRUE@am_test_adds_OBJECTS =  \
-@HAVE_CMOCKA_TRUE@	../../lib/test_adds-adds.$(OBJEXT) \
-@HAVE_CMOCKA_TRUE@	test_adds-test_adds.$(OBJEXT)
-test_adds_OBJECTS = $(am_test_adds_OBJECTS)
-am__DEPENDENCIES_1 =
-@HAVE_CMOCKA_TRUE@test_adds_DEPENDENCIES = $(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-test_adds_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_adds_CFLAGS) \
-	$(CFLAGS) $(test_adds_LDFLAGS) $(LDFLAGS) -o $@
-am__test_atoi_strtoi_SOURCES_DIST = ../../lib/atoi/strtoi.c \
-	test_atoi_strtoi.c
-@HAVE_CMOCKA_TRUE@am_test_atoi_strtoi_OBJECTS = ../../lib/atoi/test_atoi_strtoi-strtoi.$(OBJEXT) \
-@HAVE_CMOCKA_TRUE@	test_atoi_strtoi-test_atoi_strtoi.$(OBJEXT)
-test_atoi_strtoi_OBJECTS = $(am_test_atoi_strtoi_OBJECTS)
-@HAVE_CMOCKA_TRUE@test_atoi_strtoi_DEPENDENCIES =  \
-@HAVE_CMOCKA_TRUE@	$(am__DEPENDENCIES_1)
-test_atoi_strtoi_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_atoi_strtoi_CFLAGS) $(CFLAGS) \
-	$(test_atoi_strtoi_LDFLAGS) $(LDFLAGS) -o $@
-am__test_chkname_SOURCES_DIST = ../../lib/chkname.c test_chkname.c
-@HAVE_CMOCKA_TRUE@am_test_chkname_OBJECTS =  \
-@HAVE_CMOCKA_TRUE@	../../lib/test_chkname-chkname.$(OBJEXT) \
-@HAVE_CMOCKA_TRUE@	test_chkname-test_chkname.$(OBJEXT)
-test_chkname_OBJECTS = $(am_test_chkname_OBJECTS)
-@HAVE_CMOCKA_TRUE@test_chkname_DEPENDENCIES = $(am__DEPENDENCIES_1)
-test_chkname_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_chkname_CFLAGS) \
-	$(CFLAGS) $(test_chkname_LDFLAGS) $(LDFLAGS) -o $@
-am__test_logind_SOURCES_DIST = ../../lib/logind.c test_logind.c
-@HAVE_CMOCKA_TRUE@am_test_logind_OBJECTS =  \
-@HAVE_CMOCKA_TRUE@	../../lib/test_logind-logind.$(OBJEXT) \
-@HAVE_CMOCKA_TRUE@	test_logind-test_logind.$(OBJEXT)
-test_logind_OBJECTS = $(am_test_logind_OBJECTS)
-@HAVE_CMOCKA_TRUE@test_logind_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@HAVE_CMOCKA_TRUE@	$(am__DEPENDENCIES_1)
-test_logind_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_logind_CFLAGS) \
-	$(CFLAGS) $(test_logind_LDFLAGS) $(LDFLAGS) -o $@
-am__test_sprintf_SOURCES_DIST = ../../lib/string/sprintf.c \
-	test_sprintf.c
-@HAVE_CMOCKA_TRUE@am_test_sprintf_OBJECTS = ../../lib/string/test_sprintf-sprintf.$(OBJEXT) \
-@HAVE_CMOCKA_TRUE@	test_sprintf-test_sprintf.$(OBJEXT)
-test_sprintf_OBJECTS = $(am_test_sprintf_OBJECTS)
-@HAVE_CMOCKA_TRUE@test_sprintf_DEPENDENCIES = $(am__DEPENDENCIES_1)
-test_sprintf_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_sprintf_CFLAGS) \
-	$(CFLAGS) $(test_sprintf_LDFLAGS) $(LDFLAGS) -o $@
-am__test_strncpy_SOURCES_DIST = test_strncpy.c
-@HAVE_CMOCKA_TRUE@am_test_strncpy_OBJECTS =  \
-@HAVE_CMOCKA_TRUE@	test_strncpy-test_strncpy.$(OBJEXT)
-test_strncpy_OBJECTS = $(am_test_strncpy_OBJECTS)
-@HAVE_CMOCKA_TRUE@test_strncpy_DEPENDENCIES = $(am__DEPENDENCIES_1)
-test_strncpy_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_strncpy_CFLAGS) \
-	$(CFLAGS) $(test_strncpy_LDFLAGS) $(LDFLAGS) -o $@
-am__test_strtcpy_SOURCES_DIST = ../../lib/string/strtcpy.c \
-	test_strtcpy.c
-@HAVE_CMOCKA_TRUE@am_test_strtcpy_OBJECTS = ../../lib/string/test_strtcpy-strtcpy.$(OBJEXT) \
-@HAVE_CMOCKA_TRUE@	test_strtcpy-test_strtcpy.$(OBJEXT)
-test_strtcpy_OBJECTS = $(am_test_strtcpy_OBJECTS)
-@HAVE_CMOCKA_TRUE@test_strtcpy_DEPENDENCIES = $(am__DEPENDENCIES_1)
-test_strtcpy_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_strtcpy_CFLAGS) \
-	$(CFLAGS) $(test_strtcpy_LDFLAGS) $(LDFLAGS) -o $@
-am__test_xasprintf_SOURCES_DIST = ../../lib/string/sprintf.c \
-	test_xasprintf.c
-@HAVE_CMOCKA_TRUE@am_test_xasprintf_OBJECTS = ../../lib/string/test_xasprintf-sprintf.$(OBJEXT) \
-@HAVE_CMOCKA_TRUE@	test_xasprintf-test_xasprintf.$(OBJEXT)
-test_xasprintf_OBJECTS = $(am_test_xasprintf_OBJECTS)
-@HAVE_CMOCKA_TRUE@test_xasprintf_DEPENDENCIES = $(am__DEPENDENCIES_1)
-test_xasprintf_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_xasprintf_CFLAGS) $(CFLAGS) $(test_xasprintf_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am__test_zustr2stp_SOURCES_DIST = test_zustr2stp.c
-@HAVE_CMOCKA_TRUE@am_test_zustr2stp_OBJECTS =  \
-@HAVE_CMOCKA_TRUE@	test_zustr2stp-test_zustr2stp.$(OBJEXT)
-test_zustr2stp_OBJECTS = $(am_test_zustr2stp_OBJECTS)
-@HAVE_CMOCKA_TRUE@test_zustr2stp_DEPENDENCIES = $(am__DEPENDENCIES_1)
-test_zustr2stp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_zustr2stp_CFLAGS) $(CFLAGS) $(test_zustr2stp_LDFLAGS) \
-	$(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ../../lib/$(DEPDIR)/test_adds-adds.Po \
-	../../lib/$(DEPDIR)/test_chkname-chkname.Po \
-	../../lib/$(DEPDIR)/test_logind-logind.Po \
-	../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po \
-	../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po \
-	../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po \
-	../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po \
-	./$(DEPDIR)/test_adds-test_adds.Po \
-	./$(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po \
-	./$(DEPDIR)/test_chkname-test_chkname.Po \
-	./$(DEPDIR)/test_logind-test_logind.Po \
-	./$(DEPDIR)/test_sprintf-test_sprintf.Po \
-	./$(DEPDIR)/test_strncpy-test_strncpy.Po \
-	./$(DEPDIR)/test_strtcpy-test_strtcpy.Po \
-	./$(DEPDIR)/test_xasprintf-test_xasprintf.Po \
-	./$(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-SOURCES = $(test_adds_SOURCES) $(test_atoi_strtoi_SOURCES) \
-	$(test_chkname_SOURCES) $(test_logind_SOURCES) \
-	$(test_sprintf_SOURCES) $(test_strncpy_SOURCES) \
-	$(test_strtcpy_SOURCES) $(test_xasprintf_SOURCES) \
-	$(test_zustr2stp_SOURCES)
-DIST_SOURCES = $(am__test_adds_SOURCES_DIST) \
-	$(am__test_atoi_strtoi_SOURCES_DIST) \
-	$(am__test_chkname_SOURCES_DIST) \
-	$(am__test_logind_SOURCES_DIST) \
-	$(am__test_sprintf_SOURCES_DIST) \
-	$(am__test_strncpy_SOURCES_DIST) \
-	$(am__test_strtcpy_SOURCES_DIST) \
-	$(am__test_xasprintf_SOURCES_DIST) \
-	$(am__test_zustr2stp_SOURCES_DIST)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red=''; \
-    grn=''; \
-    lgn=''; \
-    blu=''; \
-    mgn=''; \
-    brg=''; \
-    std=''; \
-  fi; \
-}
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
-RECHECK_LOGS = $(TEST_LOGS)
-AM_RECURSIVE_TARGETS = check recheck
-TEST_SUITE_LOG = test-suite.log
-TEST_EXTENSIONS = @EXEEXT@ .test
-LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.test.log=.log)
-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
-	$(TEST_LOG_FLAGS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
-	$(top_srcdir)/test-driver
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CMOCKA_CFLAGS = @CMOCKA_CFLAGS@
-CMOCKA_LIBS = @CMOCKA_LIBS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CSCOPE = @CSCOPE@
-CTAGS = @CTAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ECONF_CPPFLAGS = @ECONF_CPPFLAGS@
-EGREP = @EGREP@
-ETAGS = @ETAGS@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
-GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
-GREP = @GREP@
-GROUP_NAME_MAX_LENGTH = @GROUP_NAME_MAX_LENGTH@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBACL = @LIBACL@
-LIBADD_DL = @LIBADD_DL@
-LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
-LIBADD_DLOPEN = @LIBADD_DLOPEN@
-LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
-LIBATTR = @LIBATTR@
-LIBAUDIT = @LIBAUDIT@
-LIBBSD = @LIBBSD@
-LIBBSD_CFLAGS = @LIBBSD_CFLAGS@
-LIBBSD_LIBS = @LIBBSD_LIBS@
-LIBCRYPT = @LIBCRYPT@
-LIBECONF = @LIBECONF@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBMD = @LIBMD@
-LIBOBJS = @LIBOBJS@
-LIBPAM = @LIBPAM@
-LIBS = @LIBS@
-LIBSELINUX = @LIBSELINUX@
-LIBSEMANAGE = @LIBSEMANAGE@
-LIBSKEY = @LIBSKEY@
-LIBSUBID_ABI = @LIBSUBID_ABI@
-LIBSUBID_ABI_MAJOR = @LIBSUBID_ABI_MAJOR@
-LIBSUBID_ABI_MICRO = @LIBSUBID_ABI_MICRO@
-LIBSUBID_ABI_MINOR = @LIBSUBID_ABI_MINOR@
-LIBSYSTEMD = @LIBSYSTEMD@
-LIBTCB = @LIBTCB@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LIYESCRYPT = @LIYESCRYPT@
-LN_S = @LN_S@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-LT_DLLOADERS = @LT_DLLOADERS@
-LT_DLPREOPEN = @LT_DLPREOPEN@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VENDORDIR = @VENDORDIR@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
-XMLCATALOG = @XMLCATALOG@
-XML_CATALOG_FILE = @XML_CATALOG_FILE@
-XSLTPROC = @XSLTPROC@
-YACC = @YACC@
-YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-capcmd = @capcmd@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)
-@HAVE_CMOCKA_TRUE@TESTS = $(check_PROGRAMS)
-@HAVE_CMOCKA_TRUE@test_adds_SOURCES = \
-@HAVE_CMOCKA_TRUE@    ../../lib/adds.c \
-@HAVE_CMOCKA_TRUE@    test_adds.c \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_adds_CFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(AM_FLAGS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_adds_LDFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_adds_LDADD = \
-@HAVE_CMOCKA_TRUE@    $(CMOCKA_LIBS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_atoi_strtoi_SOURCES = \
-@HAVE_CMOCKA_TRUE@    ../../lib/atoi/strtoi.c \
-@HAVE_CMOCKA_TRUE@    test_atoi_strtoi.c \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_atoi_strtoi_CFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(AM_CFLAGS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_atoi_strtoi_LDFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_atoi_strtoi_LDADD = \
-@HAVE_CMOCKA_TRUE@    $(CMOCKA_LIBS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_chkname_SOURCES = \
-@HAVE_CMOCKA_TRUE@    ../../lib/chkname.c \
-@HAVE_CMOCKA_TRUE@    test_chkname.c \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_chkname_CFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(AM_CFLAGS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_chkname_LDFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_chkname_LDADD = \
-@HAVE_CMOCKA_TRUE@    $(CMOCKA_LIBS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_logind_SOURCES = \
-@HAVE_CMOCKA_TRUE@    ../../lib/logind.c \
-@HAVE_CMOCKA_TRUE@    test_logind.c \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_logind_CFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(AM_CFLAGS) \
-@HAVE_CMOCKA_TRUE@    -lsystemd \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_logind_LDFLAGS = \
-@HAVE_CMOCKA_TRUE@    -Wl,-wrap,prefix_getpwnam \
-@HAVE_CMOCKA_TRUE@    -Wl,-wrap,sd_uid_get_sessions \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_logind_LDADD = \
-@HAVE_CMOCKA_TRUE@    $(CMOCKA_LIBS) \
-@HAVE_CMOCKA_TRUE@    $(LIBSYSTEMD) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_sprintf_SOURCES = \
-@HAVE_CMOCKA_TRUE@    ../../lib/string/sprintf.c \
-@HAVE_CMOCKA_TRUE@    test_sprintf.c \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_sprintf_CFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(AM_CFLAGS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_sprintf_LDFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_sprintf_LDADD = \
-@HAVE_CMOCKA_TRUE@    $(CMOCKA_LIBS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_strncpy_SOURCES = \
-@HAVE_CMOCKA_TRUE@    test_strncpy.c \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_strncpy_CFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(AM_CFLAGS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_strncpy_LDFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_strncpy_LDADD = \
-@HAVE_CMOCKA_TRUE@    $(CMOCKA_LIBS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_strtcpy_SOURCES = \
-@HAVE_CMOCKA_TRUE@    ../../lib/string/strtcpy.c \
-@HAVE_CMOCKA_TRUE@    test_strtcpy.c \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_strtcpy_CFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(AM_CFLAGS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_strtcpy_LDFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_strtcpy_LDADD = \
-@HAVE_CMOCKA_TRUE@    $(CMOCKA_LIBS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_xasprintf_SOURCES = \
-@HAVE_CMOCKA_TRUE@    ../../lib/string/sprintf.c \
-@HAVE_CMOCKA_TRUE@    test_xasprintf.c \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_xasprintf_CFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(AM_CFLAGS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_xasprintf_LDFLAGS = \
-@HAVE_CMOCKA_TRUE@    -Wl,-wrap,vasprintf \
-@HAVE_CMOCKA_TRUE@    -Wl,-wrap,exit \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_xasprintf_LDADD = \
-@HAVE_CMOCKA_TRUE@    $(CMOCKA_LIBS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_zustr2stp_SOURCES = \
-@HAVE_CMOCKA_TRUE@    test_zustr2stp.c \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_zustr2stp_CFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(AM_CFLAGS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_zustr2stp_LDFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_zustr2stp_LDADD = \
-@HAVE_CMOCKA_TRUE@    $(CMOCKA_LIBS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/unit/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign tests/unit/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-../../lib/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib
-	@: > ../../lib/$(am__dirstamp)
-../../lib/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib/$(DEPDIR)
-	@: > ../../lib/$(DEPDIR)/$(am__dirstamp)
-../../lib/test_adds-adds.$(OBJEXT): ../../lib/$(am__dirstamp) \
-	../../lib/$(DEPDIR)/$(am__dirstamp)
-
-test_adds$(EXEEXT): $(test_adds_OBJECTS) $(test_adds_DEPENDENCIES) $(EXTRA_test_adds_DEPENDENCIES) 
-	@rm -f test_adds$(EXEEXT)
-	$(AM_V_CCLD)$(test_adds_LINK) $(test_adds_OBJECTS) $(test_adds_LDADD) $(LIBS)
-../../lib/atoi/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib/atoi
-	@: > ../../lib/atoi/$(am__dirstamp)
-../../lib/atoi/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib/atoi/$(DEPDIR)
-	@: > ../../lib/atoi/$(DEPDIR)/$(am__dirstamp)
-../../lib/atoi/test_atoi_strtoi-strtoi.$(OBJEXT):  \
-	../../lib/atoi/$(am__dirstamp) \
-	../../lib/atoi/$(DEPDIR)/$(am__dirstamp)
-
-test_atoi_strtoi$(EXEEXT): $(test_atoi_strtoi_OBJECTS) $(test_atoi_strtoi_DEPENDENCIES) $(EXTRA_test_atoi_strtoi_DEPENDENCIES) 
-	@rm -f test_atoi_strtoi$(EXEEXT)
-	$(AM_V_CCLD)$(test_atoi_strtoi_LINK) $(test_atoi_strtoi_OBJECTS) $(test_atoi_strtoi_LDADD) $(LIBS)
-../../lib/test_chkname-chkname.$(OBJEXT): ../../lib/$(am__dirstamp) \
-	../../lib/$(DEPDIR)/$(am__dirstamp)
-
-test_chkname$(EXEEXT): $(test_chkname_OBJECTS) $(test_chkname_DEPENDENCIES) $(EXTRA_test_chkname_DEPENDENCIES) 
-	@rm -f test_chkname$(EXEEXT)
-	$(AM_V_CCLD)$(test_chkname_LINK) $(test_chkname_OBJECTS) $(test_chkname_LDADD) $(LIBS)
-../../lib/test_logind-logind.$(OBJEXT): ../../lib/$(am__dirstamp) \
-	../../lib/$(DEPDIR)/$(am__dirstamp)
-
-test_logind$(EXEEXT): $(test_logind_OBJECTS) $(test_logind_DEPENDENCIES) $(EXTRA_test_logind_DEPENDENCIES) 
-	@rm -f test_logind$(EXEEXT)
-	$(AM_V_CCLD)$(test_logind_LINK) $(test_logind_OBJECTS) $(test_logind_LDADD) $(LIBS)
-../../lib/string/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib/string
-	@: > ../../lib/string/$(am__dirstamp)
-../../lib/string/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib/string/$(DEPDIR)
-	@: > ../../lib/string/$(DEPDIR)/$(am__dirstamp)
-../../lib/string/test_sprintf-sprintf.$(OBJEXT):  \
-	../../lib/string/$(am__dirstamp) \
-	../../lib/string/$(DEPDIR)/$(am__dirstamp)
-
-test_sprintf$(EXEEXT): $(test_sprintf_OBJECTS) $(test_sprintf_DEPENDENCIES) $(EXTRA_test_sprintf_DEPENDENCIES) 
-	@rm -f test_sprintf$(EXEEXT)
-	$(AM_V_CCLD)$(test_sprintf_LINK) $(test_sprintf_OBJECTS) $(test_sprintf_LDADD) $(LIBS)
-
-test_strncpy$(EXEEXT): $(test_strncpy_OBJECTS) $(test_strncpy_DEPENDENCIES) $(EXTRA_test_strncpy_DEPENDENCIES) 
-	@rm -f test_strncpy$(EXEEXT)
-	$(AM_V_CCLD)$(test_strncpy_LINK) $(test_strncpy_OBJECTS) $(test_strncpy_LDADD) $(LIBS)
-../../lib/string/test_strtcpy-strtcpy.$(OBJEXT):  \
-	../../lib/string/$(am__dirstamp) \
-	../../lib/string/$(DEPDIR)/$(am__dirstamp)
-
-test_strtcpy$(EXEEXT): $(test_strtcpy_OBJECTS) $(test_strtcpy_DEPENDENCIES) $(EXTRA_test_strtcpy_DEPENDENCIES) 
-	@rm -f test_strtcpy$(EXEEXT)
-	$(AM_V_CCLD)$(test_strtcpy_LINK) $(test_strtcpy_OBJECTS) $(test_strtcpy_LDADD) $(LIBS)
-../../lib/string/test_xasprintf-sprintf.$(OBJEXT):  \
-	../../lib/string/$(am__dirstamp) \
-	../../lib/string/$(DEPDIR)/$(am__dirstamp)
-
-test_xasprintf$(EXEEXT): $(test_xasprintf_OBJECTS) $(test_xasprintf_DEPENDENCIES) $(EXTRA_test_xasprintf_DEPENDENCIES) 
-	@rm -f test_xasprintf$(EXEEXT)
-	$(AM_V_CCLD)$(test_xasprintf_LINK) $(test_xasprintf_OBJECTS) $(test_xasprintf_LDADD) $(LIBS)
-
-test_zustr2stp$(EXEEXT): $(test_zustr2stp_OBJECTS) $(test_zustr2stp_DEPENDENCIES) $(EXTRA_test_zustr2stp_DEPENDENCIES) 
-	@rm -f test_zustr2stp$(EXEEXT)
-	$(AM_V_CCLD)$(test_zustr2stp_LINK) $(test_zustr2stp_OBJECTS) $(test_zustr2stp_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-	-rm -f ../../lib/*.$(OBJEXT)
-	-rm -f ../../lib/atoi/*.$(OBJEXT)
-	-rm -f ../../lib/string/*.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/test_adds-adds.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/test_chkname-chkname.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/test_logind-logind.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_adds-test_adds.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_chkname-test_chkname.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_logind-test_logind.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_sprintf-test_sprintf.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_strncpy-test_strncpy.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_strtcpy-test_strtcpy.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_xasprintf-test_xasprintf.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_zustr2stp-test_zustr2stp.Po@am__quote@ # am--include-marker
-
-$(am__depfiles_remade):
-	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
-
-am--depfiles: $(am__depfiles_remade)
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-../../lib/test_adds-adds.o: ../../lib/adds.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -MT ../../lib/test_adds-adds.o -MD -MP -MF ../../lib/$(DEPDIR)/test_adds-adds.Tpo -c -o ../../lib/test_adds-adds.o `test -f '../../lib/adds.c' || echo '$(srcdir)/'`../../lib/adds.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/test_adds-adds.Tpo ../../lib/$(DEPDIR)/test_adds-adds.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/adds.c' object='../../lib/test_adds-adds.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -c -o ../../lib/test_adds-adds.o `test -f '../../lib/adds.c' || echo '$(srcdir)/'`../../lib/adds.c
-
-../../lib/test_adds-adds.obj: ../../lib/adds.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -MT ../../lib/test_adds-adds.obj -MD -MP -MF ../../lib/$(DEPDIR)/test_adds-adds.Tpo -c -o ../../lib/test_adds-adds.obj `if test -f '../../lib/adds.c'; then $(CYGPATH_W) '../../lib/adds.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/adds.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/test_adds-adds.Tpo ../../lib/$(DEPDIR)/test_adds-adds.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/adds.c' object='../../lib/test_adds-adds.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -c -o ../../lib/test_adds-adds.obj `if test -f '../../lib/adds.c'; then $(CYGPATH_W) '../../lib/adds.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/adds.c'; fi`
-
-test_adds-test_adds.o: test_adds.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -MT test_adds-test_adds.o -MD -MP -MF $(DEPDIR)/test_adds-test_adds.Tpo -c -o test_adds-test_adds.o `test -f 'test_adds.c' || echo '$(srcdir)/'`test_adds.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_adds-test_adds.Tpo $(DEPDIR)/test_adds-test_adds.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_adds.c' object='test_adds-test_adds.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -c -o test_adds-test_adds.o `test -f 'test_adds.c' || echo '$(srcdir)/'`test_adds.c
-
-test_adds-test_adds.obj: test_adds.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -MT test_adds-test_adds.obj -MD -MP -MF $(DEPDIR)/test_adds-test_adds.Tpo -c -o test_adds-test_adds.obj `if test -f 'test_adds.c'; then $(CYGPATH_W) 'test_adds.c'; else $(CYGPATH_W) '$(srcdir)/test_adds.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_adds-test_adds.Tpo $(DEPDIR)/test_adds-test_adds.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_adds.c' object='test_adds-test_adds.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -c -o test_adds-test_adds.obj `if test -f 'test_adds.c'; then $(CYGPATH_W) 'test_adds.c'; else $(CYGPATH_W) '$(srcdir)/test_adds.c'; fi`
-
-../../lib/atoi/test_atoi_strtoi-strtoi.o: ../../lib/atoi/strtoi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT ../../lib/atoi/test_atoi_strtoi-strtoi.o -MD -MP -MF ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo -c -o ../../lib/atoi/test_atoi_strtoi-strtoi.o `test -f '../../lib/atoi/strtoi.c' || echo '$(srcdir)/'`../../lib/atoi/strtoi.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/atoi/strtoi.c' object='../../lib/atoi/test_atoi_strtoi-strtoi.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -c -o ../../lib/atoi/test_atoi_strtoi-strtoi.o `test -f '../../lib/atoi/strtoi.c' || echo '$(srcdir)/'`../../lib/atoi/strtoi.c
-
-../../lib/atoi/test_atoi_strtoi-strtoi.obj: ../../lib/atoi/strtoi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT ../../lib/atoi/test_atoi_strtoi-strtoi.obj -MD -MP -MF ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo -c -o ../../lib/atoi/test_atoi_strtoi-strtoi.obj `if test -f '../../lib/atoi/strtoi.c'; then $(CYGPATH_W) '../../lib/atoi/strtoi.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/atoi/strtoi.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/atoi/strtoi.c' object='../../lib/atoi/test_atoi_strtoi-strtoi.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -c -o ../../lib/atoi/test_atoi_strtoi-strtoi.obj `if test -f '../../lib/atoi/strtoi.c'; then $(CYGPATH_W) '../../lib/atoi/strtoi.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/atoi/strtoi.c'; fi`
-
-test_atoi_strtoi-test_atoi_strtoi.o: test_atoi_strtoi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT test_atoi_strtoi-test_atoi_strtoi.o -MD -MP -MF $(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Tpo -c -o test_atoi_strtoi-test_atoi_strtoi.o `test -f 'test_atoi_strtoi.c' || echo '$(srcdir)/'`test_atoi_strtoi.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Tpo $(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_atoi_strtoi.c' object='test_atoi_strtoi-test_atoi_strtoi.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -c -o test_atoi_strtoi-test_atoi_strtoi.o `test -f 'test_atoi_strtoi.c' || echo '$(srcdir)/'`test_atoi_strtoi.c
-
-test_atoi_strtoi-test_atoi_strtoi.obj: test_atoi_strtoi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT test_atoi_strtoi-test_atoi_strtoi.obj -MD -MP -MF $(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Tpo -c -o test_atoi_strtoi-test_atoi_strtoi.obj `if test -f 'test_atoi_strtoi.c'; then $(CYGPATH_W) 'test_atoi_strtoi.c'; else $(CYGPATH_W) '$(srcdir)/test_atoi_strtoi.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Tpo $(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_atoi_strtoi.c' object='test_atoi_strtoi-test_atoi_strtoi.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -c -o test_atoi_strtoi-test_atoi_strtoi.obj `if test -f 'test_atoi_strtoi.c'; then $(CYGPATH_W) 'test_atoi_strtoi.c'; else $(CYGPATH_W) '$(srcdir)/test_atoi_strtoi.c'; fi`
-
-../../lib/test_chkname-chkname.o: ../../lib/chkname.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -MT ../../lib/test_chkname-chkname.o -MD -MP -MF ../../lib/$(DEPDIR)/test_chkname-chkname.Tpo -c -o ../../lib/test_chkname-chkname.o `test -f '../../lib/chkname.c' || echo '$(srcdir)/'`../../lib/chkname.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/test_chkname-chkname.Tpo ../../lib/$(DEPDIR)/test_chkname-chkname.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/chkname.c' object='../../lib/test_chkname-chkname.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -c -o ../../lib/test_chkname-chkname.o `test -f '../../lib/chkname.c' || echo '$(srcdir)/'`../../lib/chkname.c
-
-../../lib/test_chkname-chkname.obj: ../../lib/chkname.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -MT ../../lib/test_chkname-chkname.obj -MD -MP -MF ../../lib/$(DEPDIR)/test_chkname-chkname.Tpo -c -o ../../lib/test_chkname-chkname.obj `if test -f '../../lib/chkname.c'; then $(CYGPATH_W) '../../lib/chkname.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/chkname.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/test_chkname-chkname.Tpo ../../lib/$(DEPDIR)/test_chkname-chkname.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/chkname.c' object='../../lib/test_chkname-chkname.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -c -o ../../lib/test_chkname-chkname.obj `if test -f '../../lib/chkname.c'; then $(CYGPATH_W) '../../lib/chkname.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/chkname.c'; fi`
-
-test_chkname-test_chkname.o: test_chkname.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -MT test_chkname-test_chkname.o -MD -MP -MF $(DEPDIR)/test_chkname-test_chkname.Tpo -c -o test_chkname-test_chkname.o `test -f 'test_chkname.c' || echo '$(srcdir)/'`test_chkname.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_chkname-test_chkname.Tpo $(DEPDIR)/test_chkname-test_chkname.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_chkname.c' object='test_chkname-test_chkname.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -c -o test_chkname-test_chkname.o `test -f 'test_chkname.c' || echo '$(srcdir)/'`test_chkname.c
-
-test_chkname-test_chkname.obj: test_chkname.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -MT test_chkname-test_chkname.obj -MD -MP -MF $(DEPDIR)/test_chkname-test_chkname.Tpo -c -o test_chkname-test_chkname.obj `if test -f 'test_chkname.c'; then $(CYGPATH_W) 'test_chkname.c'; else $(CYGPATH_W) '$(srcdir)/test_chkname.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_chkname-test_chkname.Tpo $(DEPDIR)/test_chkname-test_chkname.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_chkname.c' object='test_chkname-test_chkname.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_chkname_CFLAGS) $(CFLAGS) -c -o test_chkname-test_chkname.obj `if test -f 'test_chkname.c'; then $(CYGPATH_W) 'test_chkname.c'; else $(CYGPATH_W) '$(srcdir)/test_chkname.c'; fi`
-
-../../lib/test_logind-logind.o: ../../lib/logind.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -MT ../../lib/test_logind-logind.o -MD -MP -MF ../../lib/$(DEPDIR)/test_logind-logind.Tpo -c -o ../../lib/test_logind-logind.o `test -f '../../lib/logind.c' || echo '$(srcdir)/'`../../lib/logind.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/test_logind-logind.Tpo ../../lib/$(DEPDIR)/test_logind-logind.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/logind.c' object='../../lib/test_logind-logind.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -c -o ../../lib/test_logind-logind.o `test -f '../../lib/logind.c' || echo '$(srcdir)/'`../../lib/logind.c
-
-../../lib/test_logind-logind.obj: ../../lib/logind.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -MT ../../lib/test_logind-logind.obj -MD -MP -MF ../../lib/$(DEPDIR)/test_logind-logind.Tpo -c -o ../../lib/test_logind-logind.obj `if test -f '../../lib/logind.c'; then $(CYGPATH_W) '../../lib/logind.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/logind.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/test_logind-logind.Tpo ../../lib/$(DEPDIR)/test_logind-logind.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/logind.c' object='../../lib/test_logind-logind.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -c -o ../../lib/test_logind-logind.obj `if test -f '../../lib/logind.c'; then $(CYGPATH_W) '../../lib/logind.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/logind.c'; fi`
-
-test_logind-test_logind.o: test_logind.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -MT test_logind-test_logind.o -MD -MP -MF $(DEPDIR)/test_logind-test_logind.Tpo -c -o test_logind-test_logind.o `test -f 'test_logind.c' || echo '$(srcdir)/'`test_logind.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_logind-test_logind.Tpo $(DEPDIR)/test_logind-test_logind.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_logind.c' object='test_logind-test_logind.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -c -o test_logind-test_logind.o `test -f 'test_logind.c' || echo '$(srcdir)/'`test_logind.c
-
-test_logind-test_logind.obj: test_logind.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -MT test_logind-test_logind.obj -MD -MP -MF $(DEPDIR)/test_logind-test_logind.Tpo -c -o test_logind-test_logind.obj `if test -f 'test_logind.c'; then $(CYGPATH_W) 'test_logind.c'; else $(CYGPATH_W) '$(srcdir)/test_logind.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_logind-test_logind.Tpo $(DEPDIR)/test_logind-test_logind.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_logind.c' object='test_logind-test_logind.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -c -o test_logind-test_logind.obj `if test -f 'test_logind.c'; then $(CYGPATH_W) 'test_logind.c'; else $(CYGPATH_W) '$(srcdir)/test_logind.c'; fi`
-
-../../lib/string/test_sprintf-sprintf.o: ../../lib/string/sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_sprintf-sprintf.o -MD -MP -MF ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Tpo -c -o ../../lib/string/test_sprintf-sprintf.o `test -f '../../lib/string/sprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Tpo ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/sprintf.c' object='../../lib/string/test_sprintf-sprintf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_sprintf-sprintf.o `test -f '../../lib/string/sprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf.c
-
-../../lib/string/test_sprintf-sprintf.obj: ../../lib/string/sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_sprintf-sprintf.obj -MD -MP -MF ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Tpo -c -o ../../lib/string/test_sprintf-sprintf.obj `if test -f '../../lib/string/sprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Tpo ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/sprintf.c' object='../../lib/string/test_sprintf-sprintf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_sprintf-sprintf.obj `if test -f '../../lib/string/sprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf.c'; fi`
-
-test_sprintf-test_sprintf.o: test_sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -MT test_sprintf-test_sprintf.o -MD -MP -MF $(DEPDIR)/test_sprintf-test_sprintf.Tpo -c -o test_sprintf-test_sprintf.o `test -f 'test_sprintf.c' || echo '$(srcdir)/'`test_sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_sprintf-test_sprintf.Tpo $(DEPDIR)/test_sprintf-test_sprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_sprintf.c' object='test_sprintf-test_sprintf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -c -o test_sprintf-test_sprintf.o `test -f 'test_sprintf.c' || echo '$(srcdir)/'`test_sprintf.c
-
-test_sprintf-test_sprintf.obj: test_sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -MT test_sprintf-test_sprintf.obj -MD -MP -MF $(DEPDIR)/test_sprintf-test_sprintf.Tpo -c -o test_sprintf-test_sprintf.obj `if test -f 'test_sprintf.c'; then $(CYGPATH_W) 'test_sprintf.c'; else $(CYGPATH_W) '$(srcdir)/test_sprintf.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_sprintf-test_sprintf.Tpo $(DEPDIR)/test_sprintf-test_sprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_sprintf.c' object='test_sprintf-test_sprintf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -c -o test_sprintf-test_sprintf.obj `if test -f 'test_sprintf.c'; then $(CYGPATH_W) 'test_sprintf.c'; else $(CYGPATH_W) '$(srcdir)/test_sprintf.c'; fi`
-
-test_strncpy-test_strncpy.o: test_strncpy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strncpy_CFLAGS) $(CFLAGS) -MT test_strncpy-test_strncpy.o -MD -MP -MF $(DEPDIR)/test_strncpy-test_strncpy.Tpo -c -o test_strncpy-test_strncpy.o `test -f 'test_strncpy.c' || echo '$(srcdir)/'`test_strncpy.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_strncpy-test_strncpy.Tpo $(DEPDIR)/test_strncpy-test_strncpy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_strncpy.c' object='test_strncpy-test_strncpy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strncpy_CFLAGS) $(CFLAGS) -c -o test_strncpy-test_strncpy.o `test -f 'test_strncpy.c' || echo '$(srcdir)/'`test_strncpy.c
-
-test_strncpy-test_strncpy.obj: test_strncpy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strncpy_CFLAGS) $(CFLAGS) -MT test_strncpy-test_strncpy.obj -MD -MP -MF $(DEPDIR)/test_strncpy-test_strncpy.Tpo -c -o test_strncpy-test_strncpy.obj `if test -f 'test_strncpy.c'; then $(CYGPATH_W) 'test_strncpy.c'; else $(CYGPATH_W) '$(srcdir)/test_strncpy.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_strncpy-test_strncpy.Tpo $(DEPDIR)/test_strncpy-test_strncpy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_strncpy.c' object='test_strncpy-test_strncpy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strncpy_CFLAGS) $(CFLAGS) -c -o test_strncpy-test_strncpy.obj `if test -f 'test_strncpy.c'; then $(CYGPATH_W) 'test_strncpy.c'; else $(CYGPATH_W) '$(srcdir)/test_strncpy.c'; fi`
-
-../../lib/string/test_strtcpy-strtcpy.o: ../../lib/string/strtcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_strtcpy-strtcpy.o -MD -MP -MF ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Tpo -c -o ../../lib/string/test_strtcpy-strtcpy.o `test -f '../../lib/string/strtcpy.c' || echo '$(srcdir)/'`../../lib/string/strtcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Tpo ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/strtcpy.c' object='../../lib/string/test_strtcpy-strtcpy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_strtcpy-strtcpy.o `test -f '../../lib/string/strtcpy.c' || echo '$(srcdir)/'`../../lib/string/strtcpy.c
-
-../../lib/string/test_strtcpy-strtcpy.obj: ../../lib/string/strtcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_strtcpy-strtcpy.obj -MD -MP -MF ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Tpo -c -o ../../lib/string/test_strtcpy-strtcpy.obj `if test -f '../../lib/string/strtcpy.c'; then $(CYGPATH_W) '../../lib/string/strtcpy.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/strtcpy.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Tpo ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/strtcpy.c' object='../../lib/string/test_strtcpy-strtcpy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_strtcpy-strtcpy.obj `if test -f '../../lib/string/strtcpy.c'; then $(CYGPATH_W) '../../lib/string/strtcpy.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/strtcpy.c'; fi`
-
-test_strtcpy-test_strtcpy.o: test_strtcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -MT test_strtcpy-test_strtcpy.o -MD -MP -MF $(DEPDIR)/test_strtcpy-test_strtcpy.Tpo -c -o test_strtcpy-test_strtcpy.o `test -f 'test_strtcpy.c' || echo '$(srcdir)/'`test_strtcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_strtcpy-test_strtcpy.Tpo $(DEPDIR)/test_strtcpy-test_strtcpy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_strtcpy.c' object='test_strtcpy-test_strtcpy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -c -o test_strtcpy-test_strtcpy.o `test -f 'test_strtcpy.c' || echo '$(srcdir)/'`test_strtcpy.c
-
-test_strtcpy-test_strtcpy.obj: test_strtcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -MT test_strtcpy-test_strtcpy.obj -MD -MP -MF $(DEPDIR)/test_strtcpy-test_strtcpy.Tpo -c -o test_strtcpy-test_strtcpy.obj `if test -f 'test_strtcpy.c'; then $(CYGPATH_W) 'test_strtcpy.c'; else $(CYGPATH_W) '$(srcdir)/test_strtcpy.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_strtcpy-test_strtcpy.Tpo $(DEPDIR)/test_strtcpy-test_strtcpy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_strtcpy.c' object='test_strtcpy-test_strtcpy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -c -o test_strtcpy-test_strtcpy.obj `if test -f 'test_strtcpy.c'; then $(CYGPATH_W) 'test_strtcpy.c'; else $(CYGPATH_W) '$(srcdir)/test_strtcpy.c'; fi`
-
-../../lib/string/test_xasprintf-sprintf.o: ../../lib/string/sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_xasprintf-sprintf.o -MD -MP -MF ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Tpo -c -o ../../lib/string/test_xasprintf-sprintf.o `test -f '../../lib/string/sprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Tpo ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/sprintf.c' object='../../lib/string/test_xasprintf-sprintf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_xasprintf-sprintf.o `test -f '../../lib/string/sprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf.c
-
-../../lib/string/test_xasprintf-sprintf.obj: ../../lib/string/sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_xasprintf-sprintf.obj -MD -MP -MF ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Tpo -c -o ../../lib/string/test_xasprintf-sprintf.obj `if test -f '../../lib/string/sprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Tpo ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/sprintf.c' object='../../lib/string/test_xasprintf-sprintf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_xasprintf-sprintf.obj `if test -f '../../lib/string/sprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf.c'; fi`
-
-test_xasprintf-test_xasprintf.o: test_xasprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -MT test_xasprintf-test_xasprintf.o -MD -MP -MF $(DEPDIR)/test_xasprintf-test_xasprintf.Tpo -c -o test_xasprintf-test_xasprintf.o `test -f 'test_xasprintf.c' || echo '$(srcdir)/'`test_xasprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_xasprintf-test_xasprintf.Tpo $(DEPDIR)/test_xasprintf-test_xasprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_xasprintf.c' object='test_xasprintf-test_xasprintf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -c -o test_xasprintf-test_xasprintf.o `test -f 'test_xasprintf.c' || echo '$(srcdir)/'`test_xasprintf.c
-
-test_xasprintf-test_xasprintf.obj: test_xasprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -MT test_xasprintf-test_xasprintf.obj -MD -MP -MF $(DEPDIR)/test_xasprintf-test_xasprintf.Tpo -c -o test_xasprintf-test_xasprintf.obj `if test -f 'test_xasprintf.c'; then $(CYGPATH_W) 'test_xasprintf.c'; else $(CYGPATH_W) '$(srcdir)/test_xasprintf.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_xasprintf-test_xasprintf.Tpo $(DEPDIR)/test_xasprintf-test_xasprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_xasprintf.c' object='test_xasprintf-test_xasprintf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -c -o test_xasprintf-test_xasprintf.obj `if test -f 'test_xasprintf.c'; then $(CYGPATH_W) 'test_xasprintf.c'; else $(CYGPATH_W) '$(srcdir)/test_xasprintf.c'; fi`
-
-test_zustr2stp-test_zustr2stp.o: test_zustr2stp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_zustr2stp_CFLAGS) $(CFLAGS) -MT test_zustr2stp-test_zustr2stp.o -MD -MP -MF $(DEPDIR)/test_zustr2stp-test_zustr2stp.Tpo -c -o test_zustr2stp-test_zustr2stp.o `test -f 'test_zustr2stp.c' || echo '$(srcdir)/'`test_zustr2stp.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_zustr2stp-test_zustr2stp.Tpo $(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_zustr2stp.c' object='test_zustr2stp-test_zustr2stp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_zustr2stp_CFLAGS) $(CFLAGS) -c -o test_zustr2stp-test_zustr2stp.o `test -f 'test_zustr2stp.c' || echo '$(srcdir)/'`test_zustr2stp.c
-
-test_zustr2stp-test_zustr2stp.obj: test_zustr2stp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_zustr2stp_CFLAGS) $(CFLAGS) -MT test_zustr2stp-test_zustr2stp.obj -MD -MP -MF $(DEPDIR)/test_zustr2stp-test_zustr2stp.Tpo -c -o test_zustr2stp-test_zustr2stp.obj `if test -f 'test_zustr2stp.c'; then $(CYGPATH_W) 'test_zustr2stp.c'; else $(CYGPATH_W) '$(srcdir)/test_zustr2stp.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_zustr2stp-test_zustr2stp.Tpo $(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_zustr2stp.c' object='test_zustr2stp-test_zustr2stp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_zustr2stp_CFLAGS) $(CFLAGS) -c -o test_zustr2stp-test_zustr2stp.obj `if test -f 'test_zustr2stp.c'; then $(CYGPATH_W) 'test_zustr2stp.c'; else $(CYGPATH_W) '$(srcdir)/test_zustr2stp.c'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	elif test -n "$$redo_logs"; then \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-
-check-TESTS: $(check_PROGRAMS)
-	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
-	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
-	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
-	exit $$?;
-recheck: all $(check_PROGRAMS)
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-test_adds.log: test_adds$(EXEEXT)
-	@p='test_adds$(EXEEXT)'; \
-	b='test_adds'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_atoi_strtoi.log: test_atoi_strtoi$(EXEEXT)
-	@p='test_atoi_strtoi$(EXEEXT)'; \
-	b='test_atoi_strtoi'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_chkname.log: test_chkname$(EXEEXT)
-	@p='test_chkname$(EXEEXT)'; \
-	b='test_chkname'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_sprintf.log: test_sprintf$(EXEEXT)
-	@p='test_sprintf$(EXEEXT)'; \
-	b='test_sprintf'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_strncpy.log: test_strncpy$(EXEEXT)
-	@p='test_strncpy$(EXEEXT)'; \
-	b='test_strncpy'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_strtcpy.log: test_strtcpy$(EXEEXT)
-	@p='test_strtcpy$(EXEEXT)'; \
-	b='test_strtcpy'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_xasprintf.log: test_xasprintf$(EXEEXT)
-	@p='test_xasprintf$(EXEEXT)'; \
-	b='test_xasprintf'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_zustr2stp.log: test_zustr2stp$(EXEEXT)
-	@p='test_zustr2stp$(EXEEXT)'; \
-	b='test_zustr2stp'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_logind.log: test_logind$(EXEEXT)
-	@p='test_logind$(EXEEXT)'; \
-	b='test_logind'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-.test.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.test$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
-
-distdir-am: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f ../../lib/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ../../lib/$(am__dirstamp)
-	-rm -f ../../lib/atoi/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ../../lib/atoi/$(am__dirstamp)
-	-rm -f ../../lib/string/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ../../lib/string/$(am__dirstamp)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-		-rm -f ../../lib/$(DEPDIR)/test_adds-adds.Po
-	-rm -f ../../lib/$(DEPDIR)/test_chkname-chkname.Po
-	-rm -f ../../lib/$(DEPDIR)/test_logind-logind.Po
-	-rm -f ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po
-	-rm -f ./$(DEPDIR)/test_adds-test_adds.Po
-	-rm -f ./$(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po
-	-rm -f ./$(DEPDIR)/test_chkname-test_chkname.Po
-	-rm -f ./$(DEPDIR)/test_logind-test_logind.Po
-	-rm -f ./$(DEPDIR)/test_sprintf-test_sprintf.Po
-	-rm -f ./$(DEPDIR)/test_strncpy-test_strncpy.Po
-	-rm -f ./$(DEPDIR)/test_strtcpy-test_strtcpy.Po
-	-rm -f ./$(DEPDIR)/test_xasprintf-test_xasprintf.Po
-	-rm -f ./$(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-		-rm -f ../../lib/$(DEPDIR)/test_adds-adds.Po
-	-rm -f ../../lib/$(DEPDIR)/test_chkname-chkname.Po
-	-rm -f ../../lib/$(DEPDIR)/test_logind-logind.Po
-	-rm -f ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po
-	-rm -f ./$(DEPDIR)/test_adds-test_adds.Po
-	-rm -f ./$(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po
-	-rm -f ./$(DEPDIR)/test_chkname-test_chkname.Po
-	-rm -f ./$(DEPDIR)/test_logind-test_logind.Po
-	-rm -f ./$(DEPDIR)/test_sprintf-test_sprintf.Po
-	-rm -f ./$(DEPDIR)/test_strncpy-test_strncpy.Po
-	-rm -f ./$(DEPDIR)/test_strtcpy-test_strtcpy.Po
-	-rm -f ./$(DEPDIR)/test_xasprintf-test_xasprintf.Po
-	-rm -f ./$(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: check-am install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
-	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	recheck tags tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/tests/tests/unit/test_adds.c b/tests/tests/unit/test_adds.c
deleted file mode 100644
index fdc671f5..00000000
--- a/tests/tests/unit/test_adds.c
+++ /dev/null
@@ -1,105 +0,0 @@
-// SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <limits.h>
-
-#include <stdarg.h>  // Required by <cmocka.h>
-#include <stddef.h>  // Required by <cmocka.h>
-#include <setjmp.h>  // Required by <cmocka.h>
-#include <stdint.h>  // Required by <cmocka.h>
-#include <cmocka.h>
-
-#include "adds.h"
-
-
-static void test_addsl_2_ok(void **state);
-static void test_addsl_2_underflow(void **state);
-static void test_addsl_2_overflow(void **state);
-static void test_addsl_3_ok(void **state);
-static void test_addsl_3_underflow(void **state);
-static void test_addsl_3_overflow(void **state);
-static void test_addsl_5_ok(void **state);
-
-
-int
-main(void)
-{
-    const struct CMUnitTest  tests[] = {
-        cmocka_unit_test(test_addsl_2_ok),
-        cmocka_unit_test(test_addsl_2_underflow),
-        cmocka_unit_test(test_addsl_2_overflow),
-        cmocka_unit_test(test_addsl_3_ok),
-        cmocka_unit_test(test_addsl_3_underflow),
-        cmocka_unit_test(test_addsl_3_overflow),
-        cmocka_unit_test(test_addsl_5_ok),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
-
-
-static void
-test_addsl_2_ok(void **state)
-{
-	assert_true(addsl(1, 3)			== 1 + 3);
-	assert_true(addsl(-4321, 7)		== -4321 + 7);
-	assert_true(addsl(1, 1)			== 1 + 1);
-	assert_true(addsl(-1, -2)		== -1 - 2);
-	assert_true(addsl(LONG_MAX, -1)		== LONG_MAX - 1);
-	assert_true(addsl(LONG_MIN, 1)		== LONG_MIN + 1);
-	assert_true(addsl(LONG_MIN, LONG_MAX)	== LONG_MIN + LONG_MAX);
-	assert_true(addsl(0, 0)			== 0);
-}
-
-
-static void
-test_addsl_2_underflow(void **state)
-{
-	assert_true(addsl(LONG_MIN, -1)		== LONG_MIN);
-	assert_true(addsl(LONG_MIN + 3, -7)	== LONG_MIN);
-	assert_true(addsl(LONG_MIN, LONG_MIN)	== LONG_MIN);
-}
-
-
-static void
-test_addsl_2_overflow(void **state)
-{
-	assert_true(addsl(LONG_MAX, 1)		== LONG_MAX);
-	assert_true(addsl(LONG_MAX - 3, 7)	== LONG_MAX);
-	assert_true(addsl(LONG_MAX, LONG_MAX)	== LONG_MAX);
-}
-
-
-static void
-test_addsl_3_ok(void **state)
-{
-	assert_true(addsl(1, 2, 3)		== 1 + 2 + 3);
-	assert_true(addsl(LONG_MIN, -3, 4)	== LONG_MIN + 4 - 3);
-	assert_true(addsl(LONG_MAX, LONG_MAX, LONG_MIN)
-						== LONG_MAX + LONG_MIN + LONG_MAX);
-}
-
-
-static void
-test_addsl_3_underflow(void **state)
-{
-	assert_true(addsl(LONG_MIN, 2, -3)	== LONG_MIN);
-	assert_true(addsl(LONG_MIN, -1, 0)	== LONG_MIN);
-}
-
-
-static void
-test_addsl_3_overflow(void **state)
-{
-	assert_true(addsl(LONG_MAX, -1, 2)	== LONG_MAX);
-	assert_true(addsl(LONG_MAX, +1, 0)	== LONG_MAX);
-	assert_true(addsl(LONG_MAX, LONG_MAX, 0)== LONG_MAX);
-}
-
-
-static void
-test_addsl_5_ok(void **state)
-{
-	assert_true(addsl(LONG_MAX, LONG_MAX, LONG_MIN, LONG_MIN, 44) == 42);
-}
diff --git a/tests/tests/unit/test_atoi_strtoi.c b/tests/tests/unit/test_atoi_strtoi.c
deleted file mode 100644
index 535b6ab7..00000000
--- a/tests/tests/unit/test_atoi_strtoi.c
+++ /dev/null
@@ -1,157 +0,0 @@
-// SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <errno.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
-#include <stdarg.h>  // Required by <cmocka.h>
-#include <stddef.h>  // Required by <cmocka.h>
-#include <setjmp.h>  // Required by <cmocka.h>
-#include <stdint.h>  // Required by <cmocka.h>
-#include <cmocka.h>
-
-#include "atoi/strtoi.h"
-#include "atoi/strtou_noneg.h"
-
-
-static void test_strtoi(void **state);
-static void test_strtou(void **state);
-static void test_strtou_noneg(void **state);
-
-
-int
-main(void)
-{
-    const struct CMUnitTest  tests[] = {
-        cmocka_unit_test(test_strtoi),
-        cmocka_unit_test(test_strtou),
-        cmocka_unit_test(test_strtou_noneg),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
-
-
-static void
-test_strtoi(void **state)
-{
-	int   status;
-	char  *end;
-
-	errno = 0;
-	assert_true(strtoi_("42", NULL, -1, 1, 2, &status) == 1);
-	assert_true(status == EINVAL);
-
-	assert_true(strtoi_("40", &end, 5, INTMAX_MIN, INTMAX_MAX, &status) == 20);
-	assert_true(status == 0);
-	assert_true(strcmp(end, "") == 0);
-
-	assert_true(strtoi_("-40", &end, 0, INTMAX_MIN, INTMAX_MAX, &status) == -40);
-	assert_true(status == 0);
-	assert_true(strcmp(end, "") == 0);
-
-	assert_true(strtoi_("z", &end, 0, INTMAX_MIN, INTMAX_MAX, &status) == 0);
-	assert_true(status == ECANCELED);
-	assert_true(strcmp(end, "z") == 0);
-
-	assert_true(strtoi_(" 5", &end, 0, 3, 4, &status) == 4);
-	assert_true(status == ERANGE);
-	assert_true(strcmp(end, "") == 0);
-
-	assert_true(strtoi_("5z", &end, 0, INTMAX_MIN, INTMAX_MAX, &status) == 5);
-	assert_true(status == ENOTSUP);
-	assert_true(strcmp(end, "z") == 0);
-
-	assert_true(strtoi_("5z", &end, 0, INTMAX_MIN, 4, &status) == 4);
-	assert_true(status == ERANGE);
-	assert_true(strcmp(end, "z") == 0);
-
-	assert_true(errno == 0);
-}
-
-
-static void
-test_strtou(void **state)
-{
-	int   status;
-	char  *end;
-
-	errno = 0;
-	assert_true(strtou_("42", NULL, -1, 1, 2, &status) == 1);
-	assert_true(status == EINVAL);
-
-	assert_true(strtou_("40", &end, 5, 0, UINTMAX_MAX, &status) == 20);
-	assert_true(status == 0);
-	assert_true(strcmp(end, "") == 0);
-
-	assert_true(strtou_("-40", &end, 0, 0, UINTMAX_MAX, &status) == -40ull);
-	assert_true(status == 0);
-	assert_true(strcmp(end, "") == 0);
-
-	assert_true(strtou_("z", &end, 0, 0, UINTMAX_MAX, &status) == 0);
-	assert_true(status == ECANCELED);
-	assert_true(strcmp(end, "z") == 0);
-
-	assert_true(strtou_(" 5", &end, 0, 3, 4, &status) == 4);
-	assert_true(status == ERANGE);
-	assert_true(strcmp(end, "") == 0);
-
-	assert_true(strtou_("5z", &end, 0, 0, UINTMAX_MAX, &status) == 5);
-	assert_true(status == ENOTSUP);
-	assert_true(strcmp(end, "z") == 0);
-
-	assert_true(strtou_("5z", &end, 0, 0, 4, &status) == 4);
-	assert_true(status == ERANGE);
-	assert_true(strcmp(end, "z") == 0);
-
-	assert_true(errno == 0);
-}
-
-
-static void
-test_strtou_noneg(void **state)
-{
-	int   status;
-	char  *end;
-
-	errno = 0;
-	assert_true(strtou_noneg("42", NULL, -1, 1, 2, &status)
-	            == 1);
-	assert_true(status == EINVAL);
-
-	assert_true(strtou_noneg("40", &end, 5, 0, UINTMAX_MAX, &status)
-	            == 20);
-	assert_true(status == 0);
-	assert_true(strcmp(end, "") == 0);
-
-	assert_true(strtou_noneg("-40", &end, 0, 2, UINTMAX_MAX, &status)
-	            == 2);
-	assert_true(status == ERANGE);
-	assert_true(strcmp(end, "") == 0);
-
-	assert_true(strtou_noneg("z", &end, 0, 0, UINTMAX_MAX, &status)
-	            == 0);
-	assert_true(status == ECANCELED);
-	assert_true(strcmp(end, "z") == 0);
-
-	assert_true(strtou_noneg(" 5", &end, 0, 3, 4, &status)
-	            == 4);
-	assert_true(status == ERANGE);
-	assert_true(strcmp(end, "") == 0);
-
-	assert_true(strtou_noneg("5z", &end, 0, 0, UINTMAX_MAX, &status)
-	            == 5);
-	assert_true(status == ENOTSUP);
-	assert_true(strcmp(end, "z") == 0);
-
-	assert_true(strtou_noneg("5z", &end, 0, 0, 4, &status)
-	            == 4);
-	assert_true(status == ERANGE);
-	assert_true(strcmp(end, "z") == 0);
-
-	assert_true(errno == 0);
-}
diff --git a/tests/tests/unit/test_chkname.c b/tests/tests/unit/test_chkname.c
deleted file mode 100644
index e0f9f84b..00000000
--- a/tests/tests/unit/test_chkname.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <stdarg.h>  // Required by <cmocka.h>
-#include <stddef.h>  // Required by <cmocka.h>
-#include <setjmp.h>  // Required by <cmocka.h>
-#include <stdint.h>  // Required by <cmocka.h>
-#include <cmocka.h>
-
-#include "alloc.h"
-#include "chkname.h"
-
-
-static void test_is_valid_user_name_ok(void **state);
-static void test_is_valid_user_name_ok_dollar(void **state);
-static void test_is_valid_user_name_nok_dash(void **state);
-static void test_is_valid_user_name_nok_dir(void **state);
-static void test_is_valid_user_name_nok_dollar(void **state);
-static void test_is_valid_user_name_nok_empty(void **state);
-static void test_is_valid_user_name_nok_numeric(void **state);
-static void test_is_valid_user_name_nok_otherchars(void **state);
-static void test_is_valid_user_name_long(void **state);
-
-
-int
-main(void)
-{
-    const struct CMUnitTest  tests[] = {
-        cmocka_unit_test(test_is_valid_user_name_ok),
-        cmocka_unit_test(test_is_valid_user_name_ok_dollar),
-        cmocka_unit_test(test_is_valid_user_name_nok_dash),
-        cmocka_unit_test(test_is_valid_user_name_nok_dir),
-        cmocka_unit_test(test_is_valid_user_name_nok_dollar),
-        cmocka_unit_test(test_is_valid_user_name_nok_empty),
-        cmocka_unit_test(test_is_valid_user_name_nok_numeric),
-        cmocka_unit_test(test_is_valid_user_name_nok_otherchars),
-        cmocka_unit_test(test_is_valid_user_name_long),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
-
-
-static void
-test_is_valid_user_name_ok(void **state)
-{
-	assert_true(is_valid_user_name("alx"));
-	assert_true(is_valid_user_name("u-ser"));
-	assert_true(is_valid_user_name("u"));
-	assert_true(is_valid_user_name("I"));
-	assert_true(is_valid_user_name("_"));
-	assert_true(is_valid_user_name("_.-"));
-	assert_true(is_valid_user_name(".007"));
-	assert_true(is_valid_user_name("0_0"));
-	assert_true(is_valid_user_name("some_longish_user_name_sHould_also_be_valid.wHY_not"));
-}
-
-
-static void
-test_is_valid_user_name_ok_dollar(void **state)
-{
-	// Non-POSIX extension for Samba 3.x "add machine script".
-	assert_true(is_valid_user_name("dollar$"));
-	assert_true(is_valid_user_name("SSS$"));
-}
-
-
-static void
-test_is_valid_user_name_nok_dash(void **state)
-{
-	assert_true(false == is_valid_user_name("-"));
-	assert_true(false == is_valid_user_name("-not-valid"));
-	assert_true(false == is_valid_user_name("--C"));
-}
-
-
-static void
-test_is_valid_user_name_nok_dir(void **state)
-{
-	assert_true(false == is_valid_user_name("."));
-	assert_true(false == is_valid_user_name(".."));
-}
-
-
-static void
-test_is_valid_user_name_nok_dollar(void **state)
-{
-	assert_true(false == is_valid_user_name("$"));
-	assert_true(false == is_valid_user_name("$dollar"));
-	assert_true(false == is_valid_user_name("mo$ney"));
-	assert_true(false == is_valid_user_name("do$$ar"));
-	assert_true(false == is_valid_user_name("foo$bar$"));
-}
-
-
-static void
-test_is_valid_user_name_nok_empty(void **state)
-{
-	assert_true(false == is_valid_user_name(""));
-}
-
-
-static void
-test_is_valid_user_name_nok_numeric(void **state)
-{
-	assert_true(false == is_valid_user_name("6"));
-	assert_true(false == is_valid_user_name("42"));
-}
-
-
-static void
-test_is_valid_user_name_nok_otherchars(void **state)
-{
-	assert_true(false == is_valid_user_name("no spaces"));
-	assert_true(false == is_valid_user_name("no,"));
-	assert_true(false == is_valid_user_name("no;"));
-	assert_true(false == is_valid_user_name("no:"));
-}
-
-
-static void
-test_is_valid_user_name_long(void **state)
-{
-	size_t  max;
-	char    *name;
-
-	max = sysconf(_SC_LOGIN_NAME_MAX);
-	name = MALLOC(max + 1, char);
-	assert_true(name != NULL);
-
-	memset(name, '_', max);
-
-	name[max] = '\0';
-	assert_true(false == is_valid_user_name(name));
-
-	name[max - 1] = '\0';
-	assert_true(is_valid_user_name(name));
-
-	free(name);
-}
diff --git a/tests/tests/unit/test_logind.c b/tests/tests/unit/test_logind.c
deleted file mode 100644
index f91782ce..00000000
--- a/tests/tests/unit/test_logind.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * SPDX-FileCopyrightText:  2023, Iker Pedrosa <ipedrosa@redhat.com>
- *
- * SPDX-License-Identifier:  BSD-3-Clause
- */
-
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-
-#include <pwd.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-#include "prototypes.h"
-
-/***********************
- * WRAPPERS
- **********************/
-struct passwd *
-__wrap_prefix_getpwnam(uid_t uid)
-{
-    return (struct passwd*) mock();
-}
-
-int
-__wrap_sd_uid_get_sessions(uid_t uid, int require_active, char ***sessions)
-{
-    return mock();
-}
-
-/***********************
- * TEST
- **********************/
-static void test_active_sessions_count_return_ok(void **state)
-{
-    int count;
-    struct passwd *pw = malloc(sizeof(struct passwd));
-
-    will_return(__wrap_prefix_getpwnam, pw);
-    will_return(__wrap_sd_uid_get_sessions, 1);
-
-    count = active_sessions_count("testuser", 0);
-
-    assert_int_equal(count, 1);
-}
-
-static void test_active_sessions_count_prefix_getpwnam_failure(void **state)
-{
-    int count;
-    struct passwd *pw = NULL;
-
-    will_return(__wrap_prefix_getpwnam, pw);
-
-    count = active_sessions_count("testuser", 0);
-
-    assert_int_equal(count, 0);
-}
-
-int main(void)
-{
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(test_active_sessions_count_return_ok),
-        cmocka_unit_test(test_active_sessions_count_prefix_getpwnam_failure),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
diff --git a/tests/tests/unit/test_sprintf.c b/tests/tests/unit/test_sprintf.c
deleted file mode 100644
index bedcff6f..00000000
--- a/tests/tests/unit/test_sprintf.c
+++ /dev/null
@@ -1,66 +0,0 @@
-// SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include <stdarg.h>  // Required by <cmocka.h>
-#include <stddef.h>  // Required by <cmocka.h>
-#include <setjmp.h>  // Required by <cmocka.h>
-#include <stdint.h>  // Required by <cmocka.h>
-#include <cmocka.h>
-
-#include "sizeof.h"
-#include "string/sprintf.h"
-
-
-static void test_SNPRINTF_trunc(void **state);
-static void test_SNPRINTF_ok(void **state);
-
-
-int
-main(void)
-{
-    const struct CMUnitTest  tests[] = {
-        cmocka_unit_test(test_SNPRINTF_trunc),
-        cmocka_unit_test(test_SNPRINTF_ok),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
-
-
-static void
-test_SNPRINTF_trunc(void **state)
-{
-	char  buf[NITEMS("foo")];
-
-	// Test that we're not returning SIZE_MAX
-	assert_true(SNPRINTF(buf, "f%su", "oo") < 0);
-	assert_true(strcmp(buf, "foo") == 0);
-
-	assert_true(SNPRINTF(buf, "barbaz") == -1);
-	assert_true(strcmp(buf, "bar") == 0);
-}
-
-
-static void
-test_SNPRINTF_ok(void **state)
-{
-	char  buf[NITEMS("foo")];
-
-	assert_true(SNPRINTF(buf, "%s", "foo") == strlen("foo"));
-	assert_true(strcmp(buf, "foo") == 0);
-
-	assert_true(SNPRINTF(buf, "%do", 1) == strlen("1o"));
-	assert_true(strcmp(buf, "1o") == 0);
-
-	assert_true(SNPRINTF(buf, "f") == strlen("f"));
-	assert_true(strcmp(buf, "f") == 0);
-
-	assert_true(SNPRINTF(buf, "") == strlen(""));
-	assert_true(strcmp(buf, "") == 0);
-}
diff --git a/tests/tests/unit/test_strncpy.c b/tests/tests/unit/test_strncpy.c
deleted file mode 100644
index 968765bb..00000000
--- a/tests/tests/unit/test_strncpy.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-
-#include <config.h>
-
-#include <string.h>
-
-#include <stdarg.h>  // Required by <cmocka.h>
-#include <stddef.h>  // Required by <cmocka.h>
-#include <setjmp.h>  // Required by <cmocka.h>
-#include <stdint.h>  // Required by <cmocka.h>
-#include <cmocka.h>
-
-#include "sizeof.h"
-#include "string/strncpy.h"
-
-
-static void test_STRNCPY_trunc(void **state);
-static void test_STRNCPY_fit(void **state);
-static void test_STRNCPY_pad(void **state);
-
-
-int
-main(void)
-{
-    const struct CMUnitTest  tests[] = {
-        cmocka_unit_test(test_STRNCPY_trunc),
-        cmocka_unit_test(test_STRNCPY_fit),
-        cmocka_unit_test(test_STRNCPY_pad),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
-
-
-static void
-test_STRNCPY_trunc(void **state)
-{
-	char  buf[3];
-
-	char  src1[4] = {'f', 'o', 'o', 'o'};
-	char  res1[3] = {'f', 'o', 'o'};
-	assert_true(memcmp(res1, STRNCPY(buf, src1), sizeof(buf)) == 0);
-
-	char  src2[5] = "barb";
-	char  res2[3] = {'b', 'a', 'r'};
-	assert_true(memcmp(res2, STRNCPY(buf, src2), sizeof(buf)) == 0);
-}
-
-
-static void
-test_STRNCPY_fit(void **state)
-{
-	char  buf[3];
-
-	char  src1[3] = {'b', 'a', 'z'};
-	char  res1[3] = {'b', 'a', 'z'};
-	assert_true(memcmp(res1, STRNCPY(buf, src1), sizeof(buf)) == 0);
-
-	char  src2[4] = "qwe";
-	char  res2[3] = {'q', 'w', 'e'};
-	assert_true(memcmp(res2, STRNCPY(buf, src2), sizeof(buf)) == 0);
-}
-
-
-static void
-test_STRNCPY_pad(void **state)
-{
-	char  buf[3];
-
-	char  src1[3] = "as";
-	char  res1[3] = {'a', 's', 0};
-	assert_true(memcmp(res1, STRNCPY(buf, src1), sizeof(buf)) == 0);
-
-	char  src2[3] = "";
-	char  res2[3] = {0, 0, 0};
-	assert_true(memcmp(res2, STRNCPY(buf, src2), sizeof(buf)) == 0);
-
-	char  src3[3] = {'a', 0, 'b'};
-	char  res3[3] = {'a', 0, 0};
-	assert_true(memcmp(res3, STRNCPY(buf, src3), sizeof(buf)) == 0);
-}
diff --git a/tests/tests/unit/test_strtcpy.c b/tests/tests/unit/test_strtcpy.c
deleted file mode 100644
index 12351a53..00000000
--- a/tests/tests/unit/test_strtcpy.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-
-#include <config.h>
-
-#include <string.h>
-
-#include <stdarg.h>  // Required by <cmocka.h>
-#include <stddef.h>  // Required by <cmocka.h>
-#include <setjmp.h>  // Required by <cmocka.h>
-#include <stdint.h>  // Required by <cmocka.h>
-#include <cmocka.h>
-
-#include "sizeof.h"
-#include "string/strtcpy.h"
-
-
-static void test_STRTCPY_trunc(void **state);
-static void test_STRTCPY_ok(void **state);
-
-
-int
-main(void)
-{
-    const struct CMUnitTest  tests[] = {
-        cmocka_unit_test(test_STRTCPY_trunc),
-        cmocka_unit_test(test_STRTCPY_ok),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
-
-
-static void
-test_STRTCPY_trunc(void **state)
-{
-	char  buf[NITEMS("foo")];
-
-	// Test that we're not returning SIZE_MAX
-	assert_true(STRTCPY(buf, "fooo") < 0);
-	assert_string_equal(buf, "foo");
-
-	assert_int_equal(STRTCPY(buf, "barbaz"), -1);
-	assert_string_equal(buf, "bar");
-}
-
-
-static void
-test_STRTCPY_ok(void **state)
-{
-	char  buf[NITEMS("foo")];
-
-	assert_int_equal(STRTCPY(buf, "foo"), strlen("foo"));
-	assert_string_equal(buf, "foo");
-
-	assert_int_equal(STRTCPY(buf, "fo"), strlen("fo"));
-	assert_string_equal(buf, "fo");
-
-	assert_int_equal(STRTCPY(buf, "f"), strlen("f"));
-	assert_string_equal(buf, "f");
-
-	assert_int_equal(STRTCPY(buf, ""), strlen(""));
-	assert_string_equal(buf, "");
-}
diff --git a/tests/tests/unit/test_xasprintf.c b/tests/tests/unit/test_xasprintf.c
deleted file mode 100644
index 4b5d0935..00000000
--- a/tests/tests/unit/test_xasprintf.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023, Alejandro Colomar <alx@kernel.org>
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-
-#include <setjmp.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <stdarg.h>  // Required by <cmocka.h>
-#include <stddef.h>  // Required by <cmocka.h>
-#include <setjmp.h>  // Required by <cmocka.h>
-#include <stdint.h>  // Required by <cmocka.h>
-#include <cmocka.h>
-
-#include "string/sprintf.h"
-
-
-#define assert_unreachable()  assert_true(0)
-
-#define XASPRINTF_CALLED  (-36)
-#define EXIT_CALLED       (42)
-#define TEST_OK           (-6)
-
-
-static jmp_buf  jmpb;
-
-
-/**********************
- * WRAPPERS
- **********************/
-int __real_vasprintf(char **restrict p, const char *restrict fmt, va_list ap);
-int __wrap_vasprintf(char **restrict p, const char *restrict fmt, va_list ap);
-void __wrap_exit(int status);
-
-
-int
-__wrap_vasprintf(char **restrict p, const char *restrict fmt, va_list ap)
-{
-	return mock() == -1 ? -1 : __real_vasprintf(p, fmt, ap);
-}
-
-
-void
-__wrap_exit(int status)
-{
-	longjmp(jmpb, EXIT_CALLED);
-}
-
-
-/**********************
- * TEST
- **********************/
-static void test_xasprintf_exit(void **state);
-static void test_xasprintf_ok(void **state);
-
-
-static void
-test_xasprintf_exit(void **state)
-{
-	volatile int    len;
-	char *volatile  p;
-
-	will_return(__wrap_vasprintf, -1);
-
-	len = 0;
-
-	switch (setjmp(jmpb)) {
-	case 0:
-		len = XASPRINTF_CALLED;
-		len = xasprintf(&p, "foo%s", "bar");
-		assert_unreachable();
-		break;
-	case EXIT_CALLED:
-		assert_int_equal(len, XASPRINTF_CALLED);
-		len = TEST_OK;
-		break;
-	default:
-		assert_unreachable();
-		break;
-	}
-
-	assert_int_equal(len, TEST_OK);
-}
-
-
-static void
-test_xasprintf_ok(void **state)
-{
-	int   len;
-	char  *p;
-
-	// Trick: it will actually return the length, not 0.
-	will_return(__wrap_vasprintf, 0);
-
-	len = xasprintf(&p, "foo%d%s", 1, "bar");
-	assert_int_equal(len, strlen("foo1bar"));
-	assert_string_equal(p, "foo1bar");
-	free(p);
-}
-
-
-int
-main(void)
-{
-    const struct CMUnitTest  tests[] = {
-        cmocka_unit_test(test_xasprintf_exit),
-        cmocka_unit_test(test_xasprintf_ok),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
diff --git a/tests/tests/unit/test_zustr2stp.c b/tests/tests/unit/test_zustr2stp.c
deleted file mode 100644
index 198d2eb6..00000000
--- a/tests/tests/unit/test_zustr2stp.c
+++ /dev/null
@@ -1,53 +0,0 @@
-// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#include <stddef.h>
-#include <string.h>
-
-#include <stdarg.h>  // Required by <cmocka.h>
-#include <stddef.h>  // Required by <cmocka.h>
-#include <setjmp.h>  // Required by <cmocka.h>
-#include <stdint.h>  // Required by <cmocka.h>
-#include <cmocka.h>
-
-#include "string/zustr2stp.h"
-
-
-static void test_ZUSTR2STP(void **state);
-
-
-int
-main(void)
-{
-    const struct CMUnitTest  tests[] = {
-        cmocka_unit_test(test_ZUSTR2STP),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
-
-
-static void
-test_ZUSTR2STP(void **state)
-{
-	char  src[3] = {'1', '2', '3'};
-	char  dst[4];
-
-	assert_true(ZUSTR2STP(&dst, src) == dst + strlen("123"));
-	assert_true(strcmp("123", dst) == 0);
-
-	src[2] = '\0';
-	assert_true(ZUSTR2STP(&dst, src) == dst + strlen("12"));
-	assert_true(strcmp("12", dst) == 0);
-
-	src[1] = '\0';
-	assert_true(ZUSTR2STP(&dst, src) == dst + strlen("1"));
-	assert_true(strcmp("1", dst) == 0);
-
-	src[0] = '\0';
-	assert_true(ZUSTR2STP(&dst, src) == dst + strlen(""));
-	assert_true(strcmp("", dst) == 0);
-}
diff --git a/tests/tests/usertools/03/config/etc/group b/tests/tests/usertools/03/config/etc/group
deleted file mode 100644
index 245cc9cf..00000000
--- a/tests/tests/usertools/03/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-myuser:x:424242:
diff --git a/tests/tests/usertools/03/config/etc/gshadow b/tests/tests/usertools/03/config/etc/gshadow
deleted file mode 100644
index 25bd55bd..00000000
--- a/tests/tests/usertools/03/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-myuser:x::
diff --git a/tests/tests/usertools/58_userdel_locked_shadow/config.txt b/tests/tests/usertools/58_userdel_locked_shadow/config.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/usertools/59_userdel_locked_gshadow/config.txt b/tests/tests/usertools/59_userdel_locked_gshadow/config.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/usertools/60_userdel_invalid_user/config.txt b/tests/tests/usertools/60_userdel_invalid_user/config.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config.txt b/tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config.txt b/tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config.txt b/tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config.txt b/tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/usertools/useradd/62_useradd-p/data/group b/tests/tests/usertools/useradd/62_useradd-p/data/group
deleted file mode 100644
index fecba0c4..00000000
--- a/tests/tests/usertools/useradd/62_useradd-p/data/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/tests/usertools/useradd/63_useradd-s/data/group b/tests/tests/usertools/useradd/63_useradd-s/data/group
deleted file mode 100644
index fecba0c4..00000000
--- a/tests/tests/usertools/useradd/63_useradd-s/data/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/tests/usertools/useradd/64_useradd_locked_passwd/config.txt b/tests/tests/usertools/useradd/64_useradd_locked_passwd/config.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/usertools/useradd/65_useradd_locked_group/config.txt b/tests/tests/usertools/useradd/65_useradd_locked_group/config.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/usertools/useradd/66_useradd_locked_shadow/config.txt b/tests/tests/usertools/useradd/66_useradd_locked_shadow/config.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/usertools/useradd/67_useradd_locked_gshadow/config.txt b/tests/tests/usertools/useradd/67_useradd_locked_gshadow/config.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/data/group b/tests/tests/usertools/useradd/68_useradd-s_empty/data/group
deleted file mode 100644
index fecba0c4..00000000
--- a/tests/tests/usertools/useradd/68_useradd-s_empty/data/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/passwd b/tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/passwd
deleted file mode 100644
index 06b331b3..00000000
--- a/tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/passwd
+++ /dev/null
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:blahblahblah:1000:1000::/home/foo:/bin/false
diff --git a/tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/passwd b/tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/passwd
deleted file mode 100644
index 06b331b3..00000000
--- a/tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/passwd
+++ /dev/null
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:blahblahblah:1000:1000::/home/foo:/bin/false
diff --git a/tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/passwd b/tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/passwd
deleted file mode 100644
index 06b331b3..00000000
--- a/tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/passwd
+++ /dev/null
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:blahblahblah:1000:1000::/home/foo:/bin/false
diff --git a/tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/passwd b/tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/passwd
deleted file mode 100644
index 43fc135a..00000000
--- a/tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/passwd
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/passwd b/tests/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/passwd
deleted file mode 100644
index dbb06b81..00000000
--- a/tests/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/passwd
+++ /dev/null
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/nonexistent:/bin/sh
diff --git a/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/group b/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/group
deleted file mode 100644
index 10123908..00000000
--- a/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/group
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/gshadow b/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/gshadow
deleted file mode 100644
index ae424865..00000000
--- a/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/gshadow
+++ /dev/null
@@ -1,41 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
diff --git a/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/passwd b/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/passwd
deleted file mode 100644
index dbb06b81..00000000
--- a/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/passwd
+++ /dev/null
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/nonexistent:/bin/sh
diff --git a/tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/shadow b/tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/shadow
deleted file mode 100644
index 5f50d187..00000000
--- a/tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/shadow
+++ /dev/null
@@ -1,19 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
diff --git a/tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/gshadow b/tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/gshadow
deleted file mode 100644
index 5042e581..00000000
--- a/tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/group b/tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/gshadow b/tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/group b/tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/gshadow b/tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/group b/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/gshadow b/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/shadow b/tests/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/shadow
deleted file mode 100644
index 2baad3b4..00000000
--- a/tests/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/shadow
+++ /dev/null
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
diff --git a/tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/shadow b/tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/shadow
deleted file mode 100644
index 2baad3b4..00000000
--- a/tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/shadow
+++ /dev/null
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
diff --git a/tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/shadow b/tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/shadow
deleted file mode 100644
index 2baad3b4..00000000
--- a/tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/shadow
+++ /dev/null
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
diff --git a/tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/gshadow b/tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/gshadow
deleted file mode 100644
index 5042e581..00000000
--- a/tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/shadow b/tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/shadow
deleted file mode 100644
index 2baad3b4..00000000
--- a/tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/shadow
+++ /dev/null
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
diff --git a/tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/shadow b/tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/shadow
deleted file mode 100644
index 2baad3b4..00000000
--- a/tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/shadow
+++ /dev/null
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
diff --git a/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/gshadow b/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/gshadow
deleted file mode 100644
index 5042e581..00000000
--- a/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/shadow b/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/shadow
deleted file mode 100644
index 2baad3b4..00000000
--- a/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/shadow
+++ /dev/null
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index d89367a3..6a83973d 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -7,11 +7,11 @@ check_PROGRAMS = \
     test_adds \
     test_atoi_strtoi \
     test_chkname \
-    test_sprintf \
+    test_snprintf \
     test_strncpy \
     test_strtcpy \
-    test_xasprintf \
-    test_zustr2stp
+    test_typetraits \
+    test_xasprintf
 
 if ENABLE_LOGIND
 check_PROGRAMS += \
@@ -35,7 +35,8 @@ test_adds_LDADD = \
     $(NULL)
 
 test_atoi_strtoi_SOURCES = \
-    ../../lib/atoi/strtoi.c \
+    ../../lib/atoi/strtoi/strtoi.c \
+    ../../lib/atoi/strtoi/strtou_noneg.c \
     test_atoi_strtoi.c \
     $(NULL)
 test_atoi_strtoi_CFLAGS = \
@@ -77,16 +78,16 @@ test_logind_LDADD = \
     $(LIBSYSTEMD) \
     $(NULL)
 
-test_sprintf_SOURCES = \
-    ../../lib/string/sprintf.c \
-    test_sprintf.c \
+test_snprintf_SOURCES = \
+    ../../lib/string/sprintf/snprintf.c \
+    test_snprintf.c \
     $(NULL)
-test_sprintf_CFLAGS = \
+test_snprintf_CFLAGS = \
     $(AM_CFLAGS) \
     $(NULL)
-test_sprintf_LDFLAGS = \
+test_snprintf_LDFLAGS = \
     $(NULL)
-test_sprintf_LDADD = \
+test_snprintf_LDADD = \
     $(CMOCKA_LIBS) \
     $(NULL)
 
@@ -103,7 +104,7 @@ test_strncpy_LDADD = \
     $(NULL)
 
 test_strtcpy_SOURCES = \
-    ../../lib/string/strtcpy.c \
+    ../../lib/string/strcpy/strtcpy.c \
     test_strtcpy.c \
     $(NULL)
 test_strtcpy_CFLAGS = \
@@ -115,8 +116,20 @@ test_strtcpy_LDADD = \
     $(CMOCKA_LIBS) \
     $(NULL)
 
+test_typetraits_SOURCES = \
+    test_typetraits.c \
+    $(NULL)
+test_typetraits_CFLAGS = \
+    $(AM_CFLAGS) \
+    $(NULL)
+test_typetraits_LDFLAGS = \
+    $(NULL)
+test_typetraits_LDADD = \
+    $(CMOCKA_LIBS) \
+    $(NULL)
+
 test_xasprintf_SOURCES = \
-    ../../lib/string/sprintf.c \
+    ../../lib/string/sprintf/xasprintf.c \
     test_xasprintf.c \
     $(NULL)
 test_xasprintf_CFLAGS = \
@@ -130,16 +143,4 @@ test_xasprintf_LDADD = \
     $(CMOCKA_LIBS) \
     $(NULL)
 
-test_zustr2stp_SOURCES = \
-    test_zustr2stp.c \
-    $(NULL)
-test_zustr2stp_CFLAGS = \
-    $(AM_CFLAGS) \
-    $(NULL)
-test_zustr2stp_LDFLAGS = \
-    $(NULL)
-test_zustr2stp_LDADD = \
-    $(CMOCKA_LIBS) \
-    $(NULL)
-
 endif # HAVE_CMOCKA
diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in
index b1087141..334d01a0 100644
--- a/tests/unit/Makefile.in
+++ b/tests/unit/Makefile.in
@@ -89,10 +89,10 @@ build_triplet = @build@
 host_triplet = @host@
 @HAVE_CMOCKA_TRUE@check_PROGRAMS = test_adds$(EXEEXT) \
 @HAVE_CMOCKA_TRUE@	test_atoi_strtoi$(EXEEXT) \
-@HAVE_CMOCKA_TRUE@	test_chkname$(EXEEXT) test_sprintf$(EXEEXT) \
+@HAVE_CMOCKA_TRUE@	test_chkname$(EXEEXT) test_snprintf$(EXEEXT) \
 @HAVE_CMOCKA_TRUE@	test_strncpy$(EXEEXT) test_strtcpy$(EXEEXT) \
-@HAVE_CMOCKA_TRUE@	test_xasprintf$(EXEEXT) \
-@HAVE_CMOCKA_TRUE@	test_zustr2stp$(EXEEXT) $(am__EXEEXT_1)
+@HAVE_CMOCKA_TRUE@	test_typetraits$(EXEEXT) \
+@HAVE_CMOCKA_TRUE@	test_xasprintf$(EXEEXT) $(am__EXEEXT_1)
 @ENABLE_LOGIND_TRUE@@HAVE_CMOCKA_TRUE@am__append_1 = \
 @ENABLE_LOGIND_TRUE@@HAVE_CMOCKA_TRUE@    test_logind
 
@@ -131,9 +131,10 @@ am__v_lt_1 =
 test_adds_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_adds_CFLAGS) \
 	$(CFLAGS) $(test_adds_LDFLAGS) $(LDFLAGS) -o $@
-am__test_atoi_strtoi_SOURCES_DIST = ../../lib/atoi/strtoi.c \
-	test_atoi_strtoi.c
-@HAVE_CMOCKA_TRUE@am_test_atoi_strtoi_OBJECTS = ../../lib/atoi/test_atoi_strtoi-strtoi.$(OBJEXT) \
+am__test_atoi_strtoi_SOURCES_DIST = ../../lib/atoi/strtoi/strtoi.c \
+	../../lib/atoi/strtoi/strtou_noneg.c test_atoi_strtoi.c
+@HAVE_CMOCKA_TRUE@am_test_atoi_strtoi_OBJECTS = ../../lib/atoi/strtoi/test_atoi_strtoi-strtoi.$(OBJEXT) \
+@HAVE_CMOCKA_TRUE@	../../lib/atoi/strtoi/test_atoi_strtoi-strtou_noneg.$(OBJEXT) \
 @HAVE_CMOCKA_TRUE@	test_atoi_strtoi-test_atoi_strtoi.$(OBJEXT)
 test_atoi_strtoi_OBJECTS = $(am_test_atoi_strtoi_OBJECTS)
 @HAVE_CMOCKA_TRUE@test_atoi_strtoi_DEPENDENCIES =  \
@@ -161,15 +162,15 @@ test_logind_OBJECTS = $(am_test_logind_OBJECTS)
 test_logind_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_logind_CFLAGS) \
 	$(CFLAGS) $(test_logind_LDFLAGS) $(LDFLAGS) -o $@
-am__test_sprintf_SOURCES_DIST = ../../lib/string/sprintf.c \
-	test_sprintf.c
-@HAVE_CMOCKA_TRUE@am_test_sprintf_OBJECTS = ../../lib/string/test_sprintf-sprintf.$(OBJEXT) \
-@HAVE_CMOCKA_TRUE@	test_sprintf-test_sprintf.$(OBJEXT)
-test_sprintf_OBJECTS = $(am_test_sprintf_OBJECTS)
-@HAVE_CMOCKA_TRUE@test_sprintf_DEPENDENCIES = $(am__DEPENDENCIES_1)
-test_sprintf_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_sprintf_CFLAGS) \
-	$(CFLAGS) $(test_sprintf_LDFLAGS) $(LDFLAGS) -o $@
+am__test_snprintf_SOURCES_DIST = ../../lib/string/sprintf/snprintf.c \
+	test_snprintf.c
+@HAVE_CMOCKA_TRUE@am_test_snprintf_OBJECTS = ../../lib/string/sprintf/test_snprintf-snprintf.$(OBJEXT) \
+@HAVE_CMOCKA_TRUE@	test_snprintf-test_snprintf.$(OBJEXT)
+test_snprintf_OBJECTS = $(am_test_snprintf_OBJECTS)
+@HAVE_CMOCKA_TRUE@test_snprintf_DEPENDENCIES = $(am__DEPENDENCIES_1)
+test_snprintf_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_snprintf_CFLAGS) \
+	$(CFLAGS) $(test_snprintf_LDFLAGS) $(LDFLAGS) -o $@
 am__test_strncpy_SOURCES_DIST = test_strncpy.c
 @HAVE_CMOCKA_TRUE@am_test_strncpy_OBJECTS =  \
 @HAVE_CMOCKA_TRUE@	test_strncpy-test_strncpy.$(OBJEXT)
@@ -178,18 +179,28 @@ test_strncpy_OBJECTS = $(am_test_strncpy_OBJECTS)
 test_strncpy_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_strncpy_CFLAGS) \
 	$(CFLAGS) $(test_strncpy_LDFLAGS) $(LDFLAGS) -o $@
-am__test_strtcpy_SOURCES_DIST = ../../lib/string/strtcpy.c \
+am__test_strtcpy_SOURCES_DIST = ../../lib/string/strcpy/strtcpy.c \
 	test_strtcpy.c
-@HAVE_CMOCKA_TRUE@am_test_strtcpy_OBJECTS = ../../lib/string/test_strtcpy-strtcpy.$(OBJEXT) \
+@HAVE_CMOCKA_TRUE@am_test_strtcpy_OBJECTS = ../../lib/string/strcpy/test_strtcpy-strtcpy.$(OBJEXT) \
 @HAVE_CMOCKA_TRUE@	test_strtcpy-test_strtcpy.$(OBJEXT)
 test_strtcpy_OBJECTS = $(am_test_strtcpy_OBJECTS)
 @HAVE_CMOCKA_TRUE@test_strtcpy_DEPENDENCIES = $(am__DEPENDENCIES_1)
 test_strtcpy_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_strtcpy_CFLAGS) \
 	$(CFLAGS) $(test_strtcpy_LDFLAGS) $(LDFLAGS) -o $@
-am__test_xasprintf_SOURCES_DIST = ../../lib/string/sprintf.c \
-	test_xasprintf.c
-@HAVE_CMOCKA_TRUE@am_test_xasprintf_OBJECTS = ../../lib/string/test_xasprintf-sprintf.$(OBJEXT) \
+am__test_typetraits_SOURCES_DIST = test_typetraits.c
+@HAVE_CMOCKA_TRUE@am_test_typetraits_OBJECTS =  \
+@HAVE_CMOCKA_TRUE@	test_typetraits-test_typetraits.$(OBJEXT)
+test_typetraits_OBJECTS = $(am_test_typetraits_OBJECTS)
+@HAVE_CMOCKA_TRUE@test_typetraits_DEPENDENCIES =  \
+@HAVE_CMOCKA_TRUE@	$(am__DEPENDENCIES_1)
+test_typetraits_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_typetraits_CFLAGS) $(CFLAGS) $(test_typetraits_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am__test_xasprintf_SOURCES_DIST =  \
+	../../lib/string/sprintf/xasprintf.c test_xasprintf.c
+@HAVE_CMOCKA_TRUE@am_test_xasprintf_OBJECTS = ../../lib/string/sprintf/test_xasprintf-xasprintf.$(OBJEXT) \
 @HAVE_CMOCKA_TRUE@	test_xasprintf-test_xasprintf.$(OBJEXT)
 test_xasprintf_OBJECTS = $(am_test_xasprintf_OBJECTS)
 @HAVE_CMOCKA_TRUE@test_xasprintf_DEPENDENCIES = $(am__DEPENDENCIES_1)
@@ -197,15 +208,6 @@ test_xasprintf_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(test_xasprintf_CFLAGS) $(CFLAGS) $(test_xasprintf_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am__test_zustr2stp_SOURCES_DIST = test_zustr2stp.c
-@HAVE_CMOCKA_TRUE@am_test_zustr2stp_OBJECTS =  \
-@HAVE_CMOCKA_TRUE@	test_zustr2stp-test_zustr2stp.$(OBJEXT)
-test_zustr2stp_OBJECTS = $(am_test_zustr2stp_OBJECTS)
-@HAVE_CMOCKA_TRUE@test_zustr2stp_DEPENDENCIES = $(am__DEPENDENCIES_1)
-test_zustr2stp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
-	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(test_zustr2stp_CFLAGS) $(CFLAGS) $(test_zustr2stp_LDFLAGS) \
-	$(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -224,19 +226,20 @@ am__maybe_remake_depfiles = depfiles
 am__depfiles_remade = ../../lib/$(DEPDIR)/test_adds-adds.Po \
 	../../lib/$(DEPDIR)/test_chkname-chkname.Po \
 	../../lib/$(DEPDIR)/test_logind-logind.Po \
-	../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po \
-	../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po \
-	../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po \
-	../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po \
+	../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po \
+	../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtou_noneg.Po \
+	../../lib/string/sprintf/$(DEPDIR)/test_snprintf-snprintf.Po \
+	../../lib/string/sprintf/$(DEPDIR)/test_xasprintf-xasprintf.Po \
+	../../lib/string/strcpy/$(DEPDIR)/test_strtcpy-strtcpy.Po \
 	./$(DEPDIR)/test_adds-test_adds.Po \
 	./$(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po \
 	./$(DEPDIR)/test_chkname-test_chkname.Po \
 	./$(DEPDIR)/test_logind-test_logind.Po \
-	./$(DEPDIR)/test_sprintf-test_sprintf.Po \
+	./$(DEPDIR)/test_snprintf-test_snprintf.Po \
 	./$(DEPDIR)/test_strncpy-test_strncpy.Po \
 	./$(DEPDIR)/test_strtcpy-test_strtcpy.Po \
-	./$(DEPDIR)/test_xasprintf-test_xasprintf.Po \
-	./$(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
+	./$(DEPDIR)/test_typetraits-test_typetraits.Po \
+	./$(DEPDIR)/test_xasprintf-test_xasprintf.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -258,18 +261,18 @@ am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(test_adds_SOURCES) $(test_atoi_strtoi_SOURCES) \
 	$(test_chkname_SOURCES) $(test_logind_SOURCES) \
-	$(test_sprintf_SOURCES) $(test_strncpy_SOURCES) \
-	$(test_strtcpy_SOURCES) $(test_xasprintf_SOURCES) \
-	$(test_zustr2stp_SOURCES)
+	$(test_snprintf_SOURCES) $(test_strncpy_SOURCES) \
+	$(test_strtcpy_SOURCES) $(test_typetraits_SOURCES) \
+	$(test_xasprintf_SOURCES)
 DIST_SOURCES = $(am__test_adds_SOURCES_DIST) \
 	$(am__test_atoi_strtoi_SOURCES_DIST) \
 	$(am__test_chkname_SOURCES_DIST) \
 	$(am__test_logind_SOURCES_DIST) \
-	$(am__test_sprintf_SOURCES_DIST) \
+	$(am__test_snprintf_SOURCES_DIST) \
 	$(am__test_strncpy_SOURCES_DIST) \
 	$(am__test_strtcpy_SOURCES_DIST) \
-	$(am__test_xasprintf_SOURCES_DIST) \
-	$(am__test_zustr2stp_SOURCES_DIST)
+	$(am__test_typetraits_SOURCES_DIST) \
+	$(am__test_xasprintf_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -696,7 +699,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)
 @HAVE_CMOCKA_TRUE@    $(NULL)
 
 @HAVE_CMOCKA_TRUE@test_atoi_strtoi_SOURCES = \
-@HAVE_CMOCKA_TRUE@    ../../lib/atoi/strtoi.c \
+@HAVE_CMOCKA_TRUE@    ../../lib/atoi/strtoi/strtoi.c \
+@HAVE_CMOCKA_TRUE@    ../../lib/atoi/strtoi/strtou_noneg.c \
 @HAVE_CMOCKA_TRUE@    test_atoi_strtoi.c \
 @HAVE_CMOCKA_TRUE@    $(NULL)
 
@@ -747,19 +751,19 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)
 @HAVE_CMOCKA_TRUE@    $(LIBSYSTEMD) \
 @HAVE_CMOCKA_TRUE@    $(NULL)
 
-@HAVE_CMOCKA_TRUE@test_sprintf_SOURCES = \
-@HAVE_CMOCKA_TRUE@    ../../lib/string/sprintf.c \
-@HAVE_CMOCKA_TRUE@    test_sprintf.c \
+@HAVE_CMOCKA_TRUE@test_snprintf_SOURCES = \
+@HAVE_CMOCKA_TRUE@    ../../lib/string/sprintf/snprintf.c \
+@HAVE_CMOCKA_TRUE@    test_snprintf.c \
 @HAVE_CMOCKA_TRUE@    $(NULL)
 
-@HAVE_CMOCKA_TRUE@test_sprintf_CFLAGS = \
+@HAVE_CMOCKA_TRUE@test_snprintf_CFLAGS = \
 @HAVE_CMOCKA_TRUE@    $(AM_CFLAGS) \
 @HAVE_CMOCKA_TRUE@    $(NULL)
 
-@HAVE_CMOCKA_TRUE@test_sprintf_LDFLAGS = \
+@HAVE_CMOCKA_TRUE@test_snprintf_LDFLAGS = \
 @HAVE_CMOCKA_TRUE@    $(NULL)
 
-@HAVE_CMOCKA_TRUE@test_sprintf_LDADD = \
+@HAVE_CMOCKA_TRUE@test_snprintf_LDADD = \
 @HAVE_CMOCKA_TRUE@    $(CMOCKA_LIBS) \
 @HAVE_CMOCKA_TRUE@    $(NULL)
 
@@ -779,7 +783,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)
 @HAVE_CMOCKA_TRUE@    $(NULL)
 
 @HAVE_CMOCKA_TRUE@test_strtcpy_SOURCES = \
-@HAVE_CMOCKA_TRUE@    ../../lib/string/strtcpy.c \
+@HAVE_CMOCKA_TRUE@    ../../lib/string/strcpy/strtcpy.c \
 @HAVE_CMOCKA_TRUE@    test_strtcpy.c \
 @HAVE_CMOCKA_TRUE@    $(NULL)
 
@@ -794,8 +798,23 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)
 @HAVE_CMOCKA_TRUE@    $(CMOCKA_LIBS) \
 @HAVE_CMOCKA_TRUE@    $(NULL)
 
+@HAVE_CMOCKA_TRUE@test_typetraits_SOURCES = \
+@HAVE_CMOCKA_TRUE@    test_typetraits.c \
+@HAVE_CMOCKA_TRUE@    $(NULL)
+
+@HAVE_CMOCKA_TRUE@test_typetraits_CFLAGS = \
+@HAVE_CMOCKA_TRUE@    $(AM_CFLAGS) \
+@HAVE_CMOCKA_TRUE@    $(NULL)
+
+@HAVE_CMOCKA_TRUE@test_typetraits_LDFLAGS = \
+@HAVE_CMOCKA_TRUE@    $(NULL)
+
+@HAVE_CMOCKA_TRUE@test_typetraits_LDADD = \
+@HAVE_CMOCKA_TRUE@    $(CMOCKA_LIBS) \
+@HAVE_CMOCKA_TRUE@    $(NULL)
+
 @HAVE_CMOCKA_TRUE@test_xasprintf_SOURCES = \
-@HAVE_CMOCKA_TRUE@    ../../lib/string/sprintf.c \
+@HAVE_CMOCKA_TRUE@    ../../lib/string/sprintf/xasprintf.c \
 @HAVE_CMOCKA_TRUE@    test_xasprintf.c \
 @HAVE_CMOCKA_TRUE@    $(NULL)
 
@@ -812,21 +831,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)
 @HAVE_CMOCKA_TRUE@    $(CMOCKA_LIBS) \
 @HAVE_CMOCKA_TRUE@    $(NULL)
 
-@HAVE_CMOCKA_TRUE@test_zustr2stp_SOURCES = \
-@HAVE_CMOCKA_TRUE@    test_zustr2stp.c \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_zustr2stp_CFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(AM_CFLAGS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_zustr2stp_LDFLAGS = \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
-@HAVE_CMOCKA_TRUE@test_zustr2stp_LDADD = \
-@HAVE_CMOCKA_TRUE@    $(CMOCKA_LIBS) \
-@HAVE_CMOCKA_TRUE@    $(NULL)
-
 all: all-am
 
 .SUFFIXES:
@@ -881,15 +885,18 @@ clean-checkPROGRAMS:
 test_adds$(EXEEXT): $(test_adds_OBJECTS) $(test_adds_DEPENDENCIES) $(EXTRA_test_adds_DEPENDENCIES) 
 	@rm -f test_adds$(EXEEXT)
 	$(AM_V_CCLD)$(test_adds_LINK) $(test_adds_OBJECTS) $(test_adds_LDADD) $(LIBS)
-../../lib/atoi/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib/atoi
-	@: > ../../lib/atoi/$(am__dirstamp)
-../../lib/atoi/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib/atoi/$(DEPDIR)
-	@: > ../../lib/atoi/$(DEPDIR)/$(am__dirstamp)
-../../lib/atoi/test_atoi_strtoi-strtoi.$(OBJEXT):  \
-	../../lib/atoi/$(am__dirstamp) \
-	../../lib/atoi/$(DEPDIR)/$(am__dirstamp)
+../../lib/atoi/strtoi/$(am__dirstamp):
+	@$(MKDIR_P) ../../lib/atoi/strtoi
+	@: > ../../lib/atoi/strtoi/$(am__dirstamp)
+../../lib/atoi/strtoi/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) ../../lib/atoi/strtoi/$(DEPDIR)
+	@: > ../../lib/atoi/strtoi/$(DEPDIR)/$(am__dirstamp)
+../../lib/atoi/strtoi/test_atoi_strtoi-strtoi.$(OBJEXT):  \
+	../../lib/atoi/strtoi/$(am__dirstamp) \
+	../../lib/atoi/strtoi/$(DEPDIR)/$(am__dirstamp)
+../../lib/atoi/strtoi/test_atoi_strtoi-strtou_noneg.$(OBJEXT):  \
+	../../lib/atoi/strtoi/$(am__dirstamp) \
+	../../lib/atoi/strtoi/$(DEPDIR)/$(am__dirstamp)
 
 test_atoi_strtoi$(EXEEXT): $(test_atoi_strtoi_OBJECTS) $(test_atoi_strtoi_DEPENDENCIES) $(EXTRA_test_atoi_strtoi_DEPENDENCIES) 
 	@rm -f test_atoi_strtoi$(EXEEXT)
@@ -906,47 +913,54 @@ test_chkname$(EXEEXT): $(test_chkname_OBJECTS) $(test_chkname_DEPENDENCIES) $(EX
 test_logind$(EXEEXT): $(test_logind_OBJECTS) $(test_logind_DEPENDENCIES) $(EXTRA_test_logind_DEPENDENCIES) 
 	@rm -f test_logind$(EXEEXT)
 	$(AM_V_CCLD)$(test_logind_LINK) $(test_logind_OBJECTS) $(test_logind_LDADD) $(LIBS)
-../../lib/string/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib/string
-	@: > ../../lib/string/$(am__dirstamp)
-../../lib/string/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ../../lib/string/$(DEPDIR)
-	@: > ../../lib/string/$(DEPDIR)/$(am__dirstamp)
-../../lib/string/test_sprintf-sprintf.$(OBJEXT):  \
-	../../lib/string/$(am__dirstamp) \
-	../../lib/string/$(DEPDIR)/$(am__dirstamp)
+../../lib/string/sprintf/$(am__dirstamp):
+	@$(MKDIR_P) ../../lib/string/sprintf
+	@: > ../../lib/string/sprintf/$(am__dirstamp)
+../../lib/string/sprintf/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) ../../lib/string/sprintf/$(DEPDIR)
+	@: > ../../lib/string/sprintf/$(DEPDIR)/$(am__dirstamp)
+../../lib/string/sprintf/test_snprintf-snprintf.$(OBJEXT):  \
+	../../lib/string/sprintf/$(am__dirstamp) \
+	../../lib/string/sprintf/$(DEPDIR)/$(am__dirstamp)
 
-test_sprintf$(EXEEXT): $(test_sprintf_OBJECTS) $(test_sprintf_DEPENDENCIES) $(EXTRA_test_sprintf_DEPENDENCIES) 
-	@rm -f test_sprintf$(EXEEXT)
-	$(AM_V_CCLD)$(test_sprintf_LINK) $(test_sprintf_OBJECTS) $(test_sprintf_LDADD) $(LIBS)
+test_snprintf$(EXEEXT): $(test_snprintf_OBJECTS) $(test_snprintf_DEPENDENCIES) $(EXTRA_test_snprintf_DEPENDENCIES) 
+	@rm -f test_snprintf$(EXEEXT)
+	$(AM_V_CCLD)$(test_snprintf_LINK) $(test_snprintf_OBJECTS) $(test_snprintf_LDADD) $(LIBS)
 
 test_strncpy$(EXEEXT): $(test_strncpy_OBJECTS) $(test_strncpy_DEPENDENCIES) $(EXTRA_test_strncpy_DEPENDENCIES) 
 	@rm -f test_strncpy$(EXEEXT)
 	$(AM_V_CCLD)$(test_strncpy_LINK) $(test_strncpy_OBJECTS) $(test_strncpy_LDADD) $(LIBS)
-../../lib/string/test_strtcpy-strtcpy.$(OBJEXT):  \
-	../../lib/string/$(am__dirstamp) \
-	../../lib/string/$(DEPDIR)/$(am__dirstamp)
+../../lib/string/strcpy/$(am__dirstamp):
+	@$(MKDIR_P) ../../lib/string/strcpy
+	@: > ../../lib/string/strcpy/$(am__dirstamp)
+../../lib/string/strcpy/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) ../../lib/string/strcpy/$(DEPDIR)
+	@: > ../../lib/string/strcpy/$(DEPDIR)/$(am__dirstamp)
+../../lib/string/strcpy/test_strtcpy-strtcpy.$(OBJEXT):  \
+	../../lib/string/strcpy/$(am__dirstamp) \
+	../../lib/string/strcpy/$(DEPDIR)/$(am__dirstamp)
 
 test_strtcpy$(EXEEXT): $(test_strtcpy_OBJECTS) $(test_strtcpy_DEPENDENCIES) $(EXTRA_test_strtcpy_DEPENDENCIES) 
 	@rm -f test_strtcpy$(EXEEXT)
 	$(AM_V_CCLD)$(test_strtcpy_LINK) $(test_strtcpy_OBJECTS) $(test_strtcpy_LDADD) $(LIBS)
-../../lib/string/test_xasprintf-sprintf.$(OBJEXT):  \
-	../../lib/string/$(am__dirstamp) \
-	../../lib/string/$(DEPDIR)/$(am__dirstamp)
+
+test_typetraits$(EXEEXT): $(test_typetraits_OBJECTS) $(test_typetraits_DEPENDENCIES) $(EXTRA_test_typetraits_DEPENDENCIES) 
+	@rm -f test_typetraits$(EXEEXT)
+	$(AM_V_CCLD)$(test_typetraits_LINK) $(test_typetraits_OBJECTS) $(test_typetraits_LDADD) $(LIBS)
+../../lib/string/sprintf/test_xasprintf-xasprintf.$(OBJEXT):  \
+	../../lib/string/sprintf/$(am__dirstamp) \
+	../../lib/string/sprintf/$(DEPDIR)/$(am__dirstamp)
 
 test_xasprintf$(EXEEXT): $(test_xasprintf_OBJECTS) $(test_xasprintf_DEPENDENCIES) $(EXTRA_test_xasprintf_DEPENDENCIES) 
 	@rm -f test_xasprintf$(EXEEXT)
 	$(AM_V_CCLD)$(test_xasprintf_LINK) $(test_xasprintf_OBJECTS) $(test_xasprintf_LDADD) $(LIBS)
 
-test_zustr2stp$(EXEEXT): $(test_zustr2stp_OBJECTS) $(test_zustr2stp_DEPENDENCIES) $(EXTRA_test_zustr2stp_DEPENDENCIES) 
-	@rm -f test_zustr2stp$(EXEEXT)
-	$(AM_V_CCLD)$(test_zustr2stp_LINK) $(test_zustr2stp_OBJECTS) $(test_zustr2stp_LDADD) $(LIBS)
-
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 	-rm -f ../../lib/*.$(OBJEXT)
-	-rm -f ../../lib/atoi/*.$(OBJEXT)
-	-rm -f ../../lib/string/*.$(OBJEXT)
+	-rm -f ../../lib/atoi/strtoi/*.$(OBJEXT)
+	-rm -f ../../lib/string/sprintf/*.$(OBJEXT)
+	-rm -f ../../lib/string/strcpy/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -954,19 +968,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/test_adds-adds.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/test_chkname-chkname.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/test_logind-logind.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtou_noneg.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@../../lib/string/sprintf/$(DEPDIR)/test_snprintf-snprintf.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@../../lib/string/sprintf/$(DEPDIR)/test_xasprintf-xasprintf.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@../../lib/string/strcpy/$(DEPDIR)/test_strtcpy-strtcpy.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_adds-test_adds.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_chkname-test_chkname.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_logind-test_logind.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_sprintf-test_sprintf.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_snprintf-test_snprintf.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_strncpy-test_strncpy.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_strtcpy-test_strtcpy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_typetraits-test_typetraits.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_xasprintf-test_xasprintf.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_zustr2stp-test_zustr2stp.Po@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
@@ -1026,19 +1041,33 @@ test_adds-test_adds.obj: test_adds.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_adds_CFLAGS) $(CFLAGS) -c -o test_adds-test_adds.obj `if test -f 'test_adds.c'; then $(CYGPATH_W) 'test_adds.c'; else $(CYGPATH_W) '$(srcdir)/test_adds.c'; fi`
 
-../../lib/atoi/test_atoi_strtoi-strtoi.o: ../../lib/atoi/strtoi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT ../../lib/atoi/test_atoi_strtoi-strtoi.o -MD -MP -MF ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo -c -o ../../lib/atoi/test_atoi_strtoi-strtoi.o `test -f '../../lib/atoi/strtoi.c' || echo '$(srcdir)/'`../../lib/atoi/strtoi.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/atoi/strtoi.c' object='../../lib/atoi/test_atoi_strtoi-strtoi.o' libtool=no @AMDEPBACKSLASH@
+../../lib/atoi/strtoi/test_atoi_strtoi-strtoi.o: ../../lib/atoi/strtoi/strtoi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT ../../lib/atoi/strtoi/test_atoi_strtoi-strtoi.o -MD -MP -MF ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo -c -o ../../lib/atoi/strtoi/test_atoi_strtoi-strtoi.o `test -f '../../lib/atoi/strtoi/strtoi.c' || echo '$(srcdir)/'`../../lib/atoi/strtoi/strtoi.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/atoi/strtoi/strtoi.c' object='../../lib/atoi/strtoi/test_atoi_strtoi-strtoi.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -c -o ../../lib/atoi/test_atoi_strtoi-strtoi.o `test -f '../../lib/atoi/strtoi.c' || echo '$(srcdir)/'`../../lib/atoi/strtoi.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -c -o ../../lib/atoi/strtoi/test_atoi_strtoi-strtoi.o `test -f '../../lib/atoi/strtoi/strtoi.c' || echo '$(srcdir)/'`../../lib/atoi/strtoi/strtoi.c
 
-../../lib/atoi/test_atoi_strtoi-strtoi.obj: ../../lib/atoi/strtoi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT ../../lib/atoi/test_atoi_strtoi-strtoi.obj -MD -MP -MF ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo -c -o ../../lib/atoi/test_atoi_strtoi-strtoi.obj `if test -f '../../lib/atoi/strtoi.c'; then $(CYGPATH_W) '../../lib/atoi/strtoi.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/atoi/strtoi.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/atoi/strtoi.c' object='../../lib/atoi/test_atoi_strtoi-strtoi.obj' libtool=no @AMDEPBACKSLASH@
+../../lib/atoi/strtoi/test_atoi_strtoi-strtoi.obj: ../../lib/atoi/strtoi/strtoi.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT ../../lib/atoi/strtoi/test_atoi_strtoi-strtoi.obj -MD -MP -MF ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo -c -o ../../lib/atoi/strtoi/test_atoi_strtoi-strtoi.obj `if test -f '../../lib/atoi/strtoi/strtoi.c'; then $(CYGPATH_W) '../../lib/atoi/strtoi/strtoi.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/atoi/strtoi/strtoi.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Tpo ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/atoi/strtoi/strtoi.c' object='../../lib/atoi/strtoi/test_atoi_strtoi-strtoi.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -c -o ../../lib/atoi/test_atoi_strtoi-strtoi.obj `if test -f '../../lib/atoi/strtoi.c'; then $(CYGPATH_W) '../../lib/atoi/strtoi.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/atoi/strtoi.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -c -o ../../lib/atoi/strtoi/test_atoi_strtoi-strtoi.obj `if test -f '../../lib/atoi/strtoi/strtoi.c'; then $(CYGPATH_W) '../../lib/atoi/strtoi/strtoi.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/atoi/strtoi/strtoi.c'; fi`
+
+../../lib/atoi/strtoi/test_atoi_strtoi-strtou_noneg.o: ../../lib/atoi/strtoi/strtou_noneg.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT ../../lib/atoi/strtoi/test_atoi_strtoi-strtou_noneg.o -MD -MP -MF ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtou_noneg.Tpo -c -o ../../lib/atoi/strtoi/test_atoi_strtoi-strtou_noneg.o `test -f '../../lib/atoi/strtoi/strtou_noneg.c' || echo '$(srcdir)/'`../../lib/atoi/strtoi/strtou_noneg.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtou_noneg.Tpo ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtou_noneg.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/atoi/strtoi/strtou_noneg.c' object='../../lib/atoi/strtoi/test_atoi_strtoi-strtou_noneg.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -c -o ../../lib/atoi/strtoi/test_atoi_strtoi-strtou_noneg.o `test -f '../../lib/atoi/strtoi/strtou_noneg.c' || echo '$(srcdir)/'`../../lib/atoi/strtoi/strtou_noneg.c
+
+../../lib/atoi/strtoi/test_atoi_strtoi-strtou_noneg.obj: ../../lib/atoi/strtoi/strtou_noneg.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT ../../lib/atoi/strtoi/test_atoi_strtoi-strtou_noneg.obj -MD -MP -MF ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtou_noneg.Tpo -c -o ../../lib/atoi/strtoi/test_atoi_strtoi-strtou_noneg.obj `if test -f '../../lib/atoi/strtoi/strtou_noneg.c'; then $(CYGPATH_W) '../../lib/atoi/strtoi/strtou_noneg.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/atoi/strtoi/strtou_noneg.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtou_noneg.Tpo ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtou_noneg.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/atoi/strtoi/strtou_noneg.c' object='../../lib/atoi/strtoi/test_atoi_strtoi-strtou_noneg.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -c -o ../../lib/atoi/strtoi/test_atoi_strtoi-strtou_noneg.obj `if test -f '../../lib/atoi/strtoi/strtou_noneg.c'; then $(CYGPATH_W) '../../lib/atoi/strtoi/strtou_noneg.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/atoi/strtoi/strtou_noneg.c'; fi`
 
 test_atoi_strtoi-test_atoi_strtoi.o: test_atoi_strtoi.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_atoi_strtoi_CFLAGS) $(CFLAGS) -MT test_atoi_strtoi-test_atoi_strtoi.o -MD -MP -MF $(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Tpo -c -o test_atoi_strtoi-test_atoi_strtoi.o `test -f 'test_atoi_strtoi.c' || echo '$(srcdir)/'`test_atoi_strtoi.c
@@ -1110,33 +1139,33 @@ test_logind-test_logind.obj: test_logind.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_logind_CFLAGS) $(CFLAGS) -c -o test_logind-test_logind.obj `if test -f 'test_logind.c'; then $(CYGPATH_W) 'test_logind.c'; else $(CYGPATH_W) '$(srcdir)/test_logind.c'; fi`
 
-../../lib/string/test_sprintf-sprintf.o: ../../lib/string/sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_sprintf-sprintf.o -MD -MP -MF ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Tpo -c -o ../../lib/string/test_sprintf-sprintf.o `test -f '../../lib/string/sprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Tpo ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/sprintf.c' object='../../lib/string/test_sprintf-sprintf.o' libtool=no @AMDEPBACKSLASH@
+../../lib/string/sprintf/test_snprintf-snprintf.o: ../../lib/string/sprintf/snprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_snprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/sprintf/test_snprintf-snprintf.o -MD -MP -MF ../../lib/string/sprintf/$(DEPDIR)/test_snprintf-snprintf.Tpo -c -o ../../lib/string/sprintf/test_snprintf-snprintf.o `test -f '../../lib/string/sprintf/snprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf/snprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/sprintf/$(DEPDIR)/test_snprintf-snprintf.Tpo ../../lib/string/sprintf/$(DEPDIR)/test_snprintf-snprintf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/sprintf/snprintf.c' object='../../lib/string/sprintf/test_snprintf-snprintf.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_sprintf-sprintf.o `test -f '../../lib/string/sprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_snprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/sprintf/test_snprintf-snprintf.o `test -f '../../lib/string/sprintf/snprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf/snprintf.c
 
-../../lib/string/test_sprintf-sprintf.obj: ../../lib/string/sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_sprintf-sprintf.obj -MD -MP -MF ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Tpo -c -o ../../lib/string/test_sprintf-sprintf.obj `if test -f '../../lib/string/sprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Tpo ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/sprintf.c' object='../../lib/string/test_sprintf-sprintf.obj' libtool=no @AMDEPBACKSLASH@
+../../lib/string/sprintf/test_snprintf-snprintf.obj: ../../lib/string/sprintf/snprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_snprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/sprintf/test_snprintf-snprintf.obj -MD -MP -MF ../../lib/string/sprintf/$(DEPDIR)/test_snprintf-snprintf.Tpo -c -o ../../lib/string/sprintf/test_snprintf-snprintf.obj `if test -f '../../lib/string/sprintf/snprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf/snprintf.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/sprintf/$(DEPDIR)/test_snprintf-snprintf.Tpo ../../lib/string/sprintf/$(DEPDIR)/test_snprintf-snprintf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/sprintf/snprintf.c' object='../../lib/string/sprintf/test_snprintf-snprintf.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_sprintf-sprintf.obj `if test -f '../../lib/string/sprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_snprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/sprintf/test_snprintf-snprintf.obj `if test -f '../../lib/string/sprintf/snprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf/snprintf.c'; fi`
 
-test_sprintf-test_sprintf.o: test_sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -MT test_sprintf-test_sprintf.o -MD -MP -MF $(DEPDIR)/test_sprintf-test_sprintf.Tpo -c -o test_sprintf-test_sprintf.o `test -f 'test_sprintf.c' || echo '$(srcdir)/'`test_sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_sprintf-test_sprintf.Tpo $(DEPDIR)/test_sprintf-test_sprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_sprintf.c' object='test_sprintf-test_sprintf.o' libtool=no @AMDEPBACKSLASH@
+test_snprintf-test_snprintf.o: test_snprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_snprintf_CFLAGS) $(CFLAGS) -MT test_snprintf-test_snprintf.o -MD -MP -MF $(DEPDIR)/test_snprintf-test_snprintf.Tpo -c -o test_snprintf-test_snprintf.o `test -f 'test_snprintf.c' || echo '$(srcdir)/'`test_snprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_snprintf-test_snprintf.Tpo $(DEPDIR)/test_snprintf-test_snprintf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_snprintf.c' object='test_snprintf-test_snprintf.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -c -o test_sprintf-test_sprintf.o `test -f 'test_sprintf.c' || echo '$(srcdir)/'`test_sprintf.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_snprintf_CFLAGS) $(CFLAGS) -c -o test_snprintf-test_snprintf.o `test -f 'test_snprintf.c' || echo '$(srcdir)/'`test_snprintf.c
 
-test_sprintf-test_sprintf.obj: test_sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -MT test_sprintf-test_sprintf.obj -MD -MP -MF $(DEPDIR)/test_sprintf-test_sprintf.Tpo -c -o test_sprintf-test_sprintf.obj `if test -f 'test_sprintf.c'; then $(CYGPATH_W) 'test_sprintf.c'; else $(CYGPATH_W) '$(srcdir)/test_sprintf.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_sprintf-test_sprintf.Tpo $(DEPDIR)/test_sprintf-test_sprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_sprintf.c' object='test_sprintf-test_sprintf.obj' libtool=no @AMDEPBACKSLASH@
+test_snprintf-test_snprintf.obj: test_snprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_snprintf_CFLAGS) $(CFLAGS) -MT test_snprintf-test_snprintf.obj -MD -MP -MF $(DEPDIR)/test_snprintf-test_snprintf.Tpo -c -o test_snprintf-test_snprintf.obj `if test -f 'test_snprintf.c'; then $(CYGPATH_W) 'test_snprintf.c'; else $(CYGPATH_W) '$(srcdir)/test_snprintf.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_snprintf-test_snprintf.Tpo $(DEPDIR)/test_snprintf-test_snprintf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_snprintf.c' object='test_snprintf-test_snprintf.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sprintf_CFLAGS) $(CFLAGS) -c -o test_sprintf-test_sprintf.obj `if test -f 'test_sprintf.c'; then $(CYGPATH_W) 'test_sprintf.c'; else $(CYGPATH_W) '$(srcdir)/test_sprintf.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_snprintf_CFLAGS) $(CFLAGS) -c -o test_snprintf-test_snprintf.obj `if test -f 'test_snprintf.c'; then $(CYGPATH_W) 'test_snprintf.c'; else $(CYGPATH_W) '$(srcdir)/test_snprintf.c'; fi`
 
 test_strncpy-test_strncpy.o: test_strncpy.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strncpy_CFLAGS) $(CFLAGS) -MT test_strncpy-test_strncpy.o -MD -MP -MF $(DEPDIR)/test_strncpy-test_strncpy.Tpo -c -o test_strncpy-test_strncpy.o `test -f 'test_strncpy.c' || echo '$(srcdir)/'`test_strncpy.c
@@ -1152,19 +1181,19 @@ test_strncpy-test_strncpy.obj: test_strncpy.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strncpy_CFLAGS) $(CFLAGS) -c -o test_strncpy-test_strncpy.obj `if test -f 'test_strncpy.c'; then $(CYGPATH_W) 'test_strncpy.c'; else $(CYGPATH_W) '$(srcdir)/test_strncpy.c'; fi`
 
-../../lib/string/test_strtcpy-strtcpy.o: ../../lib/string/strtcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_strtcpy-strtcpy.o -MD -MP -MF ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Tpo -c -o ../../lib/string/test_strtcpy-strtcpy.o `test -f '../../lib/string/strtcpy.c' || echo '$(srcdir)/'`../../lib/string/strtcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Tpo ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/strtcpy.c' object='../../lib/string/test_strtcpy-strtcpy.o' libtool=no @AMDEPBACKSLASH@
+../../lib/string/strcpy/test_strtcpy-strtcpy.o: ../../lib/string/strcpy/strtcpy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -MT ../../lib/string/strcpy/test_strtcpy-strtcpy.o -MD -MP -MF ../../lib/string/strcpy/$(DEPDIR)/test_strtcpy-strtcpy.Tpo -c -o ../../lib/string/strcpy/test_strtcpy-strtcpy.o `test -f '../../lib/string/strcpy/strtcpy.c' || echo '$(srcdir)/'`../../lib/string/strcpy/strtcpy.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/strcpy/$(DEPDIR)/test_strtcpy-strtcpy.Tpo ../../lib/string/strcpy/$(DEPDIR)/test_strtcpy-strtcpy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/strcpy/strtcpy.c' object='../../lib/string/strcpy/test_strtcpy-strtcpy.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_strtcpy-strtcpy.o `test -f '../../lib/string/strtcpy.c' || echo '$(srcdir)/'`../../lib/string/strtcpy.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -c -o ../../lib/string/strcpy/test_strtcpy-strtcpy.o `test -f '../../lib/string/strcpy/strtcpy.c' || echo '$(srcdir)/'`../../lib/string/strcpy/strtcpy.c
 
-../../lib/string/test_strtcpy-strtcpy.obj: ../../lib/string/strtcpy.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_strtcpy-strtcpy.obj -MD -MP -MF ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Tpo -c -o ../../lib/string/test_strtcpy-strtcpy.obj `if test -f '../../lib/string/strtcpy.c'; then $(CYGPATH_W) '../../lib/string/strtcpy.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/strtcpy.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Tpo ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/strtcpy.c' object='../../lib/string/test_strtcpy-strtcpy.obj' libtool=no @AMDEPBACKSLASH@
+../../lib/string/strcpy/test_strtcpy-strtcpy.obj: ../../lib/string/strcpy/strtcpy.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -MT ../../lib/string/strcpy/test_strtcpy-strtcpy.obj -MD -MP -MF ../../lib/string/strcpy/$(DEPDIR)/test_strtcpy-strtcpy.Tpo -c -o ../../lib/string/strcpy/test_strtcpy-strtcpy.obj `if test -f '../../lib/string/strcpy/strtcpy.c'; then $(CYGPATH_W) '../../lib/string/strcpy/strtcpy.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/strcpy/strtcpy.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/strcpy/$(DEPDIR)/test_strtcpy-strtcpy.Tpo ../../lib/string/strcpy/$(DEPDIR)/test_strtcpy-strtcpy.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/strcpy/strtcpy.c' object='../../lib/string/strcpy/test_strtcpy-strtcpy.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_strtcpy-strtcpy.obj `if test -f '../../lib/string/strtcpy.c'; then $(CYGPATH_W) '../../lib/string/strtcpy.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/strtcpy.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -c -o ../../lib/string/strcpy/test_strtcpy-strtcpy.obj `if test -f '../../lib/string/strcpy/strtcpy.c'; then $(CYGPATH_W) '../../lib/string/strcpy/strtcpy.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/strcpy/strtcpy.c'; fi`
 
 test_strtcpy-test_strtcpy.o: test_strtcpy.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -MT test_strtcpy-test_strtcpy.o -MD -MP -MF $(DEPDIR)/test_strtcpy-test_strtcpy.Tpo -c -o test_strtcpy-test_strtcpy.o `test -f 'test_strtcpy.c' || echo '$(srcdir)/'`test_strtcpy.c
@@ -1180,19 +1209,33 @@ test_strtcpy-test_strtcpy.obj: test_strtcpy.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_strtcpy_CFLAGS) $(CFLAGS) -c -o test_strtcpy-test_strtcpy.obj `if test -f 'test_strtcpy.c'; then $(CYGPATH_W) 'test_strtcpy.c'; else $(CYGPATH_W) '$(srcdir)/test_strtcpy.c'; fi`
 
-../../lib/string/test_xasprintf-sprintf.o: ../../lib/string/sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_xasprintf-sprintf.o -MD -MP -MF ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Tpo -c -o ../../lib/string/test_xasprintf-sprintf.o `test -f '../../lib/string/sprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Tpo ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/sprintf.c' object='../../lib/string/test_xasprintf-sprintf.o' libtool=no @AMDEPBACKSLASH@
+test_typetraits-test_typetraits.o: test_typetraits.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_typetraits_CFLAGS) $(CFLAGS) -MT test_typetraits-test_typetraits.o -MD -MP -MF $(DEPDIR)/test_typetraits-test_typetraits.Tpo -c -o test_typetraits-test_typetraits.o `test -f 'test_typetraits.c' || echo '$(srcdir)/'`test_typetraits.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_typetraits-test_typetraits.Tpo $(DEPDIR)/test_typetraits-test_typetraits.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_typetraits.c' object='test_typetraits-test_typetraits.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_xasprintf-sprintf.o `test -f '../../lib/string/sprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_typetraits_CFLAGS) $(CFLAGS) -c -o test_typetraits-test_typetraits.o `test -f 'test_typetraits.c' || echo '$(srcdir)/'`test_typetraits.c
 
-../../lib/string/test_xasprintf-sprintf.obj: ../../lib/string/sprintf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/test_xasprintf-sprintf.obj -MD -MP -MF ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Tpo -c -o ../../lib/string/test_xasprintf-sprintf.obj `if test -f '../../lib/string/sprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Tpo ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/sprintf.c' object='../../lib/string/test_xasprintf-sprintf.obj' libtool=no @AMDEPBACKSLASH@
+test_typetraits-test_typetraits.obj: test_typetraits.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_typetraits_CFLAGS) $(CFLAGS) -MT test_typetraits-test_typetraits.obj -MD -MP -MF $(DEPDIR)/test_typetraits-test_typetraits.Tpo -c -o test_typetraits-test_typetraits.obj `if test -f 'test_typetraits.c'; then $(CYGPATH_W) 'test_typetraits.c'; else $(CYGPATH_W) '$(srcdir)/test_typetraits.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_typetraits-test_typetraits.Tpo $(DEPDIR)/test_typetraits-test_typetraits.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_typetraits.c' object='test_typetraits-test_typetraits.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/test_xasprintf-sprintf.obj `if test -f '../../lib/string/sprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_typetraits_CFLAGS) $(CFLAGS) -c -o test_typetraits-test_typetraits.obj `if test -f 'test_typetraits.c'; then $(CYGPATH_W) 'test_typetraits.c'; else $(CYGPATH_W) '$(srcdir)/test_typetraits.c'; fi`
+
+../../lib/string/sprintf/test_xasprintf-xasprintf.o: ../../lib/string/sprintf/xasprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/sprintf/test_xasprintf-xasprintf.o -MD -MP -MF ../../lib/string/sprintf/$(DEPDIR)/test_xasprintf-xasprintf.Tpo -c -o ../../lib/string/sprintf/test_xasprintf-xasprintf.o `test -f '../../lib/string/sprintf/xasprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf/xasprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/sprintf/$(DEPDIR)/test_xasprintf-xasprintf.Tpo ../../lib/string/sprintf/$(DEPDIR)/test_xasprintf-xasprintf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/sprintf/xasprintf.c' object='../../lib/string/sprintf/test_xasprintf-xasprintf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/sprintf/test_xasprintf-xasprintf.o `test -f '../../lib/string/sprintf/xasprintf.c' || echo '$(srcdir)/'`../../lib/string/sprintf/xasprintf.c
+
+../../lib/string/sprintf/test_xasprintf-xasprintf.obj: ../../lib/string/sprintf/xasprintf.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -MT ../../lib/string/sprintf/test_xasprintf-xasprintf.obj -MD -MP -MF ../../lib/string/sprintf/$(DEPDIR)/test_xasprintf-xasprintf.Tpo -c -o ../../lib/string/sprintf/test_xasprintf-xasprintf.obj `if test -f '../../lib/string/sprintf/xasprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf/xasprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf/xasprintf.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) ../../lib/string/sprintf/$(DEPDIR)/test_xasprintf-xasprintf.Tpo ../../lib/string/sprintf/$(DEPDIR)/test_xasprintf-xasprintf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../lib/string/sprintf/xasprintf.c' object='../../lib/string/sprintf/test_xasprintf-xasprintf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -c -o ../../lib/string/sprintf/test_xasprintf-xasprintf.obj `if test -f '../../lib/string/sprintf/xasprintf.c'; then $(CYGPATH_W) '../../lib/string/sprintf/xasprintf.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/string/sprintf/xasprintf.c'; fi`
 
 test_xasprintf-test_xasprintf.o: test_xasprintf.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -MT test_xasprintf-test_xasprintf.o -MD -MP -MF $(DEPDIR)/test_xasprintf-test_xasprintf.Tpo -c -o test_xasprintf-test_xasprintf.o `test -f 'test_xasprintf.c' || echo '$(srcdir)/'`test_xasprintf.c
@@ -1208,20 +1251,6 @@ test_xasprintf-test_xasprintf.obj: test_xasprintf.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_xasprintf_CFLAGS) $(CFLAGS) -c -o test_xasprintf-test_xasprintf.obj `if test -f 'test_xasprintf.c'; then $(CYGPATH_W) 'test_xasprintf.c'; else $(CYGPATH_W) '$(srcdir)/test_xasprintf.c'; fi`
 
-test_zustr2stp-test_zustr2stp.o: test_zustr2stp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_zustr2stp_CFLAGS) $(CFLAGS) -MT test_zustr2stp-test_zustr2stp.o -MD -MP -MF $(DEPDIR)/test_zustr2stp-test_zustr2stp.Tpo -c -o test_zustr2stp-test_zustr2stp.o `test -f 'test_zustr2stp.c' || echo '$(srcdir)/'`test_zustr2stp.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_zustr2stp-test_zustr2stp.Tpo $(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_zustr2stp.c' object='test_zustr2stp-test_zustr2stp.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_zustr2stp_CFLAGS) $(CFLAGS) -c -o test_zustr2stp-test_zustr2stp.o `test -f 'test_zustr2stp.c' || echo '$(srcdir)/'`test_zustr2stp.c
-
-test_zustr2stp-test_zustr2stp.obj: test_zustr2stp.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_zustr2stp_CFLAGS) $(CFLAGS) -MT test_zustr2stp-test_zustr2stp.obj -MD -MP -MF $(DEPDIR)/test_zustr2stp-test_zustr2stp.Tpo -c -o test_zustr2stp-test_zustr2stp.obj `if test -f 'test_zustr2stp.c'; then $(CYGPATH_W) 'test_zustr2stp.c'; else $(CYGPATH_W) '$(srcdir)/test_zustr2stp.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_zustr2stp-test_zustr2stp.Tpo $(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='test_zustr2stp.c' object='test_zustr2stp-test_zustr2stp.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_zustr2stp_CFLAGS) $(CFLAGS) -c -o test_zustr2stp-test_zustr2stp.obj `if test -f 'test_zustr2stp.c'; then $(CYGPATH_W) 'test_zustr2stp.c'; else $(CYGPATH_W) '$(srcdir)/test_zustr2stp.c'; fi`
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -1442,9 +1471,9 @@ test_chkname.log: test_chkname$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_sprintf.log: test_sprintf$(EXEEXT)
-	@p='test_sprintf$(EXEEXT)'; \
-	b='test_sprintf'; \
+test_snprintf.log: test_snprintf$(EXEEXT)
+	@p='test_snprintf$(EXEEXT)'; \
+	b='test_snprintf'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -1463,16 +1492,16 @@ test_strtcpy.log: test_strtcpy$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_xasprintf.log: test_xasprintf$(EXEEXT)
-	@p='test_xasprintf$(EXEEXT)'; \
-	b='test_xasprintf'; \
+test_typetraits.log: test_typetraits$(EXEEXT)
+	@p='test_typetraits$(EXEEXT)'; \
+	b='test_typetraits'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-test_zustr2stp.log: test_zustr2stp$(EXEEXT)
-	@p='test_zustr2stp$(EXEEXT)'; \
-	b='test_zustr2stp'; \
+test_xasprintf.log: test_xasprintf$(EXEEXT)
+	@p='test_xasprintf$(EXEEXT)'; \
+	b='test_xasprintf'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -1568,10 +1597,12 @@ distclean-generic:
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-rm -f ../../lib/$(DEPDIR)/$(am__dirstamp)
 	-rm -f ../../lib/$(am__dirstamp)
-	-rm -f ../../lib/atoi/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ../../lib/atoi/$(am__dirstamp)
-	-rm -f ../../lib/string/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ../../lib/string/$(am__dirstamp)
+	-rm -f ../../lib/atoi/strtoi/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ../../lib/atoi/strtoi/$(am__dirstamp)
+	-rm -f ../../lib/string/sprintf/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ../../lib/string/sprintf/$(am__dirstamp)
+	-rm -f ../../lib/string/strcpy/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ../../lib/string/strcpy/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1585,19 +1616,20 @@ distclean: distclean-am
 		-rm -f ../../lib/$(DEPDIR)/test_adds-adds.Po
 	-rm -f ../../lib/$(DEPDIR)/test_chkname-chkname.Po
 	-rm -f ../../lib/$(DEPDIR)/test_logind-logind.Po
-	-rm -f ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po
+	-rm -f ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
+	-rm -f ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtou_noneg.Po
+	-rm -f ../../lib/string/sprintf/$(DEPDIR)/test_snprintf-snprintf.Po
+	-rm -f ../../lib/string/sprintf/$(DEPDIR)/test_xasprintf-xasprintf.Po
+	-rm -f ../../lib/string/strcpy/$(DEPDIR)/test_strtcpy-strtcpy.Po
 	-rm -f ./$(DEPDIR)/test_adds-test_adds.Po
 	-rm -f ./$(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po
 	-rm -f ./$(DEPDIR)/test_chkname-test_chkname.Po
 	-rm -f ./$(DEPDIR)/test_logind-test_logind.Po
-	-rm -f ./$(DEPDIR)/test_sprintf-test_sprintf.Po
+	-rm -f ./$(DEPDIR)/test_snprintf-test_snprintf.Po
 	-rm -f ./$(DEPDIR)/test_strncpy-test_strncpy.Po
 	-rm -f ./$(DEPDIR)/test_strtcpy-test_strtcpy.Po
+	-rm -f ./$(DEPDIR)/test_typetraits-test_typetraits.Po
 	-rm -f ./$(DEPDIR)/test_xasprintf-test_xasprintf.Po
-	-rm -f ./$(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -1646,19 +1678,20 @@ maintainer-clean: maintainer-clean-am
 		-rm -f ../../lib/$(DEPDIR)/test_adds-adds.Po
 	-rm -f ../../lib/$(DEPDIR)/test_chkname-chkname.Po
 	-rm -f ../../lib/$(DEPDIR)/test_logind-logind.Po
-	-rm -f ../../lib/atoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_sprintf-sprintf.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_strtcpy-strtcpy.Po
-	-rm -f ../../lib/string/$(DEPDIR)/test_xasprintf-sprintf.Po
+	-rm -f ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtoi.Po
+	-rm -f ../../lib/atoi/strtoi/$(DEPDIR)/test_atoi_strtoi-strtou_noneg.Po
+	-rm -f ../../lib/string/sprintf/$(DEPDIR)/test_snprintf-snprintf.Po
+	-rm -f ../../lib/string/sprintf/$(DEPDIR)/test_xasprintf-xasprintf.Po
+	-rm -f ../../lib/string/strcpy/$(DEPDIR)/test_strtcpy-strtcpy.Po
 	-rm -f ./$(DEPDIR)/test_adds-test_adds.Po
 	-rm -f ./$(DEPDIR)/test_atoi_strtoi-test_atoi_strtoi.Po
 	-rm -f ./$(DEPDIR)/test_chkname-test_chkname.Po
 	-rm -f ./$(DEPDIR)/test_logind-test_logind.Po
-	-rm -f ./$(DEPDIR)/test_sprintf-test_sprintf.Po
+	-rm -f ./$(DEPDIR)/test_snprintf-test_snprintf.Po
 	-rm -f ./$(DEPDIR)/test_strncpy-test_strncpy.Po
 	-rm -f ./$(DEPDIR)/test_strtcpy-test_strtcpy.Po
+	-rm -f ./$(DEPDIR)/test_typetraits-test_typetraits.Po
 	-rm -f ./$(DEPDIR)/test_xasprintf-test_xasprintf.Po
-	-rm -f ./$(DEPDIR)/test_zustr2stp-test_zustr2stp.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/tests/unit/test_atoi_strtoi.c b/tests/unit/test_atoi_strtoi.c
index 535b6ab7..782c8a4c 100644
--- a/tests/unit/test_atoi_strtoi.c
+++ b/tests/unit/test_atoi_strtoi.c
@@ -14,8 +14,8 @@
 #include <stdint.h>  // Required by <cmocka.h>
 #include <cmocka.h>
 
-#include "atoi/strtoi.h"
-#include "atoi/strtou_noneg.h"
+#include "atoi/strtoi/strtoi.h"
+#include "atoi/strtoi/strtou_noneg.h"
 
 
 static void test_strtoi(void **state);
@@ -46,6 +46,9 @@ test_strtoi(void **state)
 	assert_true(strtoi_("42", NULL, -1, 1, 2, &status) == 1);
 	assert_true(status == EINVAL);
 
+	assert_true(strtoi_("42", NULL, 1, 1, 2, &status) == 1);
+	assert_true(status == EINVAL);
+
 	assert_true(strtoi_("40", &end, 5, INTMAX_MIN, INTMAX_MAX, &status) == 20);
 	assert_true(status == 0);
 	assert_true(strcmp(end, "") == 0);
@@ -84,6 +87,9 @@ test_strtou(void **state)
 	assert_true(strtou_("42", NULL, -1, 1, 2, &status) == 1);
 	assert_true(status == EINVAL);
 
+	assert_true(strtou_("42", NULL, 1, 1, 2, &status) == 1);
+	assert_true(status == EINVAL);
+
 	assert_true(strtou_("40", &end, 5, 0, UINTMAX_MAX, &status) == 20);
 	assert_true(status == 0);
 	assert_true(strcmp(end, "") == 0);
@@ -123,6 +129,10 @@ test_strtou_noneg(void **state)
 	            == 1);
 	assert_true(status == EINVAL);
 
+	assert_true(strtou_noneg("42", NULL, 1, 1, 2, &status)
+	            == 1);
+	assert_true(status == EINVAL);
+
 	assert_true(strtou_noneg("40", &end, 5, 0, UINTMAX_MAX, &status)
 	            == 20);
 	assert_true(status == 0);
diff --git a/tests/unit/test_chkname.c b/tests/unit/test_chkname.c
index e0f9f84b..3f190a77 100644
--- a/tests/unit/test_chkname.c
+++ b/tests/unit/test_chkname.c
@@ -16,7 +16,7 @@
 #include <stdint.h>  // Required by <cmocka.h>
 #include <cmocka.h>
 
-#include "alloc.h"
+#include "alloc/malloc.h"
 #include "chkname.h"
 
 
@@ -139,10 +139,10 @@ test_is_valid_user_name_long(void **state)
 
 	memset(name, '_', max);
 
-	name[max] = '\0';
+	stpcpy(&name[max], "");
 	assert_true(false == is_valid_user_name(name));
 
-	name[max - 1] = '\0';
+	stpcpy(&name[max - 1], "");
 	assert_true(is_valid_user_name(name));
 
 	free(name);
diff --git a/tests/unit/test_sprintf.c b/tests/unit/test_snprintf.c
similarity index 97%
rename from tests/unit/test_sprintf.c
rename to tests/unit/test_snprintf.c
index bedcff6f..bdef8ac9 100644
--- a/tests/unit/test_sprintf.c
+++ b/tests/unit/test_snprintf.c
@@ -14,7 +14,7 @@
 #include <cmocka.h>
 
 #include "sizeof.h"
-#include "string/sprintf.h"
+#include "string/sprintf/snprintf.h"
 
 
 static void test_SNPRINTF_trunc(void **state);
diff --git a/tests/unit/test_strncpy.c b/tests/unit/test_strncpy.c
index 968765bb..dedd4e2b 100644
--- a/tests/unit/test_strncpy.c
+++ b/tests/unit/test_strncpy.c
@@ -15,7 +15,7 @@
 #include <cmocka.h>
 
 #include "sizeof.h"
-#include "string/strncpy.h"
+#include "string/strcpy/strncpy.h"
 
 
 static void test_STRNCPY_trunc(void **state);
diff --git a/tests/unit/test_strtcpy.c b/tests/unit/test_strtcpy.c
index 12351a53..c27d7c9d 100644
--- a/tests/unit/test_strtcpy.c
+++ b/tests/unit/test_strtcpy.c
@@ -15,7 +15,7 @@
 #include <cmocka.h>
 
 #include "sizeof.h"
-#include "string/strtcpy.h"
+#include "string/strcpy/strtcpy.h"
 
 
 static void test_STRTCPY_trunc(void **state);
diff --git a/tests/unit/test_typetraits.c b/tests/unit/test_typetraits.c
new file mode 100644
index 00000000..4aeb616b
--- /dev/null
+++ b/tests/unit/test_typetraits.c
@@ -0,0 +1,55 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include <stdarg.h>  // Required by <cmocka.h>
+#include <stddef.h>  // Required by <cmocka.h>
+#include <setjmp.h>  // Required by <cmocka.h>
+#include <stdint.h>  // Required by <cmocka.h>
+#include <cmocka.h>
+
+#include "typetraits.h"
+
+
+static void test_type_max(void **state);
+static void test_type_min(void **state);
+
+
+int
+main(void)
+{
+	const struct CMUnitTest  tests[] = {
+		cmocka_unit_test(test_type_max),
+		cmocka_unit_test(test_type_min),
+	};
+
+	return cmocka_run_group_tests(tests, NULL, NULL);
+}
+
+
+static void
+test_type_max(void **state)
+{
+	assert_true(type_max(long) == LONG_MAX);
+	assert_true(type_max(unsigned long) == ULONG_MAX);
+	assert_true(type_max(int) == INT_MAX);
+	assert_true(type_max(unsigned short) == USHRT_MAX);
+	assert_true(type_max(char) == CHAR_MAX);
+	assert_true(type_max(signed char) == SCHAR_MAX);
+	assert_true(type_max(unsigned char) == UCHAR_MAX);
+}
+
+
+static void
+test_type_min(void **state)
+{
+	assert_true(type_min(long) == LONG_MIN);
+	assert_true(type_min(unsigned long) == 0);
+	assert_true(type_min(int) == INT_MIN);
+	assert_true(type_min(unsigned short) == 0);
+	assert_true(type_min(char) == CHAR_MIN);
+	assert_true(type_min(signed char) == SCHAR_MIN);
+	assert_true(type_min(unsigned char) == 0);
+}
diff --git a/tests/unit/test_xasprintf.c b/tests/unit/test_xasprintf.c
index 4b5d0935..3f356689 100644
--- a/tests/unit/test_xasprintf.c
+++ b/tests/unit/test_xasprintf.c
@@ -5,6 +5,7 @@
 
 
 #include <setjmp.h>
+#include <stdarg.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
@@ -15,7 +16,7 @@
 #include <stdint.h>  // Required by <cmocka.h>
 #include <cmocka.h>
 
-#include "string/sprintf.h"
+#include "string/sprintf/xasprintf.h"
 
 
 #define assert_unreachable()  assert_true(0)
@@ -28,13 +29,29 @@
 static jmp_buf  jmpb;
 
 
-/**********************
- * WRAPPERS
- **********************/
 int __real_vasprintf(char **restrict p, const char *restrict fmt, va_list ap);
 int __wrap_vasprintf(char **restrict p, const char *restrict fmt, va_list ap);
 void __wrap_exit(int status);
 
+[[gnu::noipa]]
+static int xasprintf_volatile(char *volatile *restrict s,
+    const char *restrict fmt, ...);
+
+static void test_xasprintf_exit(void **state);
+static void test_xasprintf_ok(void **state);
+
+
+int
+main(void)
+{
+	const struct CMUnitTest  tests[] = {
+		cmocka_unit_test(test_xasprintf_exit),
+		cmocka_unit_test(test_xasprintf_ok),
+	};
+
+	return cmocka_run_group_tests(tests, NULL, NULL);
+}
+
 
 int
 __wrap_vasprintf(char **restrict p, const char *restrict fmt, va_list ap)
@@ -50,11 +67,16 @@ __wrap_exit(int status)
 }
 
 
-/**********************
- * TEST
- **********************/
-static void test_xasprintf_exit(void **state);
-static void test_xasprintf_ok(void **state);
+static int
+xasprintf_volatile(char *volatile *restrict s, const char *restrict fmt, ...)
+{
+	int      len;
+	va_list  ap;
+
+	va_start(ap, fmt);
+	len = xvasprintf((char **) s, fmt, ap);
+	va_end(ap);
+}
 
 
 static void
@@ -70,7 +92,7 @@ test_xasprintf_exit(void **state)
 	switch (setjmp(jmpb)) {
 	case 0:
 		len = XASPRINTF_CALLED;
-		len = xasprintf(&p, "foo%s", "bar");
+		len = xasprintf_volatile(&p, "foo%s", "bar");
 		assert_unreachable();
 		break;
 	case EXIT_CALLED:
@@ -100,15 +122,3 @@ test_xasprintf_ok(void **state)
 	assert_string_equal(p, "foo1bar");
 	free(p);
 }
-
-
-int
-main(void)
-{
-    const struct CMUnitTest  tests[] = {
-        cmocka_unit_test(test_xasprintf_exit),
-        cmocka_unit_test(test_xasprintf_ok),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
diff --git a/tests/unit/test_zustr2stp.c b/tests/unit/test_zustr2stp.c
deleted file mode 100644
index 198d2eb6..00000000
--- a/tests/unit/test_zustr2stp.c
+++ /dev/null
@@ -1,53 +0,0 @@
-// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
-// SPDX-License-Identifier: BSD-3-Clause
-
-
-#include <config.h>
-
-#include <stddef.h>
-#include <string.h>
-
-#include <stdarg.h>  // Required by <cmocka.h>
-#include <stddef.h>  // Required by <cmocka.h>
-#include <setjmp.h>  // Required by <cmocka.h>
-#include <stdint.h>  // Required by <cmocka.h>
-#include <cmocka.h>
-
-#include "string/zustr2stp.h"
-
-
-static void test_ZUSTR2STP(void **state);
-
-
-int
-main(void)
-{
-    const struct CMUnitTest  tests[] = {
-        cmocka_unit_test(test_ZUSTR2STP),
-    };
-
-    return cmocka_run_group_tests(tests, NULL, NULL);
-}
-
-
-static void
-test_ZUSTR2STP(void **state)
-{
-	char  src[3] = {'1', '2', '3'};
-	char  dst[4];
-
-	assert_true(ZUSTR2STP(&dst, src) == dst + strlen("123"));
-	assert_true(strcmp("123", dst) == 0);
-
-	src[2] = '\0';
-	assert_true(ZUSTR2STP(&dst, src) == dst + strlen("12"));
-	assert_true(strcmp("12", dst) == 0);
-
-	src[1] = '\0';
-	assert_true(ZUSTR2STP(&dst, src) == dst + strlen("1"));
-	assert_true(strcmp("1", dst) == 0);
-
-	src[0] = '\0';
-	assert_true(ZUSTR2STP(&dst, src) == dst + strlen(""));
-	assert_true(strcmp("", dst) == 0);
-}
diff --git a/tests/tests/usertools/01/01_useradd_add_user.test b/tests/usertools/01/01_useradd_add_user.test
similarity index 100%
rename from tests/tests/usertools/01/01_useradd_add_user.test
rename to tests/usertools/01/01_useradd_add_user.test
diff --git a/tests/tests/usertools/01/01_useradd_add_user/group b/tests/usertools/01/01_useradd_add_user/group
similarity index 100%
rename from tests/tests/usertools/01/01_useradd_add_user/group
rename to tests/usertools/01/01_useradd_add_user/group
diff --git a/tests/tests/usertools/01/01_useradd_add_user/gshadow b/tests/usertools/01/01_useradd_add_user/gshadow
similarity index 100%
rename from tests/tests/usertools/01/01_useradd_add_user/gshadow
rename to tests/usertools/01/01_useradd_add_user/gshadow
diff --git a/tests/tests/usertools/01/01_useradd_add_user/passwd b/tests/usertools/01/01_useradd_add_user/passwd
similarity index 100%
rename from tests/tests/usertools/01/01_useradd_add_user/passwd
rename to tests/usertools/01/01_useradd_add_user/passwd
diff --git a/tests/tests/usertools/01/01_useradd_add_user/shadow b/tests/usertools/01/01_useradd_add_user/shadow
similarity index 100%
rename from tests/tests/usertools/01/01_useradd_add_user/shadow
rename to tests/usertools/01/01_useradd_add_user/shadow
diff --git a/tests/tests/usertools/01/01_userdel_delete_user.test b/tests/usertools/01/01_userdel_delete_user.test
similarity index 100%
rename from tests/tests/usertools/01/01_userdel_delete_user.test
rename to tests/usertools/01/01_userdel_delete_user.test
diff --git a/tests/tests/usertools/01/02_useradd_recreate_deleted_user.test b/tests/usertools/01/02_useradd_recreate_deleted_user.test
similarity index 100%
rename from tests/tests/usertools/01/02_useradd_recreate_deleted_user.test
rename to tests/usertools/01/02_useradd_recreate_deleted_user.test
diff --git a/tests/tests/usertools/01/02_useradd_recreate_deleted_user/group b/tests/usertools/01/02_useradd_recreate_deleted_user/group
similarity index 100%
rename from tests/tests/usertools/01/02_useradd_recreate_deleted_user/group
rename to tests/usertools/01/02_useradd_recreate_deleted_user/group
diff --git a/tests/tests/usertools/01/02_useradd_recreate_deleted_user/gshadow b/tests/usertools/01/02_useradd_recreate_deleted_user/gshadow
similarity index 100%
rename from tests/tests/usertools/01/02_useradd_recreate_deleted_user/gshadow
rename to tests/usertools/01/02_useradd_recreate_deleted_user/gshadow
diff --git a/tests/tests/usertools/01/02_useradd_recreate_deleted_user/passwd b/tests/usertools/01/02_useradd_recreate_deleted_user/passwd
similarity index 100%
rename from tests/tests/usertools/01/02_useradd_recreate_deleted_user/passwd
rename to tests/usertools/01/02_useradd_recreate_deleted_user/passwd
diff --git a/tests/tests/usertools/01/02_useradd_recreate_deleted_user/shadow b/tests/usertools/01/02_useradd_recreate_deleted_user/shadow
similarity index 100%
rename from tests/tests/usertools/01/02_useradd_recreate_deleted_user/shadow
rename to tests/usertools/01/02_useradd_recreate_deleted_user/shadow
diff --git a/tests/tests/usertools/01/03_useradd_additional_options.test b/tests/usertools/01/03_useradd_additional_options.test
similarity index 100%
rename from tests/tests/usertools/01/03_useradd_additional_options.test
rename to tests/usertools/01/03_useradd_additional_options.test
diff --git a/tests/tests/usertools/01/03_useradd_additional_options/group b/tests/usertools/01/03_useradd_additional_options/group
similarity index 100%
rename from tests/tests/usertools/01/03_useradd_additional_options/group
rename to tests/usertools/01/03_useradd_additional_options/group
diff --git a/tests/tests/usertools/01/03_useradd_additional_options/gshadow b/tests/usertools/01/03_useradd_additional_options/gshadow
similarity index 100%
rename from tests/tests/usertools/01/03_useradd_additional_options/gshadow
rename to tests/usertools/01/03_useradd_additional_options/gshadow
diff --git a/tests/tests/usertools/01/03_useradd_additional_options/passwd b/tests/usertools/01/03_useradd_additional_options/passwd
similarity index 100%
rename from tests/tests/usertools/01/03_useradd_additional_options/passwd
rename to tests/usertools/01/03_useradd_additional_options/passwd
diff --git a/tests/tests/usertools/01/03_useradd_additional_options/shadow b/tests/usertools/01/03_useradd_additional_options/shadow
similarity index 100%
rename from tests/tests/usertools/01/03_useradd_additional_options/shadow
rename to tests/usertools/01/03_useradd_additional_options/shadow
diff --git a/tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail.test b/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail.test
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail.test
rename to tests/usertools/01/04_useradd_add_user_with_existing_UID_fail.test
diff --git a/tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/group b/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/group
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/group
rename to tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/group
diff --git a/tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/gshadow b/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/gshadow
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/gshadow
rename to tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/gshadow
diff --git a/tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/passwd b/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/passwd
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/passwd
rename to tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/passwd
diff --git a/tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/shadow b/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/shadow
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/shadow
rename to tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/shadow
diff --git a/tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/useradd.err b/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/useradd.err
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/useradd.err
rename to tests/usertools/01/04_useradd_add_user_with_existing_UID_fail/useradd.err
diff --git a/tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o.test b/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o.test
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o.test
rename to tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o.test
diff --git a/tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/group b/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/group
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/group
rename to tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/group
diff --git a/tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/gshadow b/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/gshadow
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/gshadow
rename to tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/gshadow
diff --git a/tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/passwd b/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/passwd
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/passwd
rename to tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/passwd
diff --git a/tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/shadow b/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/shadow
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/shadow
rename to tests/usertools/01/04_useradd_add_user_with_existing_UID_with_-o/shadow
diff --git a/tests/tests/usertools/01/04_useradd_specified_UID.test b/tests/usertools/01/04_useradd_specified_UID.test
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_specified_UID.test
rename to tests/usertools/01/04_useradd_specified_UID.test
diff --git a/tests/tests/usertools/01/04_useradd_specified_UID/group b/tests/usertools/01/04_useradd_specified_UID/group
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_specified_UID/group
rename to tests/usertools/01/04_useradd_specified_UID/group
diff --git a/tests/tests/usertools/01/04_useradd_specified_UID/gshadow b/tests/usertools/01/04_useradd_specified_UID/gshadow
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_specified_UID/gshadow
rename to tests/usertools/01/04_useradd_specified_UID/gshadow
diff --git a/tests/tests/usertools/01/04_useradd_specified_UID/passwd b/tests/usertools/01/04_useradd_specified_UID/passwd
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_specified_UID/passwd
rename to tests/usertools/01/04_useradd_specified_UID/passwd
diff --git a/tests/tests/usertools/01/04_useradd_specified_UID/shadow b/tests/usertools/01/04_useradd_specified_UID/shadow
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_specified_UID/shadow
rename to tests/usertools/01/04_useradd_specified_UID/shadow
diff --git a/tests/tests/usertools/01/04_useradd_specified_UID_and_GID.test b/tests/usertools/01/04_useradd_specified_UID_and_GID.test
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_specified_UID_and_GID.test
rename to tests/usertools/01/04_useradd_specified_UID_and_GID.test
diff --git a/tests/tests/usertools/01/04_useradd_specified_UID_and_GID/group b/tests/usertools/01/04_useradd_specified_UID_and_GID/group
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_specified_UID_and_GID/group
rename to tests/usertools/01/04_useradd_specified_UID_and_GID/group
diff --git a/tests/tests/usertools/01/04_useradd_specified_UID_and_GID/gshadow b/tests/usertools/01/04_useradd_specified_UID_and_GID/gshadow
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_specified_UID_and_GID/gshadow
rename to tests/usertools/01/04_useradd_specified_UID_and_GID/gshadow
diff --git a/tests/tests/usertools/01/04_useradd_specified_UID_and_GID/passwd b/tests/usertools/01/04_useradd_specified_UID_and_GID/passwd
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_specified_UID_and_GID/passwd
rename to tests/usertools/01/04_useradd_specified_UID_and_GID/passwd
diff --git a/tests/tests/usertools/01/04_useradd_specified_UID_and_GID/shadow b/tests/usertools/01/04_useradd_specified_UID_and_GID/shadow
similarity index 100%
rename from tests/tests/usertools/01/04_useradd_specified_UID_and_GID/shadow
rename to tests/usertools/01/04_useradd_specified_UID_and_GID/shadow
diff --git a/tests/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID.test b/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID.test
similarity index 100%
rename from tests/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID.test
rename to tests/usertools/01/04_userdel_delete_user_with_non_unique_UID.test
diff --git a/tests/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/group b/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/group
similarity index 100%
rename from tests/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/group
rename to tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/group
diff --git a/tests/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/gshadow b/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/gshadow
similarity index 100%
rename from tests/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/gshadow
rename to tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/gshadow
diff --git a/tests/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/passwd b/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/passwd
similarity index 100%
rename from tests/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/passwd
rename to tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/passwd
diff --git a/tests/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/shadow b/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/shadow
similarity index 100%
rename from tests/tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/shadow
rename to tests/usertools/01/04_userdel_delete_user_with_non_unique_UID/shadow
diff --git a/tests/tests/usertools/01/05_useradd_invalid_numeric_primary_group.test b/tests/usertools/01/05_useradd_invalid_numeric_primary_group.test
similarity index 100%
rename from tests/tests/usertools/01/05_useradd_invalid_numeric_primary_group.test
rename to tests/usertools/01/05_useradd_invalid_numeric_primary_group.test
diff --git a/tests/tests/usertools/01/05_useradd_invalid_numeric_primary_group/useradd.err b/tests/usertools/01/05_useradd_invalid_numeric_primary_group/useradd.err
similarity index 100%
rename from tests/tests/usertools/01/05_useradd_invalid_numeric_primary_group/useradd.err
rename to tests/usertools/01/05_useradd_invalid_numeric_primary_group/useradd.err
diff --git a/tests/tests/usertools/01/06_useradd_invalid_named_primary_group.test b/tests/usertools/01/06_useradd_invalid_named_primary_group.test
similarity index 100%
rename from tests/tests/usertools/01/06_useradd_invalid_named_primary_group.test
rename to tests/usertools/01/06_useradd_invalid_named_primary_group.test
diff --git a/tests/tests/usertools/01/06_useradd_invalid_named_primary_group/useradd.err b/tests/usertools/01/06_useradd_invalid_named_primary_group/useradd.err
similarity index 100%
rename from tests/tests/usertools/01/06_useradd_invalid_named_primary_group/useradd.err
rename to tests/usertools/01/06_useradd_invalid_named_primary_group/useradd.err
diff --git a/tests/tests/usertools/01/07_useradd_numerical_primary_group.test b/tests/usertools/01/07_useradd_numerical_primary_group.test
similarity index 100%
rename from tests/tests/usertools/01/07_useradd_numerical_primary_group.test
rename to tests/usertools/01/07_useradd_numerical_primary_group.test
diff --git a/tests/tests/subids/71_useradd_subids_for_system/config/etc/group b/tests/usertools/01/07_useradd_numerical_primary_group/group
similarity index 100%
rename from tests/tests/subids/71_useradd_subids_for_system/config/etc/group
rename to tests/usertools/01/07_useradd_numerical_primary_group/group
diff --git a/tests/tests/subids/71_useradd_subids_for_system/config/etc/gshadow b/tests/usertools/01/07_useradd_numerical_primary_group/gshadow
similarity index 100%
rename from tests/tests/subids/71_useradd_subids_for_system/config/etc/gshadow
rename to tests/usertools/01/07_useradd_numerical_primary_group/gshadow
diff --git a/tests/tests/usertools/01/07_useradd_numerical_primary_group/passwd b/tests/usertools/01/07_useradd_numerical_primary_group/passwd
similarity index 100%
rename from tests/tests/usertools/01/07_useradd_numerical_primary_group/passwd
rename to tests/usertools/01/07_useradd_numerical_primary_group/passwd
diff --git a/tests/tests/usertools/01/07_useradd_numerical_primary_group/shadow b/tests/usertools/01/07_useradd_numerical_primary_group/shadow
similarity index 100%
rename from tests/tests/usertools/01/07_useradd_numerical_primary_group/shadow
rename to tests/usertools/01/07_useradd_numerical_primary_group/shadow
diff --git a/tests/tests/usertools/01/08_useradd_named_primary_group.test b/tests/usertools/01/08_useradd_named_primary_group.test
similarity index 100%
rename from tests/tests/usertools/01/08_useradd_named_primary_group.test
rename to tests/usertools/01/08_useradd_named_primary_group.test
diff --git a/tests/tests/usertools/01/07_useradd_numerical_primary_group/group b/tests/usertools/01/08_useradd_named_primary_group/group
similarity index 100%
rename from tests/tests/usertools/01/07_useradd_numerical_primary_group/group
rename to tests/usertools/01/08_useradd_named_primary_group/group
diff --git a/tests/tests/usertools/01/07_useradd_numerical_primary_group/gshadow b/tests/usertools/01/08_useradd_named_primary_group/gshadow
similarity index 100%
rename from tests/tests/usertools/01/07_useradd_numerical_primary_group/gshadow
rename to tests/usertools/01/08_useradd_named_primary_group/gshadow
diff --git a/tests/tests/usertools/01/08_useradd_named_primary_group/passwd b/tests/usertools/01/08_useradd_named_primary_group/passwd
similarity index 100%
rename from tests/tests/usertools/01/08_useradd_named_primary_group/passwd
rename to tests/usertools/01/08_useradd_named_primary_group/passwd
diff --git a/tests/tests/usertools/01/08_useradd_named_primary_group/shadow b/tests/usertools/01/08_useradd_named_primary_group/shadow
similarity index 100%
rename from tests/tests/usertools/01/08_useradd_named_primary_group/shadow
rename to tests/usertools/01/08_useradd_named_primary_group/shadow
diff --git a/tests/tests/usertools/01/09_usermod_change_user_info.test b/tests/usertools/01/09_usermod_change_user_info.test
similarity index 100%
rename from tests/tests/usertools/01/09_usermod_change_user_info.test
rename to tests/usertools/01/09_usermod_change_user_info.test
diff --git a/tests/tests/usertools/01/09_usermod_change_user_info/group b/tests/usertools/01/09_usermod_change_user_info/group
similarity index 100%
rename from tests/tests/usertools/01/09_usermod_change_user_info/group
rename to tests/usertools/01/09_usermod_change_user_info/group
diff --git a/tests/tests/usertools/01/09_usermod_change_user_info/gshadow b/tests/usertools/01/09_usermod_change_user_info/gshadow
similarity index 100%
rename from tests/tests/usertools/01/09_usermod_change_user_info/gshadow
rename to tests/usertools/01/09_usermod_change_user_info/gshadow
diff --git a/tests/tests/usertools/01/09_usermod_change_user_info/passwd b/tests/usertools/01/09_usermod_change_user_info/passwd
similarity index 100%
rename from tests/tests/usertools/01/09_usermod_change_user_info/passwd
rename to tests/usertools/01/09_usermod_change_user_info/passwd
diff --git a/tests/tests/usertools/01/09_usermod_change_user_info/shadow b/tests/usertools/01/09_usermod_change_user_info/shadow
similarity index 100%
rename from tests/tests/usertools/01/09_usermod_change_user_info/shadow
rename to tests/usertools/01/09_usermod_change_user_info/shadow
diff --git a/tests/tests/usertools/01/10_usermod_rename_user.test b/tests/usertools/01/10_usermod_rename_user.test
similarity index 100%
rename from tests/tests/usertools/01/10_usermod_rename_user.test
rename to tests/usertools/01/10_usermod_rename_user.test
diff --git a/tests/tests/usertools/01/10_usermod_rename_user/group b/tests/usertools/01/10_usermod_rename_user/group
similarity index 100%
rename from tests/tests/usertools/01/10_usermod_rename_user/group
rename to tests/usertools/01/10_usermod_rename_user/group
diff --git a/tests/tests/usertools/01/10_usermod_rename_user/gshadow b/tests/usertools/01/10_usermod_rename_user/gshadow
similarity index 100%
rename from tests/tests/usertools/01/10_usermod_rename_user/gshadow
rename to tests/usertools/01/10_usermod_rename_user/gshadow
diff --git a/tests/tests/usertools/01/10_usermod_rename_user/passwd b/tests/usertools/01/10_usermod_rename_user/passwd
similarity index 100%
rename from tests/tests/usertools/01/10_usermod_rename_user/passwd
rename to tests/usertools/01/10_usermod_rename_user/passwd
diff --git a/tests/tests/usertools/01/10_usermod_rename_user/shadow b/tests/usertools/01/10_usermod_rename_user/shadow
similarity index 100%
rename from tests/tests/usertools/01/10_usermod_rename_user/shadow
rename to tests/usertools/01/10_usermod_rename_user/shadow
diff --git a/tests/tests/usertools/01/10_usermod_rename_user_in_group.test b/tests/usertools/01/10_usermod_rename_user_in_group.test
similarity index 100%
rename from tests/tests/usertools/01/10_usermod_rename_user_in_group.test
rename to tests/usertools/01/10_usermod_rename_user_in_group.test
diff --git a/tests/tests/usertools/01/10_usermod_rename_user_in_group/group b/tests/usertools/01/10_usermod_rename_user_in_group/group
similarity index 100%
rename from tests/tests/usertools/01/10_usermod_rename_user_in_group/group
rename to tests/usertools/01/10_usermod_rename_user_in_group/group
diff --git a/tests/tests/usertools/01/10_usermod_rename_user_in_group/gshadow b/tests/usertools/01/10_usermod_rename_user_in_group/gshadow
similarity index 100%
rename from tests/tests/usertools/01/10_usermod_rename_user_in_group/gshadow
rename to tests/usertools/01/10_usermod_rename_user_in_group/gshadow
diff --git a/tests/tests/usertools/01/10_usermod_rename_user_in_group/passwd b/tests/usertools/01/10_usermod_rename_user_in_group/passwd
similarity index 100%
rename from tests/tests/usertools/01/10_usermod_rename_user_in_group/passwd
rename to tests/usertools/01/10_usermod_rename_user_in_group/passwd
diff --git a/tests/tests/usertools/01/10_usermod_rename_user_in_group/shadow b/tests/usertools/01/10_usermod_rename_user_in_group/shadow
similarity index 100%
rename from tests/tests/usertools/01/10_usermod_rename_user_in_group/shadow
rename to tests/usertools/01/10_usermod_rename_user_in_group/shadow
diff --git a/tests/tests/usertools/01/11_usermod_change_password.test b/tests/usertools/01/11_usermod_change_password.test
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_change_password.test
rename to tests/usertools/01/11_usermod_change_password.test
diff --git a/tests/tests/usertools/01/11_usermod_change_password/group b/tests/usertools/01/11_usermod_change_password/group
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_change_password/group
rename to tests/usertools/01/11_usermod_change_password/group
diff --git a/tests/tests/usertools/01/11_usermod_change_password/gshadow b/tests/usertools/01/11_usermod_change_password/gshadow
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_change_password/gshadow
rename to tests/usertools/01/11_usermod_change_password/gshadow
diff --git a/tests/tests/usertools/01/11_usermod_change_password/passwd b/tests/usertools/01/11_usermod_change_password/passwd
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_change_password/passwd
rename to tests/usertools/01/11_usermod_change_password/passwd
diff --git a/tests/tests/usertools/01/11_usermod_change_password/shadow b/tests/usertools/01/11_usermod_change_password/shadow
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_change_password/shadow
rename to tests/usertools/01/11_usermod_change_password/shadow
diff --git a/tests/tests/usertools/01/11_usermod_lock_password.test b/tests/usertools/01/11_usermod_lock_password.test
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_lock_password.test
rename to tests/usertools/01/11_usermod_lock_password.test
diff --git a/tests/tests/usertools/01/11_usermod_lock_password/group b/tests/usertools/01/11_usermod_lock_password/group
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_lock_password/group
rename to tests/usertools/01/11_usermod_lock_password/group
diff --git a/tests/tests/usertools/01/11_usermod_lock_password/gshadow b/tests/usertools/01/11_usermod_lock_password/gshadow
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_lock_password/gshadow
rename to tests/usertools/01/11_usermod_lock_password/gshadow
diff --git a/tests/tests/usertools/01/11_usermod_lock_password/passwd b/tests/usertools/01/11_usermod_lock_password/passwd
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_lock_password/passwd
rename to tests/usertools/01/11_usermod_lock_password/passwd
diff --git a/tests/tests/usertools/01/11_usermod_lock_password/shadow b/tests/usertools/01/11_usermod_lock_password/shadow
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_lock_password/shadow
rename to tests/usertools/01/11_usermod_lock_password/shadow
diff --git a/tests/tests/usertools/01/11_usermod_unlock_empty_password.test b/tests/usertools/01/11_usermod_unlock_empty_password.test
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_unlock_empty_password.test
rename to tests/usertools/01/11_usermod_unlock_empty_password.test
diff --git a/tests/tests/usertools/01/11_usermod_unlock_empty_password/group b/tests/usertools/01/11_usermod_unlock_empty_password/group
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_unlock_empty_password/group
rename to tests/usertools/01/11_usermod_unlock_empty_password/group
diff --git a/tests/tests/usertools/01/11_usermod_unlock_empty_password/gshadow b/tests/usertools/01/11_usermod_unlock_empty_password/gshadow
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_unlock_empty_password/gshadow
rename to tests/usertools/01/11_usermod_unlock_empty_password/gshadow
diff --git a/tests/tests/usertools/01/11_usermod_unlock_empty_password/passwd b/tests/usertools/01/11_usermod_unlock_empty_password/passwd
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_unlock_empty_password/passwd
rename to tests/usertools/01/11_usermod_unlock_empty_password/passwd
diff --git a/tests/tests/usertools/01/11_usermod_unlock_empty_password/shadow b/tests/usertools/01/11_usermod_unlock_empty_password/shadow
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_unlock_empty_password/shadow
rename to tests/usertools/01/11_usermod_unlock_empty_password/shadow
diff --git a/tests/tests/usertools/01/11_usermod_unlock_empty_password/usermod.err b/tests/usertools/01/11_usermod_unlock_empty_password/usermod.err
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_unlock_empty_password/usermod.err
rename to tests/usertools/01/11_usermod_unlock_empty_password/usermod.err
diff --git a/tests/tests/usertools/01/11_usermod_unlock_password.test b/tests/usertools/01/11_usermod_unlock_password.test
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_unlock_password.test
rename to tests/usertools/01/11_usermod_unlock_password.test
diff --git a/tests/tests/usertools/01/11_usermod_unlock_password/group b/tests/usertools/01/11_usermod_unlock_password/group
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_unlock_password/group
rename to tests/usertools/01/11_usermod_unlock_password/group
diff --git a/tests/tests/usertools/01/11_usermod_unlock_password/gshadow b/tests/usertools/01/11_usermod_unlock_password/gshadow
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_unlock_password/gshadow
rename to tests/usertools/01/11_usermod_unlock_password/gshadow
diff --git a/tests/tests/usertools/01/11_usermod_unlock_password/passwd b/tests/usertools/01/11_usermod_unlock_password/passwd
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_unlock_password/passwd
rename to tests/usertools/01/11_usermod_unlock_password/passwd
diff --git a/tests/tests/usertools/01/11_usermod_unlock_password/shadow b/tests/usertools/01/11_usermod_unlock_password/shadow
similarity index 100%
rename from tests/tests/usertools/01/11_usermod_unlock_password/shadow
rename to tests/usertools/01/11_usermod_unlock_password/shadow
diff --git a/tests/tests/usertools/01/12_usermod_change_gid_name.test b/tests/usertools/01/12_usermod_change_gid_name.test
similarity index 100%
rename from tests/tests/usertools/01/12_usermod_change_gid_name.test
rename to tests/usertools/01/12_usermod_change_gid_name.test
diff --git a/tests/tests/usertools/01/12_usermod_change_gid_name/group b/tests/usertools/01/12_usermod_change_gid_name/group
similarity index 100%
rename from tests/tests/usertools/01/12_usermod_change_gid_name/group
rename to tests/usertools/01/12_usermod_change_gid_name/group
diff --git a/tests/tests/usertools/01/12_usermod_change_gid_name/gshadow b/tests/usertools/01/12_usermod_change_gid_name/gshadow
similarity index 100%
rename from tests/tests/usertools/01/12_usermod_change_gid_name/gshadow
rename to tests/usertools/01/12_usermod_change_gid_name/gshadow
diff --git a/tests/tests/usertools/01/12_usermod_change_gid_name/passwd b/tests/usertools/01/12_usermod_change_gid_name/passwd
similarity index 100%
rename from tests/tests/usertools/01/12_usermod_change_gid_name/passwd
rename to tests/usertools/01/12_usermod_change_gid_name/passwd
diff --git a/tests/tests/usertools/01/12_usermod_change_gid_name/shadow b/tests/usertools/01/12_usermod_change_gid_name/shadow
similarity index 100%
rename from tests/tests/usertools/01/12_usermod_change_gid_name/shadow
rename to tests/usertools/01/12_usermod_change_gid_name/shadow
diff --git a/tests/tests/usertools/01/12_usermod_change_gid_number.test b/tests/usertools/01/12_usermod_change_gid_number.test
similarity index 100%
rename from tests/tests/usertools/01/12_usermod_change_gid_number.test
rename to tests/usertools/01/12_usermod_change_gid_number.test
diff --git a/tests/tests/usertools/01/12_usermod_change_gid_number/group b/tests/usertools/01/12_usermod_change_gid_number/group
similarity index 100%
rename from tests/tests/usertools/01/12_usermod_change_gid_number/group
rename to tests/usertools/01/12_usermod_change_gid_number/group
diff --git a/tests/tests/usertools/01/12_usermod_change_gid_number/gshadow b/tests/usertools/01/12_usermod_change_gid_number/gshadow
similarity index 100%
rename from tests/tests/usertools/01/12_usermod_change_gid_number/gshadow
rename to tests/usertools/01/12_usermod_change_gid_number/gshadow
diff --git a/tests/tests/usertools/01/12_usermod_change_gid_number/passwd b/tests/usertools/01/12_usermod_change_gid_number/passwd
similarity index 100%
rename from tests/tests/usertools/01/12_usermod_change_gid_number/passwd
rename to tests/usertools/01/12_usermod_change_gid_number/passwd
diff --git a/tests/tests/usertools/01/12_usermod_change_gid_number/shadow b/tests/usertools/01/12_usermod_change_gid_number/shadow
similarity index 100%
rename from tests/tests/usertools/01/12_usermod_change_gid_number/shadow
rename to tests/usertools/01/12_usermod_change_gid_number/shadow
diff --git a/tests/tests/usertools/01/13_useradd_negative_UID.test b/tests/usertools/01/13_useradd_negative_UID.test
similarity index 100%
rename from tests/tests/usertools/01/13_useradd_negative_UID.test
rename to tests/usertools/01/13_useradd_negative_UID.test
diff --git a/tests/tests/usertools/01/08_useradd_named_primary_group/group b/tests/usertools/01/13_useradd_negative_UID/group
similarity index 100%
rename from tests/tests/usertools/01/08_useradd_named_primary_group/group
rename to tests/usertools/01/13_useradd_negative_UID/group
diff --git a/tests/tests/usertools/01/08_useradd_named_primary_group/gshadow b/tests/usertools/01/13_useradd_negative_UID/gshadow
similarity index 100%
rename from tests/tests/usertools/01/08_useradd_named_primary_group/gshadow
rename to tests/usertools/01/13_useradd_negative_UID/gshadow
diff --git a/tests/tests/subids/71_useradd_subids_for_system/config/etc/passwd b/tests/usertools/01/13_useradd_negative_UID/passwd
similarity index 100%
rename from tests/tests/subids/71_useradd_subids_for_system/config/etc/passwd
rename to tests/usertools/01/13_useradd_negative_UID/passwd
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/data/shadow b/tests/usertools/01/13_useradd_negative_UID/shadow
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/data/shadow
rename to tests/usertools/01/13_useradd_negative_UID/shadow
diff --git a/tests/tests/usertools/01/14_useradd_out_of_range_UID.test b/tests/usertools/01/14_useradd_out_of_range_UID.test
similarity index 100%
rename from tests/tests/usertools/01/14_useradd_out_of_range_UID.test
rename to tests/usertools/01/14_useradd_out_of_range_UID.test
diff --git a/tests/tests/usertools/01/13_useradd_negative_UID/group b/tests/usertools/01/14_useradd_out_of_range_UID/group
similarity index 100%
rename from tests/tests/usertools/01/13_useradd_negative_UID/group
rename to tests/usertools/01/14_useradd_out_of_range_UID/group
diff --git a/tests/tests/usertools/01/13_useradd_negative_UID/gshadow b/tests/usertools/01/14_useradd_out_of_range_UID/gshadow
similarity index 100%
rename from tests/tests/usertools/01/13_useradd_negative_UID/gshadow
rename to tests/usertools/01/14_useradd_out_of_range_UID/gshadow
diff --git a/tests/tests/usertools/01/13_useradd_negative_UID/passwd b/tests/usertools/01/14_useradd_out_of_range_UID/passwd
similarity index 100%
rename from tests/tests/usertools/01/13_useradd_negative_UID/passwd
rename to tests/usertools/01/14_useradd_out_of_range_UID/passwd
diff --git a/tests/tests/usertools/01/13_useradd_negative_UID/shadow b/tests/usertools/01/14_useradd_out_of_range_UID/shadow
similarity index 100%
rename from tests/tests/usertools/01/13_useradd_negative_UID/shadow
rename to tests/usertools/01/14_useradd_out_of_range_UID/shadow
diff --git a/tests/tests/usertools/01/15_useradd_specified_large_UID.test b/tests/usertools/01/15_useradd_specified_large_UID.test
similarity index 100%
rename from tests/tests/usertools/01/15_useradd_specified_large_UID.test
rename to tests/usertools/01/15_useradd_specified_large_UID.test
diff --git a/tests/tests/usertools/01/15_useradd_specified_large_UID/group b/tests/usertools/01/15_useradd_specified_large_UID/group
similarity index 100%
rename from tests/tests/usertools/01/15_useradd_specified_large_UID/group
rename to tests/usertools/01/15_useradd_specified_large_UID/group
diff --git a/tests/tests/usertools/01/15_useradd_specified_large_UID/gshadow b/tests/usertools/01/15_useradd_specified_large_UID/gshadow
similarity index 100%
rename from tests/tests/usertools/01/15_useradd_specified_large_UID/gshadow
rename to tests/usertools/01/15_useradd_specified_large_UID/gshadow
diff --git a/tests/tests/usertools/01/15_useradd_specified_large_UID/passwd b/tests/usertools/01/15_useradd_specified_large_UID/passwd
similarity index 100%
rename from tests/tests/usertools/01/15_useradd_specified_large_UID/passwd
rename to tests/usertools/01/15_useradd_specified_large_UID/passwd
diff --git a/tests/tests/usertools/01/15_useradd_specified_large_UID/shadow b/tests/usertools/01/15_useradd_specified_large_UID/shadow
similarity index 100%
rename from tests/tests/usertools/01/15_useradd_specified_large_UID/shadow
rename to tests/usertools/01/15_useradd_specified_large_UID/shadow
diff --git a/tests/tests/usertools/01/16_useradd_add_user_to_multiple_groups.test b/tests/usertools/01/16_useradd_add_user_to_multiple_groups.test
similarity index 100%
rename from tests/tests/usertools/01/16_useradd_add_user_to_multiple_groups.test
rename to tests/usertools/01/16_useradd_add_user_to_multiple_groups.test
diff --git a/tests/tests/usertools/01/16_useradd_add_user_to_multiple_groups/group b/tests/usertools/01/16_useradd_add_user_to_multiple_groups/group
similarity index 100%
rename from tests/tests/usertools/01/16_useradd_add_user_to_multiple_groups/group
rename to tests/usertools/01/16_useradd_add_user_to_multiple_groups/group
diff --git a/tests/tests/usertools/01/16_useradd_add_user_to_multiple_groups/gshadow b/tests/usertools/01/16_useradd_add_user_to_multiple_groups/gshadow
similarity index 100%
rename from tests/tests/usertools/01/16_useradd_add_user_to_multiple_groups/gshadow
rename to tests/usertools/01/16_useradd_add_user_to_multiple_groups/gshadow
diff --git a/tests/tests/usertools/01/16_useradd_add_user_to_multiple_groups/passwd b/tests/usertools/01/16_useradd_add_user_to_multiple_groups/passwd
similarity index 100%
rename from tests/tests/usertools/01/16_useradd_add_user_to_multiple_groups/passwd
rename to tests/usertools/01/16_useradd_add_user_to_multiple_groups/passwd
diff --git a/tests/tests/usertools/01/16_useradd_add_user_to_multiple_groups/shadow b/tests/usertools/01/16_useradd_add_user_to_multiple_groups/shadow
similarity index 100%
rename from tests/tests/usertools/01/16_useradd_add_user_to_multiple_groups/shadow
rename to tests/usertools/01/16_useradd_add_user_to_multiple_groups/shadow
diff --git a/tests/tests/usertools/01/16_useradd_add_user_to_one_group.test b/tests/usertools/01/16_useradd_add_user_to_one_group.test
similarity index 100%
rename from tests/tests/usertools/01/16_useradd_add_user_to_one_group.test
rename to tests/usertools/01/16_useradd_add_user_to_one_group.test
diff --git a/tests/tests/usertools/01/16_useradd_add_user_to_one_group/group b/tests/usertools/01/16_useradd_add_user_to_one_group/group
similarity index 100%
rename from tests/tests/usertools/01/16_useradd_add_user_to_one_group/group
rename to tests/usertools/01/16_useradd_add_user_to_one_group/group
diff --git a/tests/tests/usertools/01/16_useradd_add_user_to_one_group/gshadow b/tests/usertools/01/16_useradd_add_user_to_one_group/gshadow
similarity index 100%
rename from tests/tests/usertools/01/16_useradd_add_user_to_one_group/gshadow
rename to tests/usertools/01/16_useradd_add_user_to_one_group/gshadow
diff --git a/tests/tests/usertools/01/16_useradd_add_user_to_one_group/passwd b/tests/usertools/01/16_useradd_add_user_to_one_group/passwd
similarity index 100%
rename from tests/tests/usertools/01/16_useradd_add_user_to_one_group/passwd
rename to tests/usertools/01/16_useradd_add_user_to_one_group/passwd
diff --git a/tests/tests/usertools/01/16_useradd_add_user_to_one_group/shadow b/tests/usertools/01/16_useradd_add_user_to_one_group/shadow
similarity index 100%
rename from tests/tests/usertools/01/16_useradd_add_user_to_one_group/shadow
rename to tests/usertools/01/16_useradd_add_user_to_one_group/shadow
diff --git a/tests/tests/usertools/01/17_useradd_create_homedir.test b/tests/usertools/01/17_useradd_create_homedir.test
similarity index 100%
rename from tests/tests/usertools/01/17_useradd_create_homedir.test
rename to tests/usertools/01/17_useradd_create_homedir.test
diff --git a/tests/tests/usertools/01/17_useradd_create_homedir/group b/tests/usertools/01/17_useradd_create_homedir/group
similarity index 100%
rename from tests/tests/usertools/01/17_useradd_create_homedir/group
rename to tests/usertools/01/17_useradd_create_homedir/group
diff --git a/tests/tests/usertools/01/17_useradd_create_homedir/gshadow b/tests/usertools/01/17_useradd_create_homedir/gshadow
similarity index 100%
rename from tests/tests/usertools/01/17_useradd_create_homedir/gshadow
rename to tests/usertools/01/17_useradd_create_homedir/gshadow
diff --git a/tests/tests/usertools/01/17_useradd_create_homedir/passwd b/tests/usertools/01/17_useradd_create_homedir/passwd
similarity index 100%
rename from tests/tests/usertools/01/17_useradd_create_homedir/passwd
rename to tests/usertools/01/17_useradd_create_homedir/passwd
diff --git a/tests/tests/usertools/01/17_useradd_create_homedir/shadow b/tests/usertools/01/17_useradd_create_homedir/shadow
similarity index 100%
rename from tests/tests/usertools/01/17_useradd_create_homedir/shadow
rename to tests/usertools/01/17_useradd_create_homedir/shadow
diff --git a/tests/tests/usertools/01/18_userdel_remove_homedir.test b/tests/usertools/01/18_userdel_remove_homedir.test
similarity index 100%
rename from tests/tests/usertools/01/18_userdel_remove_homedir.test
rename to tests/usertools/01/18_userdel_remove_homedir.test
diff --git a/tests/tests/usertools/01/18_userdel_remove_homedir/group b/tests/usertools/01/18_userdel_remove_homedir/group
similarity index 100%
rename from tests/tests/usertools/01/18_userdel_remove_homedir/group
rename to tests/usertools/01/18_userdel_remove_homedir/group
diff --git a/tests/tests/usertools/01/18_userdel_remove_homedir/gshadow b/tests/usertools/01/18_userdel_remove_homedir/gshadow
similarity index 100%
rename from tests/tests/usertools/01/18_userdel_remove_homedir/gshadow
rename to tests/usertools/01/18_userdel_remove_homedir/gshadow
diff --git a/tests/tests/usertools/01/18_userdel_remove_homedir/passwd b/tests/usertools/01/18_userdel_remove_homedir/passwd
similarity index 100%
rename from tests/tests/usertools/01/18_userdel_remove_homedir/passwd
rename to tests/usertools/01/18_userdel_remove_homedir/passwd
diff --git a/tests/tests/usertools/01/18_userdel_remove_homedir/shadow b/tests/usertools/01/18_userdel_remove_homedir/shadow
similarity index 100%
rename from tests/tests/usertools/01/18_userdel_remove_homedir/shadow
rename to tests/usertools/01/18_userdel_remove_homedir/shadow
diff --git a/tests/tests/usertools/01/18_userdel_remove_homedir/userdel.err b/tests/usertools/01/18_userdel_remove_homedir/userdel.err
similarity index 100%
rename from tests/tests/usertools/01/18_userdel_remove_homedir/userdel.err
rename to tests/usertools/01/18_userdel_remove_homedir/userdel.err
diff --git a/tests/tests/usertools/01/19_userdel_delete_user_in_group.test b/tests/usertools/01/19_userdel_delete_user_in_group.test
similarity index 100%
rename from tests/tests/usertools/01/19_userdel_delete_user_in_group.test
rename to tests/usertools/01/19_userdel_delete_user_in_group.test
diff --git a/tests/tests/usertools/01/20_usermod_change_homedir.test b/tests/usertools/01/20_usermod_change_homedir.test
similarity index 100%
rename from tests/tests/usertools/01/20_usermod_change_homedir.test
rename to tests/usertools/01/20_usermod_change_homedir.test
diff --git a/tests/tests/usertools/01/21_usermod_change_and_move_homedir.test b/tests/usertools/01/21_usermod_change_and_move_homedir.test
similarity index 100%
rename from tests/tests/usertools/01/21_usermod_change_and_move_homedir.test
rename to tests/usertools/01/21_usermod_change_and_move_homedir.test
diff --git a/tests/tests/usertools/01/22_usermod_new_groups.test b/tests/usertools/01/22_usermod_new_groups.test
similarity index 100%
rename from tests/tests/usertools/01/22_usermod_new_groups.test
rename to tests/usertools/01/22_usermod_new_groups.test
diff --git a/tests/tests/usertools/01/22_usermod_new_groups/group b/tests/usertools/01/22_usermod_new_groups/group
similarity index 100%
rename from tests/tests/usertools/01/22_usermod_new_groups/group
rename to tests/usertools/01/22_usermod_new_groups/group
diff --git a/tests/tests/usertools/01/22_usermod_new_groups/gshadow b/tests/usertools/01/22_usermod_new_groups/gshadow
similarity index 100%
rename from tests/tests/usertools/01/22_usermod_new_groups/gshadow
rename to tests/usertools/01/22_usermod_new_groups/gshadow
diff --git a/tests/tests/usertools/01/22_usermod_new_groups/passwd b/tests/usertools/01/22_usermod_new_groups/passwd
similarity index 100%
rename from tests/tests/usertools/01/22_usermod_new_groups/passwd
rename to tests/usertools/01/22_usermod_new_groups/passwd
diff --git a/tests/tests/usertools/01/22_usermod_new_groups/shadow b/tests/usertools/01/22_usermod_new_groups/shadow
similarity index 100%
rename from tests/tests/usertools/01/22_usermod_new_groups/shadow
rename to tests/usertools/01/22_usermod_new_groups/shadow
diff --git a/tests/tests/usertools/01/23_usermod_add_groups.test b/tests/usertools/01/23_usermod_add_groups.test
similarity index 100%
rename from tests/tests/usertools/01/23_usermod_add_groups.test
rename to tests/usertools/01/23_usermod_add_groups.test
diff --git a/tests/tests/usertools/01/23_usermod_add_groups/group b/tests/usertools/01/23_usermod_add_groups/group
similarity index 100%
rename from tests/tests/usertools/01/23_usermod_add_groups/group
rename to tests/usertools/01/23_usermod_add_groups/group
diff --git a/tests/tests/usertools/01/23_usermod_add_groups/gshadow b/tests/usertools/01/23_usermod_add_groups/gshadow
similarity index 100%
rename from tests/tests/usertools/01/23_usermod_add_groups/gshadow
rename to tests/usertools/01/23_usermod_add_groups/gshadow
diff --git a/tests/tests/usertools/01/23_usermod_add_groups/passwd b/tests/usertools/01/23_usermod_add_groups/passwd
similarity index 100%
rename from tests/tests/usertools/01/23_usermod_add_groups/passwd
rename to tests/usertools/01/23_usermod_add_groups/passwd
diff --git a/tests/tests/usertools/01/23_usermod_add_groups/shadow b/tests/usertools/01/23_usermod_add_groups/shadow
similarity index 100%
rename from tests/tests/usertools/01/23_usermod_add_groups/shadow
rename to tests/usertools/01/23_usermod_add_groups/shadow
diff --git a/tests/tests/usertools/01/24_usermod_new_groups_remove_old_groups.test b/tests/usertools/01/24_usermod_new_groups_remove_old_groups.test
similarity index 100%
rename from tests/tests/usertools/01/24_usermod_new_groups_remove_old_groups.test
rename to tests/usertools/01/24_usermod_new_groups_remove_old_groups.test
diff --git a/tests/tests/usertools/01/24_usermod_new_groups_remove_old_groups/group b/tests/usertools/01/24_usermod_new_groups_remove_old_groups/group
similarity index 100%
rename from tests/tests/usertools/01/24_usermod_new_groups_remove_old_groups/group
rename to tests/usertools/01/24_usermod_new_groups_remove_old_groups/group
diff --git a/tests/tests/usertools/01/24_usermod_new_groups_remove_old_groups/gshadow b/tests/usertools/01/24_usermod_new_groups_remove_old_groups/gshadow
similarity index 100%
rename from tests/tests/usertools/01/24_usermod_new_groups_remove_old_groups/gshadow
rename to tests/usertools/01/24_usermod_new_groups_remove_old_groups/gshadow
diff --git a/tests/tests/usertools/01/24_usermod_new_groups_remove_old_groups/passwd b/tests/usertools/01/24_usermod_new_groups_remove_old_groups/passwd
similarity index 100%
rename from tests/tests/usertools/01/24_usermod_new_groups_remove_old_groups/passwd
rename to tests/usertools/01/24_usermod_new_groups_remove_old_groups/passwd
diff --git a/tests/tests/usertools/01/24_usermod_new_groups_remove_old_groups/shadow b/tests/usertools/01/24_usermod_new_groups_remove_old_groups/shadow
similarity index 100%
rename from tests/tests/usertools/01/24_usermod_new_groups_remove_old_groups/shadow
rename to tests/usertools/01/24_usermod_new_groups_remove_old_groups/shadow
diff --git a/tests/tests/usertools/01/25_useradd_specified_large_UID2.test b/tests/usertools/01/25_useradd_specified_large_UID2.test
similarity index 100%
rename from tests/tests/usertools/01/25_useradd_specified_large_UID2.test
rename to tests/usertools/01/25_useradd_specified_large_UID2.test
diff --git a/tests/tests/usertools/01/25_useradd_specified_large_UID2/group b/tests/usertools/01/25_useradd_specified_large_UID2/group
similarity index 100%
rename from tests/tests/usertools/01/25_useradd_specified_large_UID2/group
rename to tests/usertools/01/25_useradd_specified_large_UID2/group
diff --git a/tests/tests/usertools/01/25_useradd_specified_large_UID2/gshadow b/tests/usertools/01/25_useradd_specified_large_UID2/gshadow
similarity index 100%
rename from tests/tests/usertools/01/25_useradd_specified_large_UID2/gshadow
rename to tests/usertools/01/25_useradd_specified_large_UID2/gshadow
diff --git a/tests/tests/usertools/01/25_useradd_specified_large_UID2/passwd b/tests/usertools/01/25_useradd_specified_large_UID2/passwd
similarity index 100%
rename from tests/tests/usertools/01/25_useradd_specified_large_UID2/passwd
rename to tests/usertools/01/25_useradd_specified_large_UID2/passwd
diff --git a/tests/tests/usertools/01/25_useradd_specified_large_UID2/shadow b/tests/usertools/01/25_useradd_specified_large_UID2/shadow
similarity index 100%
rename from tests/tests/usertools/01/25_useradd_specified_large_UID2/shadow
rename to tests/usertools/01/25_useradd_specified_large_UID2/shadow
diff --git a/tests/tests/usertools/01/26_useradd_UID_-1.test b/tests/usertools/01/26_useradd_UID_-1.test
similarity index 100%
rename from tests/tests/usertools/01/26_useradd_UID_-1.test
rename to tests/usertools/01/26_useradd_UID_-1.test
diff --git a/tests/tests/usertools/01/14_useradd_out_of_range_UID/group b/tests/usertools/01/26_useradd_UID_-1/group
similarity index 100%
rename from tests/tests/usertools/01/14_useradd_out_of_range_UID/group
rename to tests/usertools/01/26_useradd_UID_-1/group
diff --git a/tests/tests/usertools/01/14_useradd_out_of_range_UID/gshadow b/tests/usertools/01/26_useradd_UID_-1/gshadow
similarity index 100%
rename from tests/tests/usertools/01/14_useradd_out_of_range_UID/gshadow
rename to tests/usertools/01/26_useradd_UID_-1/gshadow
diff --git a/tests/tests/usertools/01/14_useradd_out_of_range_UID/passwd b/tests/usertools/01/26_useradd_UID_-1/passwd
similarity index 100%
rename from tests/tests/usertools/01/14_useradd_out_of_range_UID/passwd
rename to tests/usertools/01/26_useradd_UID_-1/passwd
diff --git a/tests/tests/usertools/01/14_useradd_out_of_range_UID/shadow b/tests/usertools/01/26_useradd_UID_-1/shadow
similarity index 100%
rename from tests/tests/usertools/01/14_useradd_out_of_range_UID/shadow
rename to tests/usertools/01/26_useradd_UID_-1/shadow
diff --git a/tests/tests/usertools/01/config/etc/default/useradd b/tests/usertools/01/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/01/config/etc/default/useradd
rename to tests/usertools/01/config/etc/default/useradd
diff --git a/tests/tests/usertools/01/26_useradd_UID_-1/group b/tests/usertools/01/config/etc/group
similarity index 100%
rename from tests/tests/usertools/01/26_useradd_UID_-1/group
rename to tests/usertools/01/config/etc/group
diff --git a/tests/tests/usertools/01/26_useradd_UID_-1/gshadow b/tests/usertools/01/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/01/26_useradd_UID_-1/gshadow
rename to tests/usertools/01/config/etc/gshadow
diff --git a/tests/tests/usertools/01/26_useradd_UID_-1/passwd b/tests/usertools/01/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/01/26_useradd_UID_-1/passwd
rename to tests/usertools/01/config/etc/passwd
diff --git a/tests/tests/usertools/01/26_useradd_UID_-1/shadow b/tests/usertools/01/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/01/26_useradd_UID_-1/shadow
rename to tests/usertools/01/config/etc/shadow
diff --git a/tests/tests/usertools/02/config.txt b/tests/usertools/02/config.txt
similarity index 100%
rename from tests/tests/usertools/02/config.txt
rename to tests/usertools/02/config.txt
diff --git a/tests/tests/usertools/02/config/etc/default/useradd b/tests/usertools/02/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/02/config/etc/default/useradd
rename to tests/usertools/02/config/etc/default/useradd
diff --git a/tests/tests/su/13_su_child_success/config/etc/group b/tests/usertools/02/config/etc/group
similarity index 100%
rename from tests/tests/su/13_su_child_success/config/etc/group
rename to tests/usertools/02/config/etc/group
diff --git a/tests/tests/su/13_su_child_success/config/etc/gshadow b/tests/usertools/02/config/etc/gshadow
similarity index 100%
rename from tests/tests/su/13_su_child_success/config/etc/gshadow
rename to tests/usertools/02/config/etc/gshadow
diff --git a/tests/tests/usertools/02/config/etc/passwd b/tests/usertools/02/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/02/config/etc/passwd
rename to tests/usertools/02/config/etc/passwd
diff --git a/tests/tests/usertools/02/config/etc/shadow b/tests/usertools/02/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/02/config/etc/shadow
rename to tests/usertools/02/config/etc/shadow
diff --git a/tests/tests/usertools/02/data/useradd-D.out b/tests/usertools/02/data/useradd-D.out
similarity index 100%
rename from tests/tests/usertools/02/data/useradd-D.out
rename to tests/usertools/02/data/useradd-D.out
diff --git a/tests/tests/usertools/02/data/useradd-D_default_values.out b/tests/usertools/02/data/useradd-D_default_values.out
similarity index 100%
rename from tests/tests/usertools/02/data/useradd-D_default_values.out
rename to tests/usertools/02/data/useradd-D_default_values.out
diff --git a/tests/tests/usertools/02/useradd_change_default_EXPIRE.test b/tests/usertools/02/useradd_change_default_EXPIRE.test
similarity index 100%
rename from tests/tests/usertools/02/useradd_change_default_EXPIRE.test
rename to tests/usertools/02/useradd_change_default_EXPIRE.test
diff --git a/tests/tests/usertools/02/useradd_change_default_EXPIRE/useradd.default b/tests/usertools/02/useradd_change_default_EXPIRE/useradd.default
similarity index 100%
rename from tests/tests/usertools/02/useradd_change_default_EXPIRE/useradd.default
rename to tests/usertools/02/useradd_change_default_EXPIRE/useradd.default
diff --git a/tests/tests/usertools/02/useradd_change_default_GROUP.test b/tests/usertools/02/useradd_change_default_GROUP.test
similarity index 100%
rename from tests/tests/usertools/02/useradd_change_default_GROUP.test
rename to tests/usertools/02/useradd_change_default_GROUP.test
diff --git a/tests/tests/usertools/02/useradd_change_default_GROUP/useradd.default b/tests/usertools/02/useradd_change_default_GROUP/useradd.default
similarity index 100%
rename from tests/tests/usertools/02/useradd_change_default_GROUP/useradd.default
rename to tests/usertools/02/useradd_change_default_GROUP/useradd.default
diff --git a/tests/tests/usertools/02/useradd_change_default_HOME.test b/tests/usertools/02/useradd_change_default_HOME.test
similarity index 100%
rename from tests/tests/usertools/02/useradd_change_default_HOME.test
rename to tests/usertools/02/useradd_change_default_HOME.test
diff --git a/tests/tests/usertools/02/useradd_change_default_HOME/useradd.default b/tests/usertools/02/useradd_change_default_HOME/useradd.default
similarity index 100%
rename from tests/tests/usertools/02/useradd_change_default_HOME/useradd.default
rename to tests/usertools/02/useradd_change_default_HOME/useradd.default
diff --git a/tests/tests/usertools/02/useradd_change_default_INACTIVE.test b/tests/usertools/02/useradd_change_default_INACTIVE.test
similarity index 100%
rename from tests/tests/usertools/02/useradd_change_default_INACTIVE.test
rename to tests/usertools/02/useradd_change_default_INACTIVE.test
diff --git a/tests/tests/usertools/02/useradd_change_default_INACTIVE/useradd.default b/tests/usertools/02/useradd_change_default_INACTIVE/useradd.default
similarity index 100%
rename from tests/tests/usertools/02/useradd_change_default_INACTIVE/useradd.default
rename to tests/usertools/02/useradd_change_default_INACTIVE/useradd.default
diff --git a/tests/tests/usertools/02/useradd_change_default_SHELL.test b/tests/usertools/02/useradd_change_default_SHELL.test
similarity index 100%
rename from tests/tests/usertools/02/useradd_change_default_SHELL.test
rename to tests/usertools/02/useradd_change_default_SHELL.test
diff --git a/tests/tests/usertools/02/useradd_change_default_SHELL/useradd.default b/tests/usertools/02/useradd_change_default_SHELL/useradd.default
similarity index 100%
rename from tests/tests/usertools/02/useradd_change_default_SHELL/useradd.default
rename to tests/usertools/02/useradd_change_default_SHELL/useradd.default
diff --git a/tests/tests/usertools/02/useradd_change_defaults.test b/tests/usertools/02/useradd_change_defaults.test
similarity index 100%
rename from tests/tests/usertools/02/useradd_change_defaults.test
rename to tests/usertools/02/useradd_change_defaults.test
diff --git a/tests/tests/usertools/02/useradd_change_defaults/useradd.default b/tests/usertools/02/useradd_change_defaults/useradd.default
similarity index 100%
rename from tests/tests/usertools/02/useradd_change_defaults/useradd.default
rename to tests/usertools/02/useradd_change_defaults/useradd.default
diff --git a/tests/tests/usertools/02/useradd_default_default_values.test b/tests/usertools/02/useradd_default_default_values.test
similarity index 100%
rename from tests/tests/usertools/02/useradd_default_default_values.test
rename to tests/usertools/02/useradd_default_default_values.test
diff --git a/tests/tests/usertools/02/useradd_get_default_values.test b/tests/usertools/02/useradd_get_default_values.test
similarity index 100%
rename from tests/tests/usertools/02/useradd_get_default_values.test
rename to tests/usertools/02/useradd_get_default_values.test
diff --git a/tests/tests/usertools/03/config.txt b/tests/usertools/03/config.txt
similarity index 100%
rename from tests/tests/usertools/03/config.txt
rename to tests/usertools/03/config.txt
diff --git a/tests/tests/usertools/03/config/etc/default/useradd b/tests/usertools/03/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/03/config/etc/default/useradd
rename to tests/usertools/03/config/etc/default/useradd
diff --git a/tests/tests/usertools/02/config/etc/group b/tests/usertools/03/config/etc/group
similarity index 100%
rename from tests/tests/usertools/02/config/etc/group
rename to tests/usertools/03/config/etc/group
diff --git a/tests/tests/usertools/02/config/etc/gshadow b/tests/usertools/03/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/02/config/etc/gshadow
rename to tests/usertools/03/config/etc/gshadow
diff --git a/tests/tests/usertools/03/config/etc/passwd b/tests/usertools/03/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/03/config/etc/passwd
rename to tests/usertools/03/config/etc/passwd
diff --git a/tests/tests/usertools/03/config/etc/shadow b/tests/usertools/03/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/03/config/etc/shadow
rename to tests/usertools/03/config/etc/shadow
diff --git a/tests/tests/usertools/03/useradd_change_defaults.test b/tests/usertools/03/useradd_change_defaults.test
similarity index 100%
rename from tests/tests/usertools/03/useradd_change_defaults.test
rename to tests/usertools/03/useradd_change_defaults.test
diff --git a/tests/tests/usertools/03/useradd_change_defaults/useradd.default b/tests/usertools/03/useradd_change_defaults/useradd.default
similarity index 100%
rename from tests/tests/usertools/03/useradd_change_defaults/useradd.default
rename to tests/usertools/03/useradd_change_defaults/useradd.default
diff --git a/tests/tests/usertools/04/01_useradd_add_user.test b/tests/usertools/04/01_useradd_add_user.test
similarity index 100%
rename from tests/tests/usertools/04/01_useradd_add_user.test
rename to tests/usertools/04/01_useradd_add_user.test
diff --git a/tests/tests/usertools/04/01_useradd_add_user/group b/tests/usertools/04/01_useradd_add_user/group
similarity index 100%
rename from tests/tests/usertools/04/01_useradd_add_user/group
rename to tests/usertools/04/01_useradd_add_user/group
diff --git a/tests/tests/usertools/04/01_useradd_add_user/gshadow b/tests/usertools/04/01_useradd_add_user/gshadow
similarity index 100%
rename from tests/tests/usertools/04/01_useradd_add_user/gshadow
rename to tests/usertools/04/01_useradd_add_user/gshadow
diff --git a/tests/tests/usertools/04/01_useradd_add_user/passwd b/tests/usertools/04/01_useradd_add_user/passwd
similarity index 100%
rename from tests/tests/usertools/04/01_useradd_add_user/passwd
rename to tests/usertools/04/01_useradd_add_user/passwd
diff --git a/tests/tests/usertools/04/01_useradd_add_user/shadow b/tests/usertools/04/01_useradd_add_user/shadow
similarity index 100%
rename from tests/tests/usertools/04/01_useradd_add_user/shadow
rename to tests/usertools/04/01_useradd_add_user/shadow
diff --git a/tests/tests/usertools/04/config.txt b/tests/usertools/04/config.txt
similarity index 100%
rename from tests/tests/usertools/04/config.txt
rename to tests/usertools/04/config.txt
diff --git a/tests/tests/usertools/04/config/etc/default/useradd b/tests/usertools/04/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/04/config/etc/default/useradd
rename to tests/usertools/04/config/etc/default/useradd
diff --git a/tests/tests/usertools/01/config/etc/group b/tests/usertools/04/config/etc/group
similarity index 100%
rename from tests/tests/usertools/01/config/etc/group
rename to tests/usertools/04/config/etc/group
diff --git a/tests/tests/usertools/01/config/etc/gshadow b/tests/usertools/04/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/01/config/etc/gshadow
rename to tests/usertools/04/config/etc/gshadow
diff --git a/tests/tests/usertools/01/config/etc/passwd b/tests/usertools/04/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/01/config/etc/passwd
rename to tests/usertools/04/config/etc/passwd
diff --git a/tests/tests/usertools/01/config/etc/shadow b/tests/usertools/04/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/01/config/etc/shadow
rename to tests/usertools/04/config/etc/shadow
diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/config.txt b/tests/usertools/05_userdel_del_from_group_members/config.txt
similarity index 100%
rename from tests/tests/usertools/05_userdel_del_from_group_members/config.txt
rename to tests/usertools/05_userdel_del_from_group_members/config.txt
diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/config/etc/default/useradd b/tests/usertools/05_userdel_del_from_group_members/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/05_userdel_del_from_group_members/config/etc/default/useradd
rename to tests/usertools/05_userdel_del_from_group_members/config/etc/default/useradd
diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/config/etc/group b/tests/usertools/05_userdel_del_from_group_members/config/etc/group
similarity index 100%
rename from tests/tests/usertools/05_userdel_del_from_group_members/config/etc/group
rename to tests/usertools/05_userdel_del_from_group_members/config/etc/group
diff --git a/tests/tests/subids/58_newusers_with_subids/data/gshadow b/tests/usertools/05_userdel_del_from_group_members/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/58_newusers_with_subids/data/gshadow
rename to tests/usertools/05_userdel_del_from_group_members/config/etc/gshadow
diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/config/etc/passwd b/tests/usertools/05_userdel_del_from_group_members/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/05_userdel_del_from_group_members/config/etc/passwd
rename to tests/usertools/05_userdel_del_from_group_members/config/etc/passwd
diff --git a/tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/shadow b/tests/usertools/05_userdel_del_from_group_members/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/shadow
rename to tests/usertools/05_userdel_del_from_group_members/config/etc/shadow
diff --git a/tests/tests/usertools/04/config/etc/group b/tests/usertools/05_userdel_del_from_group_members/data/group
similarity index 100%
rename from tests/tests/usertools/04/config/etc/group
rename to tests/usertools/05_userdel_del_from_group_members/data/group
diff --git a/tests/tests/usertools/04/config/etc/gshadow b/tests/usertools/05_userdel_del_from_group_members/data/gshadow
similarity index 100%
rename from tests/tests/usertools/04/config/etc/gshadow
rename to tests/usertools/05_userdel_del_from_group_members/data/gshadow
diff --git a/tests/tests/usertools/04/config/etc/passwd b/tests/usertools/05_userdel_del_from_group_members/data/passwd
similarity index 100%
rename from tests/tests/usertools/04/config/etc/passwd
rename to tests/usertools/05_userdel_del_from_group_members/data/passwd
diff --git a/tests/tests/usertools/04/config/etc/shadow b/tests/usertools/05_userdel_del_from_group_members/data/shadow
similarity index 100%
rename from tests/tests/usertools/04/config/etc/shadow
rename to tests/usertools/05_userdel_del_from_group_members/data/shadow
diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/userdel.test b/tests/usertools/05_userdel_del_from_group_members/userdel.test
similarity index 100%
rename from tests/tests/usertools/05_userdel_del_from_group_members/userdel.test
rename to tests/usertools/05_userdel_del_from_group_members/userdel.test
diff --git a/tests/tests/usertools/06_userdel_del_from_gshadow_members/config.txt b/tests/usertools/06_userdel_del_from_gshadow_members/config.txt
similarity index 100%
rename from tests/tests/usertools/06_userdel_del_from_gshadow_members/config.txt
rename to tests/usertools/06_userdel_del_from_gshadow_members/config.txt
diff --git a/tests/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/default/useradd b/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/default/useradd
rename to tests/usertools/06_userdel_del_from_gshadow_members/config/etc/default/useradd
diff --git a/tests/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/group b/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/group
similarity index 100%
rename from tests/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/group
rename to tests/usertools/06_userdel_del_from_gshadow_members/config/etc/group
diff --git a/tests/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/gshadow b/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/gshadow
rename to tests/usertools/06_userdel_del_from_gshadow_members/config/etc/gshadow
diff --git a/tests/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/passwd b/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/passwd
rename to tests/usertools/06_userdel_del_from_gshadow_members/config/etc/passwd
diff --git a/tests/tests/subids/53_userdel_one_subuid_range/config/etc/shadow b/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/53_userdel_one_subuid_range/config/etc/shadow
rename to tests/usertools/06_userdel_del_from_gshadow_members/config/etc/shadow
diff --git a/tests/tests/usertools/06_userdel_del_from_gshadow_members/data/group b/tests/usertools/06_userdel_del_from_gshadow_members/data/group
similarity index 100%
rename from tests/tests/usertools/06_userdel_del_from_gshadow_members/data/group
rename to tests/usertools/06_userdel_del_from_gshadow_members/data/group
diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/data/gshadow b/tests/usertools/06_userdel_del_from_gshadow_members/data/gshadow
similarity index 100%
rename from tests/tests/usertools/05_userdel_del_from_group_members/data/gshadow
rename to tests/usertools/06_userdel_del_from_gshadow_members/data/gshadow
diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/data/passwd b/tests/usertools/06_userdel_del_from_gshadow_members/data/passwd
similarity index 100%
rename from tests/tests/usertools/05_userdel_del_from_group_members/data/passwd
rename to tests/usertools/06_userdel_del_from_gshadow_members/data/passwd
diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/data/shadow b/tests/usertools/06_userdel_del_from_gshadow_members/data/shadow
similarity index 100%
rename from tests/tests/usertools/05_userdel_del_from_group_members/data/shadow
rename to tests/usertools/06_userdel_del_from_gshadow_members/data/shadow
diff --git a/tests/tests/usertools/06_userdel_del_from_gshadow_members/userdel.test b/tests/usertools/06_userdel_del_from_gshadow_members/userdel.test
similarity index 100%
rename from tests/tests/usertools/06_userdel_del_from_gshadow_members/userdel.test
rename to tests/usertools/06_userdel_del_from_gshadow_members/userdel.test
diff --git a/tests/tests/usertools/07_userdel_del_from_gshadow_admins/config.txt b/tests/usertools/07_userdel_del_from_gshadow_admins/config.txt
similarity index 100%
rename from tests/tests/usertools/07_userdel_del_from_gshadow_admins/config.txt
rename to tests/usertools/07_userdel_del_from_gshadow_admins/config.txt
diff --git a/tests/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/default/useradd b/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/default/useradd
rename to tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/default/useradd
diff --git a/tests/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/group b/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/group
similarity index 100%
rename from tests/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/group
rename to tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/group
diff --git a/tests/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/gshadow b/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/gshadow
rename to tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/gshadow
diff --git a/tests/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/passwd b/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/passwd
rename to tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/passwd
diff --git a/tests/tests/subids/54_userdel_one_subgid_range/config/etc/shadow b/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/54_userdel_one_subgid_range/config/etc/shadow
rename to tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/shadow
diff --git a/tests/tests/usertools/07_userdel_del_from_gshadow_admins/data/group b/tests/usertools/07_userdel_del_from_gshadow_admins/data/group
similarity index 100%
rename from tests/tests/usertools/07_userdel_del_from_gshadow_admins/data/group
rename to tests/usertools/07_userdel_del_from_gshadow_admins/data/group
diff --git a/tests/tests/usertools/07_userdel_del_from_gshadow_admins/data/gshadow b/tests/usertools/07_userdel_del_from_gshadow_admins/data/gshadow
similarity index 100%
rename from tests/tests/usertools/07_userdel_del_from_gshadow_admins/data/gshadow
rename to tests/usertools/07_userdel_del_from_gshadow_admins/data/gshadow
diff --git a/tests/tests/usertools/06_userdel_del_from_gshadow_members/data/passwd b/tests/usertools/07_userdel_del_from_gshadow_admins/data/passwd
similarity index 100%
rename from tests/tests/usertools/06_userdel_del_from_gshadow_members/data/passwd
rename to tests/usertools/07_userdel_del_from_gshadow_admins/data/passwd
diff --git a/tests/tests/usertools/06_userdel_del_from_gshadow_members/data/shadow b/tests/usertools/07_userdel_del_from_gshadow_admins/data/shadow
similarity index 100%
rename from tests/tests/usertools/06_userdel_del_from_gshadow_members/data/shadow
rename to tests/usertools/07_userdel_del_from_gshadow_admins/data/shadow
diff --git a/tests/tests/usertools/07_userdel_del_from_gshadow_admins/userdel.test b/tests/usertools/07_userdel_del_from_gshadow_admins/userdel.test
similarity index 100%
rename from tests/tests/usertools/07_userdel_del_from_gshadow_admins/userdel.test
rename to tests/usertools/07_userdel_del_from_gshadow_admins/userdel.test
diff --git a/tests/tests/usertools/08_userdel_del_from_group_and_gshadow/config.txt b/tests/usertools/08_userdel_del_from_group_and_gshadow/config.txt
similarity index 100%
rename from tests/tests/usertools/08_userdel_del_from_group_and_gshadow/config.txt
rename to tests/usertools/08_userdel_del_from_group_and_gshadow/config.txt
diff --git a/tests/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/default/useradd b/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/default/useradd
rename to tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/default/useradd
diff --git a/tests/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/group b/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/group
rename to tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/group
diff --git a/tests/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/gshadow b/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/gshadow
rename to tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/gshadow
diff --git a/tests/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/passwd b/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/passwd
rename to tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/passwd
diff --git a/tests/tests/subids/55_userdel_no_subuid/config/etc/shadow b/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/55_userdel_no_subuid/config/etc/shadow
rename to tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/shadow
diff --git a/tests/tests/usertools/08_userdel_del_from_group_and_gshadow/data/group b/tests/usertools/08_userdel_del_from_group_and_gshadow/data/group
similarity index 100%
rename from tests/tests/usertools/08_userdel_del_from_group_and_gshadow/data/group
rename to tests/usertools/08_userdel_del_from_group_and_gshadow/data/group
diff --git a/tests/tests/usertools/08_userdel_del_from_group_and_gshadow/data/gshadow b/tests/usertools/08_userdel_del_from_group_and_gshadow/data/gshadow
similarity index 100%
rename from tests/tests/usertools/08_userdel_del_from_group_and_gshadow/data/gshadow
rename to tests/usertools/08_userdel_del_from_group_and_gshadow/data/gshadow
diff --git a/tests/tests/usertools/07_userdel_del_from_gshadow_admins/data/passwd b/tests/usertools/08_userdel_del_from_group_and_gshadow/data/passwd
similarity index 100%
rename from tests/tests/usertools/07_userdel_del_from_gshadow_admins/data/passwd
rename to tests/usertools/08_userdel_del_from_group_and_gshadow/data/passwd
diff --git a/tests/tests/usertools/07_userdel_del_from_gshadow_admins/data/shadow b/tests/usertools/08_userdel_del_from_group_and_gshadow/data/shadow
similarity index 100%
rename from tests/tests/usertools/07_userdel_del_from_gshadow_admins/data/shadow
rename to tests/usertools/08_userdel_del_from_group_and_gshadow/data/shadow
diff --git a/tests/tests/usertools/08_userdel_del_from_group_and_gshadow/userdel.test b/tests/usertools/08_userdel_del_from_group_and_gshadow/userdel.test
similarity index 100%
rename from tests/tests/usertools/08_userdel_del_from_group_and_gshadow/userdel.test
rename to tests/usertools/08_userdel_del_from_group_and_gshadow/userdel.test
diff --git a/tests/tests/usertools/09_userdel_del_homedir/config.txt b/tests/usertools/09_userdel_del_homedir/config.txt
similarity index 100%
rename from tests/tests/usertools/09_userdel_del_homedir/config.txt
rename to tests/usertools/09_userdel_del_homedir/config.txt
diff --git a/tests/tests/usertools/09_userdel_del_homedir/config/etc/default/useradd b/tests/usertools/09_userdel_del_homedir/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/09_userdel_del_homedir/config/etc/default/useradd
rename to tests/usertools/09_userdel_del_homedir/config/etc/default/useradd
diff --git a/tests/tests/subids/68_invalid_subuid_file2/data/group b/tests/usertools/09_userdel_del_homedir/config/etc/group
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/data/group
rename to tests/usertools/09_userdel_del_homedir/config/etc/group
diff --git a/tests/tests/subids/59_newusers_no_subuid/data/gshadow b/tests/usertools/09_userdel_del_homedir/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/59_newusers_no_subuid/data/gshadow
rename to tests/usertools/09_userdel_del_homedir/config/etc/gshadow
diff --git a/tests/tests/usertools/09_userdel_del_homedir/config/etc/passwd b/tests/usertools/09_userdel_del_homedir/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/09_userdel_del_homedir/config/etc/passwd
rename to tests/usertools/09_userdel_del_homedir/config/etc/passwd
diff --git a/tests/tests/subids/56_userdel_no_subgid/config/etc/shadow b/tests/usertools/09_userdel_del_homedir/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/56_userdel_no_subgid/config/etc/shadow
rename to tests/usertools/09_userdel_del_homedir/config/etc/shadow
diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/data/group b/tests/usertools/09_userdel_del_homedir/data/group
similarity index 100%
rename from tests/tests/usertools/05_userdel_del_from_group_members/data/group
rename to tests/usertools/09_userdel_del_homedir/data/group
diff --git a/tests/tests/usertools/06_userdel_del_from_gshadow_members/data/gshadow b/tests/usertools/09_userdel_del_homedir/data/gshadow
similarity index 100%
rename from tests/tests/usertools/06_userdel_del_from_gshadow_members/data/gshadow
rename to tests/usertools/09_userdel_del_homedir/data/gshadow
diff --git a/tests/tests/usertools/08_userdel_del_from_group_and_gshadow/data/passwd b/tests/usertools/09_userdel_del_homedir/data/passwd
similarity index 100%
rename from tests/tests/usertools/08_userdel_del_from_group_and_gshadow/data/passwd
rename to tests/usertools/09_userdel_del_homedir/data/passwd
diff --git a/tests/tests/usertools/08_userdel_del_from_group_and_gshadow/data/shadow b/tests/usertools/09_userdel_del_homedir/data/shadow
similarity index 100%
rename from tests/tests/usertools/08_userdel_del_from_group_and_gshadow/data/shadow
rename to tests/usertools/09_userdel_del_homedir/data/shadow
diff --git a/tests/tests/usertools/09_userdel_del_homedir/userdel.test b/tests/usertools/09_userdel_del_homedir/userdel.test
similarity index 100%
rename from tests/tests/usertools/09_userdel_del_homedir/userdel.test
rename to tests/usertools/09_userdel_del_homedir/userdel.test
diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/config.txt b/tests/usertools/10_userdel_del_homedir_wrong_owner/config.txt
similarity index 100%
rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/config.txt
rename to tests/usertools/10_userdel_del_homedir_wrong_owner/config.txt
diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/default/useradd b/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/default/useradd
rename to tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/default/useradd
diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/group b/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/group
similarity index 100%
rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/group
rename to tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/group
diff --git a/tests/tests/subids/60_newusers_no_subgid/data/gshadow b/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/60_newusers_no_subgid/data/gshadow
rename to tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/gshadow
diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/passwd b/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/passwd
rename to tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/passwd
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/config/etc/shadow b/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/shadow
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/config/etc/shadow
rename to tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/shadow
diff --git a/tests/tests/usertools/09_userdel_del_homedir/data/group b/tests/usertools/10_userdel_del_homedir_wrong_owner/data/group
similarity index 100%
rename from tests/tests/usertools/09_userdel_del_homedir/data/group
rename to tests/usertools/10_userdel_del_homedir_wrong_owner/data/group
diff --git a/tests/tests/usertools/09_userdel_del_homedir/data/gshadow b/tests/usertools/10_userdel_del_homedir_wrong_owner/data/gshadow
similarity index 100%
rename from tests/tests/usertools/09_userdel_del_homedir/data/gshadow
rename to tests/usertools/10_userdel_del_homedir_wrong_owner/data/gshadow
diff --git a/tests/tests/usertools/09_userdel_del_homedir/data/passwd b/tests/usertools/10_userdel_del_homedir_wrong_owner/data/passwd
similarity index 100%
rename from tests/tests/usertools/09_userdel_del_homedir/data/passwd
rename to tests/usertools/10_userdel_del_homedir_wrong_owner/data/passwd
diff --git a/tests/tests/usertools/09_userdel_del_homedir/data/shadow b/tests/usertools/10_userdel_del_homedir_wrong_owner/data/shadow
similarity index 100%
rename from tests/tests/usertools/09_userdel_del_homedir/data/shadow
rename to tests/usertools/10_userdel_del_homedir_wrong_owner/data/shadow
diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/userdel.err b/tests/usertools/10_userdel_del_homedir_wrong_owner/data/userdel.err
similarity index 100%
rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/userdel.err
rename to tests/usertools/10_userdel_del_homedir_wrong_owner/data/userdel.err
diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/userdel.test b/tests/usertools/10_userdel_del_homedir_wrong_owner/userdel.test
similarity index 100%
rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/userdel.test
rename to tests/usertools/10_userdel_del_homedir_wrong_owner/userdel.test
diff --git a/tests/tests/usertools/11_usermod_move_homedir/config.txt b/tests/usertools/11_usermod_move_homedir/config.txt
similarity index 100%
rename from tests/tests/usertools/11_usermod_move_homedir/config.txt
rename to tests/usertools/11_usermod_move_homedir/config.txt
diff --git a/tests/tests/usertools/11_usermod_move_homedir/config/etc/default/useradd b/tests/usertools/11_usermod_move_homedir/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/11_usermod_move_homedir/config/etc/default/useradd
rename to tests/usertools/11_usermod_move_homedir/config/etc/default/useradd
diff --git a/tests/tests/usertools/11_usermod_move_homedir/config/etc/group b/tests/usertools/11_usermod_move_homedir/config/etc/group
similarity index 100%
rename from tests/tests/usertools/11_usermod_move_homedir/config/etc/group
rename to tests/usertools/11_usermod_move_homedir/config/etc/group
diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/config/etc/gshadow b/tests/usertools/11_usermod_move_homedir/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/05_userdel_del_from_group_members/config/etc/gshadow
rename to tests/usertools/11_usermod_move_homedir/config/etc/gshadow
diff --git a/tests/tests/usertools/11_usermod_move_homedir/config/etc/passwd b/tests/usertools/11_usermod_move_homedir/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/11_usermod_move_homedir/config/etc/passwd
rename to tests/usertools/11_usermod_move_homedir/config/etc/passwd
diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/config/etc/shadow b/tests/usertools/11_usermod_move_homedir/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/05_userdel_del_from_group_members/config/etc/shadow
rename to tests/usertools/11_usermod_move_homedir/config/etc/shadow
diff --git a/tests/tests/usertools/11_usermod_move_homedir/data/home_ls-a b/tests/usertools/11_usermod_move_homedir/data/home_ls-a
similarity index 100%
rename from tests/tests/usertools/11_usermod_move_homedir/data/home_ls-a
rename to tests/usertools/11_usermod_move_homedir/data/home_ls-a
diff --git a/tests/tests/usertools/11_usermod_move_homedir/data/passwd b/tests/usertools/11_usermod_move_homedir/data/passwd
similarity index 100%
rename from tests/tests/usertools/11_usermod_move_homedir/data/passwd
rename to tests/usertools/11_usermod_move_homedir/data/passwd
diff --git a/tests/tests/usertools/11_usermod_move_homedir/usermod.test b/tests/usertools/11_usermod_move_homedir/usermod.test
similarity index 100%
rename from tests/tests/usertools/11_usermod_move_homedir/usermod.test
rename to tests/usertools/11_usermod_move_homedir/usermod.test
diff --git a/tests/tests/usertools/12_usermod_move_homedir_dev_null/config.txt b/tests/usertools/12_usermod_move_homedir_dev_null/config.txt
similarity index 100%
rename from tests/tests/usertools/12_usermod_move_homedir_dev_null/config.txt
rename to tests/usertools/12_usermod_move_homedir_dev_null/config.txt
diff --git a/tests/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/default/useradd b/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/default/useradd
rename to tests/usertools/12_usermod_move_homedir_dev_null/config/etc/default/useradd
diff --git a/tests/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/group b/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/group
similarity index 100%
rename from tests/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/group
rename to tests/usertools/12_usermod_move_homedir_dev_null/config/etc/group
diff --git a/tests/tests/usertools/09_userdel_del_homedir/config/etc/gshadow b/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/09_userdel_del_homedir/config/etc/gshadow
rename to tests/usertools/12_usermod_move_homedir_dev_null/config/etc/gshadow
diff --git a/tests/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/passwd b/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/passwd
rename to tests/usertools/12_usermod_move_homedir_dev_null/config/etc/passwd
diff --git a/tests/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/shadow b/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/shadow
rename to tests/usertools/12_usermod_move_homedir_dev_null/config/etc/shadow
diff --git a/tests/tests/usertools/12_usermod_move_homedir_dev_null/data/passwd b/tests/usertools/12_usermod_move_homedir_dev_null/data/passwd
similarity index 100%
rename from tests/tests/usertools/12_usermod_move_homedir_dev_null/data/passwd
rename to tests/usertools/12_usermod_move_homedir_dev_null/data/passwd
diff --git a/tests/tests/usertools/12_usermod_move_homedir_dev_null/data/usermod.err b/tests/usertools/12_usermod_move_homedir_dev_null/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/12_usermod_move_homedir_dev_null/data/usermod.err
rename to tests/usertools/12_usermod_move_homedir_dev_null/data/usermod.err
diff --git a/tests/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test b/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test
similarity index 100%
rename from tests/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test
rename to tests/usertools/12_usermod_move_homedir_dev_null/usermod.test
diff --git a/tests/tests/usertools/13_usermod_move_homedir_file/config.txt b/tests/usertools/13_usermod_move_homedir_file/config.txt
similarity index 100%
rename from tests/tests/usertools/13_usermod_move_homedir_file/config.txt
rename to tests/usertools/13_usermod_move_homedir_file/config.txt
diff --git a/tests/tests/usertools/13_usermod_move_homedir_file/config/etc/default/useradd b/tests/usertools/13_usermod_move_homedir_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/13_usermod_move_homedir_file/config/etc/default/useradd
rename to tests/usertools/13_usermod_move_homedir_file/config/etc/default/useradd
diff --git a/tests/tests/usertools/13_usermod_move_homedir_file/config/etc/group b/tests/usertools/13_usermod_move_homedir_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/13_usermod_move_homedir_file/config/etc/group
rename to tests/usertools/13_usermod_move_homedir_file/config/etc/group
diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/gshadow b/tests/usertools/13_usermod_move_homedir_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/gshadow
rename to tests/usertools/13_usermod_move_homedir_file/config/etc/gshadow
diff --git a/tests/tests/usertools/13_usermod_move_homedir_file/config/etc/passwd b/tests/usertools/13_usermod_move_homedir_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/13_usermod_move_homedir_file/config/etc/passwd
rename to tests/usertools/13_usermod_move_homedir_file/config/etc/passwd
diff --git a/tests/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/shadow b/tests/usertools/13_usermod_move_homedir_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/shadow
rename to tests/usertools/13_usermod_move_homedir_file/config/etc/shadow
diff --git a/tests/tests/usertools/13_usermod_move_homedir_file/data/passwd b/tests/usertools/13_usermod_move_homedir_file/data/passwd
similarity index 100%
rename from tests/tests/usertools/13_usermod_move_homedir_file/data/passwd
rename to tests/usertools/13_usermod_move_homedir_file/data/passwd
diff --git a/tests/tests/usertools/13_usermod_move_homedir_file/data/usermod.err b/tests/usertools/13_usermod_move_homedir_file/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/13_usermod_move_homedir_file/data/usermod.err
rename to tests/usertools/13_usermod_move_homedir_file/data/usermod.err
diff --git a/tests/tests/usertools/13_usermod_move_homedir_file/usermod.test b/tests/usertools/13_usermod_move_homedir_file/usermod.test
similarity index 100%
rename from tests/tests/usertools/13_usermod_move_homedir_file/usermod.test
rename to tests/usertools/13_usermod_move_homedir_file/usermod.test
diff --git a/tests/tests/usertools/14_usermod_move_homedir_other_device/config.txt b/tests/usertools/14_usermod_move_homedir_other_device/config.txt
similarity index 100%
rename from tests/tests/usertools/14_usermod_move_homedir_other_device/config.txt
rename to tests/usertools/14_usermod_move_homedir_other_device/config.txt
diff --git a/tests/tests/usertools/14_usermod_move_homedir_other_device/config/etc/default/useradd b/tests/usertools/14_usermod_move_homedir_other_device/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/14_usermod_move_homedir_other_device/config/etc/default/useradd
rename to tests/usertools/14_usermod_move_homedir_other_device/config/etc/default/useradd
diff --git a/tests/tests/usertools/14_usermod_move_homedir_other_device/config/etc/group b/tests/usertools/14_usermod_move_homedir_other_device/config/etc/group
similarity index 100%
rename from tests/tests/usertools/14_usermod_move_homedir_other_device/config/etc/group
rename to tests/usertools/14_usermod_move_homedir_other_device/config/etc/group
diff --git a/tests/tests/usertools/11_usermod_move_homedir/config/etc/gshadow b/tests/usertools/14_usermod_move_homedir_other_device/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/11_usermod_move_homedir/config/etc/gshadow
rename to tests/usertools/14_usermod_move_homedir_other_device/config/etc/gshadow
diff --git a/tests/tests/usertools/14_usermod_move_homedir_other_device/config/etc/passwd b/tests/usertools/14_usermod_move_homedir_other_device/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/14_usermod_move_homedir_other_device/config/etc/passwd
rename to tests/usertools/14_usermod_move_homedir_other_device/config/etc/passwd
diff --git a/tests/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/shadow b/tests/usertools/14_usermod_move_homedir_other_device/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/08_userdel_del_from_group_and_gshadow/config/etc/shadow
rename to tests/usertools/14_usermod_move_homedir_other_device/config/etc/shadow
diff --git a/tests/tests/usertools/14_usermod_move_homedir_other_device/data/home_ls-a b/tests/usertools/14_usermod_move_homedir_other_device/data/home_ls-a
similarity index 100%
rename from tests/tests/usertools/14_usermod_move_homedir_other_device/data/home_ls-a
rename to tests/usertools/14_usermod_move_homedir_other_device/data/home_ls-a
diff --git a/tests/tests/usertools/14_usermod_move_homedir_other_device/data/passwd b/tests/usertools/14_usermod_move_homedir_other_device/data/passwd
similarity index 100%
rename from tests/tests/usertools/14_usermod_move_homedir_other_device/data/passwd
rename to tests/usertools/14_usermod_move_homedir_other_device/data/passwd
diff --git a/tests/tests/usertools/14_usermod_move_homedir_other_device/usermod.test b/tests/usertools/14_usermod_move_homedir_other_device/usermod.test
similarity index 100%
rename from tests/tests/usertools/14_usermod_move_homedir_other_device/usermod.test
rename to tests/usertools/14_usermod_move_homedir_other_device/usermod.test
diff --git a/tests/tests/usertools/15_usermod_change_supplementary_groups/config.txt b/tests/usertools/15_usermod_change_supplementary_groups/config.txt
similarity index 100%
rename from tests/tests/usertools/15_usermod_change_supplementary_groups/config.txt
rename to tests/usertools/15_usermod_change_supplementary_groups/config.txt
diff --git a/tests/tests/usertools/15_usermod_change_supplementary_groups/config/etc/default/useradd b/tests/usertools/15_usermod_change_supplementary_groups/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/15_usermod_change_supplementary_groups/config/etc/default/useradd
rename to tests/usertools/15_usermod_change_supplementary_groups/config/etc/default/useradd
diff --git a/tests/tests/subids/55_userdel_no_subuid/config/etc/group b/tests/usertools/15_usermod_change_supplementary_groups/config/etc/group
similarity index 100%
rename from tests/tests/subids/55_userdel_no_subuid/config/etc/group
rename to tests/usertools/15_usermod_change_supplementary_groups/config/etc/group
diff --git a/tests/tests/subids/55_userdel_no_subuid/config/etc/gshadow b/tests/usertools/15_usermod_change_supplementary_groups/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/55_userdel_no_subuid/config/etc/gshadow
rename to tests/usertools/15_usermod_change_supplementary_groups/config/etc/gshadow
diff --git a/tests/tests/usertools/15_usermod_change_supplementary_groups/config/etc/passwd b/tests/usertools/15_usermod_change_supplementary_groups/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/15_usermod_change_supplementary_groups/config/etc/passwd
rename to tests/usertools/15_usermod_change_supplementary_groups/config/etc/passwd
diff --git a/tests/tests/usertools/09_userdel_del_homedir/config/etc/shadow b/tests/usertools/15_usermod_change_supplementary_groups/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/09_userdel_del_homedir/config/etc/shadow
rename to tests/usertools/15_usermod_change_supplementary_groups/config/etc/shadow
diff --git a/tests/tests/usertools/15_usermod_change_supplementary_groups/data/group b/tests/usertools/15_usermod_change_supplementary_groups/data/group
similarity index 100%
rename from tests/tests/usertools/15_usermod_change_supplementary_groups/data/group
rename to tests/usertools/15_usermod_change_supplementary_groups/data/group
diff --git a/tests/tests/usertools/15_usermod_change_supplementary_groups/data/gshadow b/tests/usertools/15_usermod_change_supplementary_groups/data/gshadow
similarity index 100%
rename from tests/tests/usertools/15_usermod_change_supplementary_groups/data/gshadow
rename to tests/usertools/15_usermod_change_supplementary_groups/data/gshadow
diff --git a/tests/tests/usertools/15_usermod_change_supplementary_groups/usermod.test b/tests/usertools/15_usermod_change_supplementary_groups/usermod.test
similarity index 100%
rename from tests/tests/usertools/15_usermod_change_supplementary_groups/usermod.test
rename to tests/usertools/15_usermod_change_supplementary_groups/usermod.test
diff --git a/tests/tests/usertools/16_usermod_clear_supplementary_groups/config.txt b/tests/usertools/16_usermod_clear_supplementary_groups/config.txt
similarity index 100%
rename from tests/tests/usertools/16_usermod_clear_supplementary_groups/config.txt
rename to tests/usertools/16_usermod_clear_supplementary_groups/config.txt
diff --git a/tests/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/default/useradd b/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/default/useradd
rename to tests/usertools/16_usermod_clear_supplementary_groups/config/etc/default/useradd
diff --git a/tests/tests/subids/56_userdel_no_subgid/config/etc/group b/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/group
similarity index 100%
rename from tests/tests/subids/56_userdel_no_subgid/config/etc/group
rename to tests/usertools/16_usermod_clear_supplementary_groups/config/etc/group
diff --git a/tests/tests/subids/56_userdel_no_subgid/config/etc/gshadow b/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/56_userdel_no_subgid/config/etc/gshadow
rename to tests/usertools/16_usermod_clear_supplementary_groups/config/etc/gshadow
diff --git a/tests/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/passwd b/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/passwd
rename to tests/usertools/16_usermod_clear_supplementary_groups/config/etc/passwd
diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/shadow b/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/shadow
rename to tests/usertools/16_usermod_clear_supplementary_groups/config/etc/shadow
diff --git a/tests/tests/usertools/16_usermod_clear_supplementary_groups/data/group b/tests/usertools/16_usermod_clear_supplementary_groups/data/group
similarity index 100%
rename from tests/tests/usertools/16_usermod_clear_supplementary_groups/data/group
rename to tests/usertools/16_usermod_clear_supplementary_groups/data/group
diff --git a/tests/tests/usertools/16_usermod_clear_supplementary_groups/data/gshadow b/tests/usertools/16_usermod_clear_supplementary_groups/data/gshadow
similarity index 100%
rename from tests/tests/usertools/16_usermod_clear_supplementary_groups/data/gshadow
rename to tests/usertools/16_usermod_clear_supplementary_groups/data/gshadow
diff --git a/tests/tests/usertools/16_usermod_clear_supplementary_groups/usermod.test b/tests/usertools/16_usermod_clear_supplementary_groups/usermod.test
similarity index 100%
rename from tests/tests/usertools/16_usermod_clear_supplementary_groups/usermod.test
rename to tests/usertools/16_usermod_clear_supplementary_groups/usermod.test
diff --git a/tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/config.txt b/tests/usertools/17_usermod_change_supplementary_groups_numerical/config.txt
similarity index 100%
rename from tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/config.txt
rename to tests/usertools/17_usermod_change_supplementary_groups_numerical/config.txt
diff --git a/tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/default/useradd b/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/default/useradd
rename to tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/default/useradd
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/config/etc/group b/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/group
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/config/etc/group
rename to tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/group
diff --git a/tests/tests/subids/57_userdel_multiple_ranges/config/etc/gshadow b/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/gshadow
similarity index 100%
rename from tests/tests/subids/57_userdel_multiple_ranges/config/etc/gshadow
rename to tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/gshadow
diff --git a/tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/passwd b/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/passwd
rename to tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/passwd
diff --git a/tests/tests/usertools/11_usermod_move_homedir/config/etc/shadow b/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/11_usermod_move_homedir/config/etc/shadow
rename to tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/shadow
diff --git a/tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/group b/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/group
similarity index 100%
rename from tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/group
rename to tests/usertools/17_usermod_change_supplementary_groups_numerical/data/group
diff --git a/tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/gshadow b/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/gshadow
similarity index 100%
rename from tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/gshadow
rename to tests/usertools/17_usermod_change_supplementary_groups_numerical/data/gshadow
diff --git a/tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/usermod.test b/tests/usertools/17_usermod_change_supplementary_groups_numerical/usermod.test
similarity index 100%
rename from tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/usermod.test
rename to tests/usertools/17_usermod_change_supplementary_groups_numerical/usermod.test
diff --git a/tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config.txt b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config.txt
similarity index 100%
rename from tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config.txt
rename to tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config.txt
diff --git a/tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/default/useradd b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/default/useradd
rename to tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/default/useradd
diff --git a/tests/tests/usertools/15_usermod_change_supplementary_groups/config/etc/group b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/group
similarity index 100%
rename from tests/tests/usertools/15_usermod_change_supplementary_groups/config/etc/group
rename to tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/group
diff --git a/tests/tests/usertools/15_usermod_change_supplementary_groups/config/etc/gshadow b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/15_usermod_change_supplementary_groups/config/etc/gshadow
rename to tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/gshadow
diff --git a/tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/passwd b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/passwd
rename to tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/passwd
diff --git a/tests/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/shadow b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/shadow
rename to tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/shadow
diff --git a/tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/usermod.err b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/usermod.err
rename to tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/usermod.err
diff --git a/tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test
similarity index 100%
rename from tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test
rename to tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test
diff --git a/tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config.txt b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config.txt
similarity index 100%
rename from tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config.txt
rename to tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config.txt
diff --git a/tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/default/useradd b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/default/useradd
rename to tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/default/useradd
diff --git a/tests/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/group b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/group
similarity index 100%
rename from tests/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/group
rename to tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/group
diff --git a/tests/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/gshadow b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/gshadow
rename to tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/gshadow
diff --git a/tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/passwd b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/passwd
rename to tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/passwd
diff --git a/tests/tests/usertools/13_usermod_move_homedir_file/config/etc/shadow b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/13_usermod_move_homedir_file/config/etc/shadow
rename to tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/shadow
diff --git a/tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/usermod.err b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/usermod.err
rename to tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/usermod.err
diff --git a/tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test
similarity index 100%
rename from tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test
rename to tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test
diff --git a/tests/tests/usertools/20_usermod_rename_user_in_member_lists/config.txt b/tests/usertools/20_usermod_rename_user_in_member_lists/config.txt
similarity index 100%
rename from tests/tests/usertools/20_usermod_rename_user_in_member_lists/config.txt
rename to tests/usertools/20_usermod_rename_user_in_member_lists/config.txt
diff --git a/tests/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/default/useradd b/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/default/useradd
rename to tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/default/useradd
diff --git a/tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/group b/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/group
similarity index 100%
rename from tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/group
rename to tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/group
diff --git a/tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/gshadow b/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/gshadow
rename to tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/gshadow
diff --git a/tests/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/passwd b/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/passwd
rename to tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/passwd
diff --git a/tests/tests/usertools/14_usermod_move_homedir_other_device/config/etc/shadow b/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/14_usermod_move_homedir_other_device/config/etc/shadow
rename to tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/shadow
diff --git a/tests/tests/usertools/20_usermod_rename_user_in_member_lists/data/group b/tests/usertools/20_usermod_rename_user_in_member_lists/data/group
similarity index 100%
rename from tests/tests/usertools/20_usermod_rename_user_in_member_lists/data/group
rename to tests/usertools/20_usermod_rename_user_in_member_lists/data/group
diff --git a/tests/tests/usertools/20_usermod_rename_user_in_member_lists/data/gshadow b/tests/usertools/20_usermod_rename_user_in_member_lists/data/gshadow
similarity index 100%
rename from tests/tests/usertools/20_usermod_rename_user_in_member_lists/data/gshadow
rename to tests/usertools/20_usermod_rename_user_in_member_lists/data/gshadow
diff --git a/tests/tests/usertools/20_usermod_rename_user_in_member_lists/data/passwd b/tests/usertools/20_usermod_rename_user_in_member_lists/data/passwd
similarity index 100%
rename from tests/tests/usertools/20_usermod_rename_user_in_member_lists/data/passwd
rename to tests/usertools/20_usermod_rename_user_in_member_lists/data/passwd
diff --git a/tests/tests/usertools/20_usermod_rename_user_in_member_lists/data/shadow b/tests/usertools/20_usermod_rename_user_in_member_lists/data/shadow
similarity index 100%
rename from tests/tests/usertools/20_usermod_rename_user_in_member_lists/data/shadow
rename to tests/usertools/20_usermod_rename_user_in_member_lists/data/shadow
diff --git a/tests/tests/usertools/20_usermod_rename_user_in_member_lists/usermod.test b/tests/usertools/20_usermod_rename_user_in_member_lists/usermod.test
similarity index 100%
rename from tests/tests/usertools/20_usermod_rename_user_in_member_lists/usermod.test
rename to tests/usertools/20_usermod_rename_user_in_member_lists/usermod.test
diff --git a/tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config.txt b/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config.txt
similarity index 100%
rename from tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config.txt
rename to tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config.txt
diff --git a/tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/default/useradd b/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/default/useradd
rename to tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/default/useradd
diff --git a/tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/group b/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/group
similarity index 100%
rename from tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/group
rename to tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/group
diff --git a/tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/gshadow b/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/gshadow
rename to tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/gshadow
diff --git a/tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/passwd b/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/passwd
rename to tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/passwd
diff --git a/tests/tests/usertools/15_usermod_change_supplementary_groups/config/etc/shadow b/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/15_usermod_change_supplementary_groups/config/etc/shadow
rename to tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/shadow
diff --git a/tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/group b/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/group
similarity index 100%
rename from tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/group
rename to tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/group
diff --git a/tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/gshadow b/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/gshadow
similarity index 100%
rename from tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/gshadow
rename to tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/gshadow
diff --git a/tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/passwd b/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/passwd
similarity index 100%
rename from tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/passwd
rename to tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/passwd
diff --git a/tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/shadow b/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/shadow
similarity index 100%
rename from tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/shadow
rename to tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/shadow
diff --git a/tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/usermod.test b/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/usermod.test
similarity index 100%
rename from tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/usermod.test
rename to tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/usermod.test
diff --git a/tests/tests/usertools/22_usermod-a_existing_supplementary_group/config.txt b/tests/usertools/22_usermod-a_existing_supplementary_group/config.txt
similarity index 100%
rename from tests/tests/usertools/22_usermod-a_existing_supplementary_group/config.txt
rename to tests/usertools/22_usermod-a_existing_supplementary_group/config.txt
diff --git a/tests/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/default/useradd b/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/default/useradd
rename to tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/default/useradd
diff --git a/tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/group b/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/group
similarity index 100%
rename from tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/group
rename to tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/group
diff --git a/tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/gshadow b/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/gshadow
rename to tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/gshadow
diff --git a/tests/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/passwd b/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/passwd
rename to tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/passwd
diff --git a/tests/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/shadow b/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/shadow
rename to tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/shadow
diff --git a/tests/tests/usertools/22_usermod-a_existing_supplementary_group/data/group b/tests/usertools/22_usermod-a_existing_supplementary_group/data/group
similarity index 100%
rename from tests/tests/usertools/22_usermod-a_existing_supplementary_group/data/group
rename to tests/usertools/22_usermod-a_existing_supplementary_group/data/group
diff --git a/tests/tests/usertools/22_usermod-a_existing_supplementary_group/data/gshadow b/tests/usertools/22_usermod-a_existing_supplementary_group/data/gshadow
similarity index 100%
rename from tests/tests/usertools/22_usermod-a_existing_supplementary_group/data/gshadow
rename to tests/usertools/22_usermod-a_existing_supplementary_group/data/gshadow
diff --git a/tests/tests/usertools/22_usermod-a_existing_supplementary_group/usermod.test b/tests/usertools/22_usermod-a_existing_supplementary_group/usermod.test
similarity index 100%
rename from tests/tests/usertools/22_usermod-a_existing_supplementary_group/usermod.test
rename to tests/usertools/22_usermod-a_existing_supplementary_group/usermod.test
diff --git a/tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config.txt b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config.txt
similarity index 100%
rename from tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config.txt
rename to tests/usertools/23_usermod-a_existing_supplementary_group+rename/config.txt
diff --git a/tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/default/useradd b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/default/useradd
rename to tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/default/useradd
diff --git a/tests/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/group b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/group
similarity index 100%
rename from tests/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/group
rename to tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/group
diff --git a/tests/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/gshadow b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/gshadow
rename to tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/gshadow
diff --git a/tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/passwd b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/passwd
rename to tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/passwd
diff --git a/tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/shadow b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/shadow
rename to tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/shadow
diff --git a/tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/group b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/group
similarity index 100%
rename from tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/group
rename to tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/group
diff --git a/tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/gshadow b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/gshadow
similarity index 100%
rename from tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/gshadow
rename to tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/gshadow
diff --git a/tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/passwd b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/passwd
similarity index 100%
rename from tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/passwd
rename to tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/passwd
diff --git a/tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/shadow b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/shadow
similarity index 100%
rename from tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/shadow
rename to tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/shadow
diff --git a/tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/usermod.test b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/usermod.test
similarity index 100%
rename from tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/usermod.test
rename to tests/usertools/23_usermod-a_existing_supplementary_group+rename/usermod.test
diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/config.txt b/tests/usertools/24_usermod_locked_passwd/config.txt
similarity index 100%
rename from tests/tests/subids/61_newusers_user_already_has_subgids/config.txt
rename to tests/usertools/24_usermod_locked_passwd/config.txt
diff --git a/tests/tests/usertools/24_usermod_locked_passwd/config/etc/default/useradd b/tests/usertools/24_usermod_locked_passwd/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/24_usermod_locked_passwd/config/etc/default/useradd
rename to tests/usertools/24_usermod_locked_passwd/config/etc/default/useradd
diff --git a/tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/group b/tests/usertools/24_usermod_locked_passwd/config/etc/group
similarity index 100%
rename from tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/group
rename to tests/usertools/24_usermod_locked_passwd/config/etc/group
diff --git a/tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/gshadow b/tests/usertools/24_usermod_locked_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/gshadow
rename to tests/usertools/24_usermod_locked_passwd/config/etc/gshadow
diff --git a/tests/tests/usertools/24_usermod_locked_passwd/config/etc/passwd b/tests/usertools/24_usermod_locked_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/24_usermod_locked_passwd/config/etc/passwd
rename to tests/usertools/24_usermod_locked_passwd/config/etc/passwd
diff --git a/tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/shadow b/tests/usertools/24_usermod_locked_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/shadow
rename to tests/usertools/24_usermod_locked_passwd/config/etc/shadow
diff --git a/tests/tests/usertools/24_usermod_locked_passwd/data/usermod.err b/tests/usertools/24_usermod_locked_passwd/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/24_usermod_locked_passwd/data/usermod.err
rename to tests/usertools/24_usermod_locked_passwd/data/usermod.err
diff --git a/tests/tests/usertools/24_usermod_locked_passwd/usermod.test b/tests/usertools/24_usermod_locked_passwd/usermod.test
similarity index 100%
rename from tests/tests/usertools/24_usermod_locked_passwd/usermod.test
rename to tests/usertools/24_usermod_locked_passwd/usermod.test
diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/config.txt b/tests/usertools/25_usermod-G_locked_group/config.txt
similarity index 100%
rename from tests/tests/subids/62_newusers_user_already_has_subuids/config.txt
rename to tests/usertools/25_usermod-G_locked_group/config.txt
diff --git a/tests/tests/usertools/25_usermod-G_locked_group/config/etc/default/useradd b/tests/usertools/25_usermod-G_locked_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/25_usermod-G_locked_group/config/etc/default/useradd
rename to tests/usertools/25_usermod-G_locked_group/config/etc/default/useradd
diff --git a/tests/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/group b/tests/usertools/25_usermod-G_locked_group/config/etc/group
similarity index 100%
rename from tests/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/group
rename to tests/usertools/25_usermod-G_locked_group/config/etc/group
diff --git a/tests/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/gshadow b/tests/usertools/25_usermod-G_locked_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/gshadow
rename to tests/usertools/25_usermod-G_locked_group/config/etc/gshadow
diff --git a/tests/tests/usertools/25_usermod-G_locked_group/config/etc/passwd b/tests/usertools/25_usermod-G_locked_group/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/25_usermod-G_locked_group/config/etc/passwd
rename to tests/usertools/25_usermod-G_locked_group/config/etc/passwd
diff --git a/tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/shadow b/tests/usertools/25_usermod-G_locked_group/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/shadow
rename to tests/usertools/25_usermod-G_locked_group/config/etc/shadow
diff --git a/tests/tests/usertools/25_usermod-G_locked_group/data/usermod.err b/tests/usertools/25_usermod-G_locked_group/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/25_usermod-G_locked_group/data/usermod.err
rename to tests/usertools/25_usermod-G_locked_group/data/usermod.err
diff --git a/tests/tests/usertools/25_usermod-G_locked_group/usermod.test b/tests/usertools/25_usermod-G_locked_group/usermod.test
similarity index 100%
rename from tests/tests/usertools/25_usermod-G_locked_group/usermod.test
rename to tests/usertools/25_usermod-G_locked_group/usermod.test
diff --git a/tests/tests/subids/63_useradd_fill_gap4/config.txt b/tests/usertools/26_usermod_locked_shadow/config.txt
similarity index 100%
rename from tests/tests/subids/63_useradd_fill_gap4/config.txt
rename to tests/usertools/26_usermod_locked_shadow/config.txt
diff --git a/tests/tests/usertools/26_usermod_locked_shadow/config/etc/default/useradd b/tests/usertools/26_usermod_locked_shadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/26_usermod_locked_shadow/config/etc/default/useradd
rename to tests/usertools/26_usermod_locked_shadow/config/etc/default/useradd
diff --git a/tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/group b/tests/usertools/26_usermod_locked_shadow/config/etc/group
similarity index 100%
rename from tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/group
rename to tests/usertools/26_usermod_locked_shadow/config/etc/group
diff --git a/tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/gshadow b/tests/usertools/26_usermod_locked_shadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/gshadow
rename to tests/usertools/26_usermod_locked_shadow/config/etc/gshadow
diff --git a/tests/tests/usertools/26_usermod_locked_shadow/config/etc/passwd b/tests/usertools/26_usermod_locked_shadow/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/26_usermod_locked_shadow/config/etc/passwd
rename to tests/usertools/26_usermod_locked_shadow/config/etc/passwd
diff --git a/tests/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/shadow b/tests/usertools/26_usermod_locked_shadow/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/shadow
rename to tests/usertools/26_usermod_locked_shadow/config/etc/shadow
diff --git a/tests/tests/usertools/26_usermod_locked_shadow/data/usermod.err b/tests/usertools/26_usermod_locked_shadow/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/26_usermod_locked_shadow/data/usermod.err
rename to tests/usertools/26_usermod_locked_shadow/data/usermod.err
diff --git a/tests/tests/usertools/26_usermod_locked_shadow/usermod.test b/tests/usertools/26_usermod_locked_shadow/usermod.test
similarity index 100%
rename from tests/tests/usertools/26_usermod_locked_shadow/usermod.test
rename to tests/usertools/26_usermod_locked_shadow/usermod.test
diff --git a/tests/tests/subids/64_useradd_fill_gap5/config.txt b/tests/usertools/27_usermod-G_locked_gshadow/config.txt
similarity index 100%
rename from tests/tests/subids/64_useradd_fill_gap5/config.txt
rename to tests/usertools/27_usermod-G_locked_gshadow/config.txt
diff --git a/tests/tests/usertools/27_usermod-G_locked_gshadow/config/etc/default/useradd b/tests/usertools/27_usermod-G_locked_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/27_usermod-G_locked_gshadow/config/etc/default/useradd
rename to tests/usertools/27_usermod-G_locked_gshadow/config/etc/default/useradd
diff --git a/tests/tests/usertools/24_usermod_locked_passwd/config/etc/group b/tests/usertools/27_usermod-G_locked_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/usertools/24_usermod_locked_passwd/config/etc/group
rename to tests/usertools/27_usermod-G_locked_gshadow/config/etc/group
diff --git a/tests/tests/usertools/24_usermod_locked_passwd/config/etc/gshadow b/tests/usertools/27_usermod-G_locked_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/24_usermod_locked_passwd/config/etc/gshadow
rename to tests/usertools/27_usermod-G_locked_gshadow/config/etc/gshadow
diff --git a/tests/tests/usertools/27_usermod-G_locked_gshadow/config/etc/passwd b/tests/usertools/27_usermod-G_locked_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/27_usermod-G_locked_gshadow/config/etc/passwd
rename to tests/usertools/27_usermod-G_locked_gshadow/config/etc/passwd
diff --git a/tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/shadow b/tests/usertools/27_usermod-G_locked_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/config/etc/shadow
rename to tests/usertools/27_usermod-G_locked_gshadow/config/etc/shadow
diff --git a/tests/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err b/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err
rename to tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err
diff --git a/tests/tests/usertools/27_usermod-G_locked_gshadow/usermod.test b/tests/usertools/27_usermod-G_locked_gshadow/usermod.test
similarity index 100%
rename from tests/tests/usertools/27_usermod-G_locked_gshadow/usermod.test
rename to tests/usertools/27_usermod-G_locked_gshadow/usermod.test
diff --git a/tests/tests/usertools/28_usermod-c_locked_group/config.txt b/tests/usertools/28_usermod-c_locked_group/config.txt
similarity index 100%
rename from tests/tests/usertools/28_usermod-c_locked_group/config.txt
rename to tests/usertools/28_usermod-c_locked_group/config.txt
diff --git a/tests/tests/usertools/28_usermod-c_locked_group/config/etc/default/useradd b/tests/usertools/28_usermod-c_locked_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/28_usermod-c_locked_group/config/etc/default/useradd
rename to tests/usertools/28_usermod-c_locked_group/config/etc/default/useradd
diff --git a/tests/tests/usertools/25_usermod-G_locked_group/config/etc/group b/tests/usertools/28_usermod-c_locked_group/config/etc/group
similarity index 100%
rename from tests/tests/usertools/25_usermod-G_locked_group/config/etc/group
rename to tests/usertools/28_usermod-c_locked_group/config/etc/group
diff --git a/tests/tests/usertools/25_usermod-G_locked_group/config/etc/gshadow b/tests/usertools/28_usermod-c_locked_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/25_usermod-G_locked_group/config/etc/gshadow
rename to tests/usertools/28_usermod-c_locked_group/config/etc/gshadow
diff --git a/tests/tests/usertools/28_usermod-c_locked_group/config/etc/passwd b/tests/usertools/28_usermod-c_locked_group/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/28_usermod-c_locked_group/config/etc/passwd
rename to tests/usertools/28_usermod-c_locked_group/config/etc/passwd
diff --git a/tests/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/shadow b/tests/usertools/28_usermod-c_locked_group/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/shadow
rename to tests/usertools/28_usermod-c_locked_group/config/etc/shadow
diff --git a/tests/tests/usertools/28_usermod-c_locked_group/data/passwd b/tests/usertools/28_usermod-c_locked_group/data/passwd
similarity index 100%
rename from tests/tests/usertools/28_usermod-c_locked_group/data/passwd
rename to tests/usertools/28_usermod-c_locked_group/data/passwd
diff --git a/tests/tests/usertools/28_usermod-c_locked_group/usermod.test b/tests/usertools/28_usermod-c_locked_group/usermod.test
similarity index 100%
rename from tests/tests/usertools/28_usermod-c_locked_group/usermod.test
rename to tests/usertools/28_usermod-c_locked_group/usermod.test
diff --git a/tests/tests/usertools/29_usermod-c_locked_gshadow/config.txt b/tests/usertools/29_usermod-c_locked_gshadow/config.txt
similarity index 100%
rename from tests/tests/usertools/29_usermod-c_locked_gshadow/config.txt
rename to tests/usertools/29_usermod-c_locked_gshadow/config.txt
diff --git a/tests/tests/usertools/29_usermod-c_locked_gshadow/config/etc/default/useradd b/tests/usertools/29_usermod-c_locked_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/29_usermod-c_locked_gshadow/config/etc/default/useradd
rename to tests/usertools/29_usermod-c_locked_gshadow/config/etc/default/useradd
diff --git a/tests/tests/usertools/26_usermod_locked_shadow/config/etc/group b/tests/usertools/29_usermod-c_locked_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/usertools/26_usermod_locked_shadow/config/etc/group
rename to tests/usertools/29_usermod-c_locked_gshadow/config/etc/group
diff --git a/tests/tests/usertools/26_usermod_locked_shadow/config/etc/gshadow b/tests/usertools/29_usermod-c_locked_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/26_usermod_locked_shadow/config/etc/gshadow
rename to tests/usertools/29_usermod-c_locked_gshadow/config/etc/gshadow
diff --git a/tests/tests/usertools/29_usermod-c_locked_gshadow/config/etc/passwd b/tests/usertools/29_usermod-c_locked_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/29_usermod-c_locked_gshadow/config/etc/passwd
rename to tests/usertools/29_usermod-c_locked_gshadow/config/etc/passwd
diff --git a/tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/shadow b/tests/usertools/29_usermod-c_locked_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/shadow
rename to tests/usertools/29_usermod-c_locked_gshadow/config/etc/shadow
diff --git a/tests/tests/usertools/29_usermod-c_locked_gshadow/data/passwd b/tests/usertools/29_usermod-c_locked_gshadow/data/passwd
similarity index 100%
rename from tests/tests/usertools/29_usermod-c_locked_gshadow/data/passwd
rename to tests/usertools/29_usermod-c_locked_gshadow/data/passwd
diff --git a/tests/tests/usertools/29_usermod-c_locked_gshadow/usermod.test b/tests/usertools/29_usermod-c_locked_gshadow/usermod.test
similarity index 100%
rename from tests/tests/usertools/29_usermod-c_locked_gshadow/usermod.test
rename to tests/usertools/29_usermod-c_locked_gshadow/usermod.test
diff --git a/tests/tests/usertools/30_usermod-l_locked_group/config.txt b/tests/usertools/30_usermod-l_locked_group/config.txt
similarity index 100%
rename from tests/tests/usertools/30_usermod-l_locked_group/config.txt
rename to tests/usertools/30_usermod-l_locked_group/config.txt
diff --git a/tests/tests/usertools/30_usermod-l_locked_group/config/etc/default/useradd b/tests/usertools/30_usermod-l_locked_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/30_usermod-l_locked_group/config/etc/default/useradd
rename to tests/usertools/30_usermod-l_locked_group/config/etc/default/useradd
diff --git a/tests/tests/usertools/27_usermod-G_locked_gshadow/config/etc/group b/tests/usertools/30_usermod-l_locked_group/config/etc/group
similarity index 100%
rename from tests/tests/usertools/27_usermod-G_locked_gshadow/config/etc/group
rename to tests/usertools/30_usermod-l_locked_group/config/etc/group
diff --git a/tests/tests/usertools/27_usermod-G_locked_gshadow/config/etc/gshadow b/tests/usertools/30_usermod-l_locked_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/27_usermod-G_locked_gshadow/config/etc/gshadow
rename to tests/usertools/30_usermod-l_locked_group/config/etc/gshadow
diff --git a/tests/tests/usertools/30_usermod-l_locked_group/config/etc/passwd b/tests/usertools/30_usermod-l_locked_group/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/30_usermod-l_locked_group/config/etc/passwd
rename to tests/usertools/30_usermod-l_locked_group/config/etc/passwd
diff --git a/tests/tests/usertools/24_usermod_locked_passwd/config/etc/shadow b/tests/usertools/30_usermod-l_locked_group/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/24_usermod_locked_passwd/config/etc/shadow
rename to tests/usertools/30_usermod-l_locked_group/config/etc/shadow
diff --git a/tests/tests/usertools/30_usermod-l_locked_group/data/usermod.err b/tests/usertools/30_usermod-l_locked_group/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/30_usermod-l_locked_group/data/usermod.err
rename to tests/usertools/30_usermod-l_locked_group/data/usermod.err
diff --git a/tests/tests/usertools/30_usermod-l_locked_group/usermod.test b/tests/usertools/30_usermod-l_locked_group/usermod.test
similarity index 100%
rename from tests/tests/usertools/30_usermod-l_locked_group/usermod.test
rename to tests/usertools/30_usermod-l_locked_group/usermod.test
diff --git a/tests/tests/usertools/31_usermod-l_locked_gshadow/config.txt b/tests/usertools/31_usermod-l_locked_gshadow/config.txt
similarity index 100%
rename from tests/tests/usertools/31_usermod-l_locked_gshadow/config.txt
rename to tests/usertools/31_usermod-l_locked_gshadow/config.txt
diff --git a/tests/tests/usertools/31_usermod-l_locked_gshadow/config/etc/default/useradd b/tests/usertools/31_usermod-l_locked_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/31_usermod-l_locked_gshadow/config/etc/default/useradd
rename to tests/usertools/31_usermod-l_locked_gshadow/config/etc/default/useradd
diff --git a/tests/tests/usertools/28_usermod-c_locked_group/config/etc/group b/tests/usertools/31_usermod-l_locked_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/usertools/28_usermod-c_locked_group/config/etc/group
rename to tests/usertools/31_usermod-l_locked_gshadow/config/etc/group
diff --git a/tests/tests/usertools/28_usermod-c_locked_group/config/etc/gshadow b/tests/usertools/31_usermod-l_locked_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/28_usermod-c_locked_group/config/etc/gshadow
rename to tests/usertools/31_usermod-l_locked_gshadow/config/etc/gshadow
diff --git a/tests/tests/usertools/31_usermod-l_locked_gshadow/config/etc/passwd b/tests/usertools/31_usermod-l_locked_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/31_usermod-l_locked_gshadow/config/etc/passwd
rename to tests/usertools/31_usermod-l_locked_gshadow/config/etc/passwd
diff --git a/tests/tests/usertools/25_usermod-G_locked_group/config/etc/shadow b/tests/usertools/31_usermod-l_locked_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/25_usermod-G_locked_group/config/etc/shadow
rename to tests/usertools/31_usermod-l_locked_gshadow/config/etc/shadow
diff --git a/tests/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err b/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err
rename to tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err
diff --git a/tests/tests/usertools/31_usermod-l_locked_gshadow/usermod.test b/tests/usertools/31_usermod-l_locked_gshadow/usermod.test
similarity index 100%
rename from tests/tests/usertools/31_usermod-l_locked_gshadow/usermod.test
rename to tests/usertools/31_usermod-l_locked_gshadow/usermod.test
diff --git a/tests/tests/usertools/32_usermod-u_new_UID/config.txt b/tests/usertools/32_usermod-u_new_UID/config.txt
similarity index 100%
rename from tests/tests/usertools/32_usermod-u_new_UID/config.txt
rename to tests/usertools/32_usermod-u_new_UID/config.txt
diff --git a/tests/tests/usertools/32_usermod-u_new_UID/config/etc/default/useradd b/tests/usertools/32_usermod-u_new_UID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/32_usermod-u_new_UID/config/etc/default/useradd
rename to tests/usertools/32_usermod-u_new_UID/config/etc/default/useradd
diff --git a/tests/tests/usertools/29_usermod-c_locked_gshadow/config/etc/group b/tests/usertools/32_usermod-u_new_UID/config/etc/group
similarity index 100%
rename from tests/tests/usertools/29_usermod-c_locked_gshadow/config/etc/group
rename to tests/usertools/32_usermod-u_new_UID/config/etc/group
diff --git a/tests/tests/usertools/29_usermod-c_locked_gshadow/config/etc/gshadow b/tests/usertools/32_usermod-u_new_UID/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/29_usermod-c_locked_gshadow/config/etc/gshadow
rename to tests/usertools/32_usermod-u_new_UID/config/etc/gshadow
diff --git a/tests/tests/usertools/32_usermod-u_new_UID/config/etc/passwd b/tests/usertools/32_usermod-u_new_UID/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/32_usermod-u_new_UID/config/etc/passwd
rename to tests/usertools/32_usermod-u_new_UID/config/etc/passwd
diff --git a/tests/tests/usertools/26_usermod_locked_shadow/config/etc/shadow b/tests/usertools/32_usermod-u_new_UID/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/26_usermod_locked_shadow/config/etc/shadow
rename to tests/usertools/32_usermod-u_new_UID/config/etc/shadow
diff --git a/tests/tests/usertools/32_usermod-u_new_UID/data/passwd b/tests/usertools/32_usermod-u_new_UID/data/passwd
similarity index 100%
rename from tests/tests/usertools/32_usermod-u_new_UID/data/passwd
rename to tests/usertools/32_usermod-u_new_UID/data/passwd
diff --git a/tests/tests/usertools/32_usermod-u_new_UID/usermod.test b/tests/usertools/32_usermod-u_new_UID/usermod.test
similarity index 100%
rename from tests/tests/usertools/32_usermod-u_new_UID/usermod.test
rename to tests/usertools/32_usermod-u_new_UID/usermod.test
diff --git a/tests/tests/usertools/33_usermod-u_existing_UID/config.txt b/tests/usertools/33_usermod-u_existing_UID/config.txt
similarity index 100%
rename from tests/tests/usertools/33_usermod-u_existing_UID/config.txt
rename to tests/usertools/33_usermod-u_existing_UID/config.txt
diff --git a/tests/tests/usertools/33_usermod-u_existing_UID/config/etc/default/useradd b/tests/usertools/33_usermod-u_existing_UID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/33_usermod-u_existing_UID/config/etc/default/useradd
rename to tests/usertools/33_usermod-u_existing_UID/config/etc/default/useradd
diff --git a/tests/tests/usertools/33_usermod-u_existing_UID/config/etc/group b/tests/usertools/33_usermod-u_existing_UID/config/etc/group
similarity index 100%
rename from tests/tests/usertools/33_usermod-u_existing_UID/config/etc/group
rename to tests/usertools/33_usermod-u_existing_UID/config/etc/group
diff --git a/tests/tests/usertools/33_usermod-u_existing_UID/config/etc/gshadow b/tests/usertools/33_usermod-u_existing_UID/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/33_usermod-u_existing_UID/config/etc/gshadow
rename to tests/usertools/33_usermod-u_existing_UID/config/etc/gshadow
diff --git a/tests/tests/usertools/33_usermod-u_existing_UID/config/etc/passwd b/tests/usertools/33_usermod-u_existing_UID/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/33_usermod-u_existing_UID/config/etc/passwd
rename to tests/usertools/33_usermod-u_existing_UID/config/etc/passwd
diff --git a/tests/tests/usertools/33_usermod-u_existing_UID/config/etc/shadow b/tests/usertools/33_usermod-u_existing_UID/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/33_usermod-u_existing_UID/config/etc/shadow
rename to tests/usertools/33_usermod-u_existing_UID/config/etc/shadow
diff --git a/tests/tests/usertools/33_usermod-u_existing_UID/data/usermod.err b/tests/usertools/33_usermod-u_existing_UID/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/33_usermod-u_existing_UID/data/usermod.err
rename to tests/usertools/33_usermod-u_existing_UID/data/usermod.err
diff --git a/tests/tests/usertools/33_usermod-u_existing_UID/usermod.test b/tests/usertools/33_usermod-u_existing_UID/usermod.test
similarity index 100%
rename from tests/tests/usertools/33_usermod-u_existing_UID/usermod.test
rename to tests/usertools/33_usermod-u_existing_UID/usermod.test
diff --git a/tests/tests/usertools/34_usermod-u-o_existing_UID/config.txt b/tests/usertools/34_usermod-u-o_existing_UID/config.txt
similarity index 100%
rename from tests/tests/usertools/34_usermod-u-o_existing_UID/config.txt
rename to tests/usertools/34_usermod-u-o_existing_UID/config.txt
diff --git a/tests/tests/usertools/34_usermod-u-o_existing_UID/config/etc/default/useradd b/tests/usertools/34_usermod-u-o_existing_UID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/34_usermod-u-o_existing_UID/config/etc/default/useradd
rename to tests/usertools/34_usermod-u-o_existing_UID/config/etc/default/useradd
diff --git a/tests/tests/usertools/34_usermod-u-o_existing_UID/config/etc/group b/tests/usertools/34_usermod-u-o_existing_UID/config/etc/group
similarity index 100%
rename from tests/tests/usertools/34_usermod-u-o_existing_UID/config/etc/group
rename to tests/usertools/34_usermod-u-o_existing_UID/config/etc/group
diff --git a/tests/tests/usertools/34_usermod-u-o_existing_UID/config/etc/gshadow b/tests/usertools/34_usermod-u-o_existing_UID/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/34_usermod-u-o_existing_UID/config/etc/gshadow
rename to tests/usertools/34_usermod-u-o_existing_UID/config/etc/gshadow
diff --git a/tests/tests/usertools/34_usermod-u-o_existing_UID/config/etc/passwd b/tests/usertools/34_usermod-u-o_existing_UID/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/34_usermod-u-o_existing_UID/config/etc/passwd
rename to tests/usertools/34_usermod-u-o_existing_UID/config/etc/passwd
diff --git a/tests/tests/usertools/34_usermod-u-o_existing_UID/config/etc/shadow b/tests/usertools/34_usermod-u-o_existing_UID/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/34_usermod-u-o_existing_UID/config/etc/shadow
rename to tests/usertools/34_usermod-u-o_existing_UID/config/etc/shadow
diff --git a/tests/tests/usertools/34_usermod-u-o_existing_UID/data/passwd b/tests/usertools/34_usermod-u-o_existing_UID/data/passwd
similarity index 100%
rename from tests/tests/usertools/34_usermod-u-o_existing_UID/data/passwd
rename to tests/usertools/34_usermod-u-o_existing_UID/data/passwd
diff --git a/tests/tests/usertools/34_usermod-u-o_existing_UID/usermod.test b/tests/usertools/34_usermod-u-o_existing_UID/usermod.test
similarity index 100%
rename from tests/tests/usertools/34_usermod-u-o_existing_UID/usermod.test
rename to tests/usertools/34_usermod-u-o_existing_UID/usermod.test
diff --git a/tests/tests/usertools/35_usermod-u_invalid_UID/config.txt b/tests/usertools/35_usermod-u_invalid_UID/config.txt
similarity index 100%
rename from tests/tests/usertools/35_usermod-u_invalid_UID/config.txt
rename to tests/usertools/35_usermod-u_invalid_UID/config.txt
diff --git a/tests/tests/usertools/35_usermod-u_invalid_UID/config/etc/default/useradd b/tests/usertools/35_usermod-u_invalid_UID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/35_usermod-u_invalid_UID/config/etc/default/useradd
rename to tests/usertools/35_usermod-u_invalid_UID/config/etc/default/useradd
diff --git a/tests/tests/usertools/35_usermod-u_invalid_UID/config/etc/group b/tests/usertools/35_usermod-u_invalid_UID/config/etc/group
similarity index 100%
rename from tests/tests/usertools/35_usermod-u_invalid_UID/config/etc/group
rename to tests/usertools/35_usermod-u_invalid_UID/config/etc/group
diff --git a/tests/tests/usertools/35_usermod-u_invalid_UID/config/etc/gshadow b/tests/usertools/35_usermod-u_invalid_UID/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/35_usermod-u_invalid_UID/config/etc/gshadow
rename to tests/usertools/35_usermod-u_invalid_UID/config/etc/gshadow
diff --git a/tests/tests/usertools/35_usermod-u_invalid_UID/config/etc/passwd b/tests/usertools/35_usermod-u_invalid_UID/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/35_usermod-u_invalid_UID/config/etc/passwd
rename to tests/usertools/35_usermod-u_invalid_UID/config/etc/passwd
diff --git a/tests/tests/usertools/35_usermod-u_invalid_UID/config/etc/shadow b/tests/usertools/35_usermod-u_invalid_UID/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/35_usermod-u_invalid_UID/config/etc/shadow
rename to tests/usertools/35_usermod-u_invalid_UID/config/etc/shadow
diff --git a/tests/tests/usertools/35_usermod-u_invalid_UID/data/usermod.err b/tests/usertools/35_usermod-u_invalid_UID/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/35_usermod-u_invalid_UID/data/usermod.err
rename to tests/usertools/35_usermod-u_invalid_UID/data/usermod.err
diff --git a/tests/tests/usertools/35_usermod-u_invalid_UID/usermod.test b/tests/usertools/35_usermod-u_invalid_UID/usermod.test
similarity index 100%
rename from tests/tests/usertools/35_usermod-u_invalid_UID/usermod.test
rename to tests/usertools/35_usermod-u_invalid_UID/usermod.test
diff --git a/tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config.txt b/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config.txt
similarity index 100%
rename from tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config.txt
rename to tests/usertools/36_usermod_change_uid+move_homedir_other_device/config.txt
diff --git a/tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/default/useradd b/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/default/useradd
rename to tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/default/useradd
diff --git a/tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/group b/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/group
similarity index 100%
rename from tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/group
rename to tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/group
diff --git a/tests/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/gshadow b/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/gshadow
rename to tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/gshadow
diff --git a/tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/passwd b/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/passwd
rename to tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/passwd
diff --git a/tests/tests/usertools/27_usermod-G_locked_gshadow/config/etc/shadow b/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/27_usermod-G_locked_gshadow/config/etc/shadow
rename to tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/shadow
diff --git a/tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/home_ls-a b/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/home_ls-a
similarity index 100%
rename from tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/home_ls-a
rename to tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/home_ls-a
diff --git a/tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/passwd b/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/passwd
similarity index 100%
rename from tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/passwd
rename to tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/passwd
diff --git a/tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/usermod.test b/tests/usertools/36_usermod_change_uid+move_homedir_other_device/usermod.test
similarity index 100%
rename from tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/usermod.test
rename to tests/usertools/36_usermod_change_uid+move_homedir_other_device/usermod.test
diff --git a/tests/tests/usertools/37_Debian_Bug_470745/config.txt b/tests/usertools/37_Debian_Bug_470745/config.txt
similarity index 100%
rename from tests/tests/usertools/37_Debian_Bug_470745/config.txt
rename to tests/usertools/37_Debian_Bug_470745/config.txt
diff --git a/tests/tests/usertools/37_Debian_Bug_470745/config/etc/default/useradd b/tests/usertools/37_Debian_Bug_470745/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/37_Debian_Bug_470745/config/etc/default/useradd
rename to tests/usertools/37_Debian_Bug_470745/config/etc/default/useradd
diff --git a/tests/tests/usertools/37_Debian_Bug_470745/config/etc/group b/tests/usertools/37_Debian_Bug_470745/config/etc/group
similarity index 100%
rename from tests/tests/usertools/37_Debian_Bug_470745/config/etc/group
rename to tests/usertools/37_Debian_Bug_470745/config/etc/group
diff --git a/tests/tests/usertools/37_Debian_Bug_470745/config/etc/gshadow b/tests/usertools/37_Debian_Bug_470745/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/37_Debian_Bug_470745/config/etc/gshadow
rename to tests/usertools/37_Debian_Bug_470745/config/etc/gshadow
diff --git a/tests/tests/usertools/37_Debian_Bug_470745/config/etc/passwd b/tests/usertools/37_Debian_Bug_470745/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/37_Debian_Bug_470745/config/etc/passwd
rename to tests/usertools/37_Debian_Bug_470745/config/etc/passwd
diff --git a/tests/tests/usertools/37_Debian_Bug_470745/config/etc/shadow b/tests/usertools/37_Debian_Bug_470745/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/37_Debian_Bug_470745/config/etc/shadow
rename to tests/usertools/37_Debian_Bug_470745/config/etc/shadow
diff --git a/tests/tests/usertools/37_Debian_Bug_470745/data/group b/tests/usertools/37_Debian_Bug_470745/data/group
similarity index 100%
rename from tests/tests/usertools/37_Debian_Bug_470745/data/group
rename to tests/usertools/37_Debian_Bug_470745/data/group
diff --git a/tests/tests/usertools/37_Debian_Bug_470745/data/gshadow b/tests/usertools/37_Debian_Bug_470745/data/gshadow
similarity index 100%
rename from tests/tests/usertools/37_Debian_Bug_470745/data/gshadow
rename to tests/usertools/37_Debian_Bug_470745/data/gshadow
diff --git a/tests/tests/usertools/37_Debian_Bug_470745/data/passwd b/tests/usertools/37_Debian_Bug_470745/data/passwd
similarity index 100%
rename from tests/tests/usertools/37_Debian_Bug_470745/data/passwd
rename to tests/usertools/37_Debian_Bug_470745/data/passwd
diff --git a/tests/tests/usertools/37_Debian_Bug_470745/data/shadow b/tests/usertools/37_Debian_Bug_470745/data/shadow
similarity index 100%
rename from tests/tests/usertools/37_Debian_Bug_470745/data/shadow
rename to tests/usertools/37_Debian_Bug_470745/data/shadow
diff --git a/tests/tests/usertools/37_Debian_Bug_470745/data/usermod.err b/tests/usertools/37_Debian_Bug_470745/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/37_Debian_Bug_470745/data/usermod.err
rename to tests/usertools/37_Debian_Bug_470745/data/usermod.err
diff --git a/tests/tests/usertools/37_Debian_Bug_470745/usermod.test b/tests/usertools/37_Debian_Bug_470745/usermod.test
similarity index 100%
rename from tests/tests/usertools/37_Debian_Bug_470745/usermod.test
rename to tests/usertools/37_Debian_Bug_470745/usermod.test
diff --git a/tests/tests/usertools/38_usermod_invalid_user/config.txt b/tests/usertools/38_usermod_invalid_user/config.txt
similarity index 100%
rename from tests/tests/usertools/38_usermod_invalid_user/config.txt
rename to tests/usertools/38_usermod_invalid_user/config.txt
diff --git a/tests/tests/usertools/38_usermod_invalid_user/config/etc/default/useradd b/tests/usertools/38_usermod_invalid_user/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/38_usermod_invalid_user/config/etc/default/useradd
rename to tests/usertools/38_usermod_invalid_user/config/etc/default/useradd
diff --git a/tests/tests/usertools/38_usermod_invalid_user/config/etc/group b/tests/usertools/38_usermod_invalid_user/config/etc/group
similarity index 100%
rename from tests/tests/usertools/38_usermod_invalid_user/config/etc/group
rename to tests/usertools/38_usermod_invalid_user/config/etc/group
diff --git a/tests/tests/usertools/38_usermod_invalid_user/config/etc/gshadow b/tests/usertools/38_usermod_invalid_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/38_usermod_invalid_user/config/etc/gshadow
rename to tests/usertools/38_usermod_invalid_user/config/etc/gshadow
diff --git a/tests/tests/usertools/38_usermod_invalid_user/config/etc/passwd b/tests/usertools/38_usermod_invalid_user/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/38_usermod_invalid_user/config/etc/passwd
rename to tests/usertools/38_usermod_invalid_user/config/etc/passwd
diff --git a/tests/tests/usertools/38_usermod_invalid_user/config/etc/shadow b/tests/usertools/38_usermod_invalid_user/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/38_usermod_invalid_user/config/etc/shadow
rename to tests/usertools/38_usermod_invalid_user/config/etc/shadow
diff --git a/tests/tests/usertools/38_usermod_invalid_user/data/usermod.err b/tests/usertools/38_usermod_invalid_user/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/38_usermod_invalid_user/data/usermod.err
rename to tests/usertools/38_usermod_invalid_user/data/usermod.err
diff --git a/tests/tests/usertools/38_usermod_invalid_user/usermod.test b/tests/usertools/38_usermod_invalid_user/usermod.test
similarity index 100%
rename from tests/tests/usertools/38_usermod_invalid_user/usermod.test
rename to tests/usertools/38_usermod_invalid_user/usermod.test
diff --git a/tests/tests/usertools/39_usermod_-c_invalid_comment/config.txt b/tests/usertools/39_usermod_-c_invalid_comment/config.txt
similarity index 100%
rename from tests/tests/usertools/39_usermod_-c_invalid_comment/config.txt
rename to tests/usertools/39_usermod_-c_invalid_comment/config.txt
diff --git a/tests/tests/usertools/39_usermod_-c_invalid_comment/config/etc/default/useradd b/tests/usertools/39_usermod_-c_invalid_comment/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/39_usermod_-c_invalid_comment/config/etc/default/useradd
rename to tests/usertools/39_usermod_-c_invalid_comment/config/etc/default/useradd
diff --git a/tests/tests/usertools/39_usermod_-c_invalid_comment/config/etc/group b/tests/usertools/39_usermod_-c_invalid_comment/config/etc/group
similarity index 100%
rename from tests/tests/usertools/39_usermod_-c_invalid_comment/config/etc/group
rename to tests/usertools/39_usermod_-c_invalid_comment/config/etc/group
diff --git a/tests/tests/usertools/39_usermod_-c_invalid_comment/config/etc/gshadow b/tests/usertools/39_usermod_-c_invalid_comment/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/39_usermod_-c_invalid_comment/config/etc/gshadow
rename to tests/usertools/39_usermod_-c_invalid_comment/config/etc/gshadow
diff --git a/tests/tests/usertools/39_usermod_-c_invalid_comment/config/etc/passwd b/tests/usertools/39_usermod_-c_invalid_comment/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/39_usermod_-c_invalid_comment/config/etc/passwd
rename to tests/usertools/39_usermod_-c_invalid_comment/config/etc/passwd
diff --git a/tests/tests/usertools/39_usermod_-c_invalid_comment/config/etc/shadow b/tests/usertools/39_usermod_-c_invalid_comment/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/39_usermod_-c_invalid_comment/config/etc/shadow
rename to tests/usertools/39_usermod_-c_invalid_comment/config/etc/shadow
diff --git a/tests/tests/usertools/39_usermod_-c_invalid_comment/data/usermod.err b/tests/usertools/39_usermod_-c_invalid_comment/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/39_usermod_-c_invalid_comment/data/usermod.err
rename to tests/usertools/39_usermod_-c_invalid_comment/data/usermod.err
diff --git a/tests/tests/usertools/39_usermod_-c_invalid_comment/usermod.test b/tests/usertools/39_usermod_-c_invalid_comment/usermod.test
similarity index 100%
rename from tests/tests/usertools/39_usermod_-c_invalid_comment/usermod.test
rename to tests/usertools/39_usermod_-c_invalid_comment/usermod.test
diff --git a/tests/tests/usertools/40_usermod_-d_invalid_homedir/config.txt b/tests/usertools/40_usermod_-d_invalid_homedir/config.txt
similarity index 100%
rename from tests/tests/usertools/40_usermod_-d_invalid_homedir/config.txt
rename to tests/usertools/40_usermod_-d_invalid_homedir/config.txt
diff --git a/tests/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/default/useradd b/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/default/useradd
rename to tests/usertools/40_usermod_-d_invalid_homedir/config/etc/default/useradd
diff --git a/tests/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/group b/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/group
similarity index 100%
rename from tests/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/group
rename to tests/usertools/40_usermod_-d_invalid_homedir/config/etc/group
diff --git a/tests/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/gshadow b/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/gshadow
rename to tests/usertools/40_usermod_-d_invalid_homedir/config/etc/gshadow
diff --git a/tests/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/passwd b/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/passwd
rename to tests/usertools/40_usermod_-d_invalid_homedir/config/etc/passwd
diff --git a/tests/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/shadow b/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/40_usermod_-d_invalid_homedir/config/etc/shadow
rename to tests/usertools/40_usermod_-d_invalid_homedir/config/etc/shadow
diff --git a/tests/tests/usertools/40_usermod_-d_invalid_homedir/data/usermod.err b/tests/usertools/40_usermod_-d_invalid_homedir/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/40_usermod_-d_invalid_homedir/data/usermod.err
rename to tests/usertools/40_usermod_-d_invalid_homedir/data/usermod.err
diff --git a/tests/tests/usertools/40_usermod_-d_invalid_homedir/usermod.test b/tests/usertools/40_usermod_-d_invalid_homedir/usermod.test
similarity index 100%
rename from tests/tests/usertools/40_usermod_-d_invalid_homedir/usermod.test
rename to tests/usertools/40_usermod_-d_invalid_homedir/usermod.test
diff --git a/tests/tests/usertools/41_usermod_-d_invalid_shell/config.txt b/tests/usertools/41_usermod_-d_invalid_shell/config.txt
similarity index 100%
rename from tests/tests/usertools/41_usermod_-d_invalid_shell/config.txt
rename to tests/usertools/41_usermod_-d_invalid_shell/config.txt
diff --git a/tests/tests/usertools/41_usermod_-d_invalid_shell/config/etc/default/useradd b/tests/usertools/41_usermod_-d_invalid_shell/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/41_usermod_-d_invalid_shell/config/etc/default/useradd
rename to tests/usertools/41_usermod_-d_invalid_shell/config/etc/default/useradd
diff --git a/tests/tests/usertools/41_usermod_-d_invalid_shell/config/etc/group b/tests/usertools/41_usermod_-d_invalid_shell/config/etc/group
similarity index 100%
rename from tests/tests/usertools/41_usermod_-d_invalid_shell/config/etc/group
rename to tests/usertools/41_usermod_-d_invalid_shell/config/etc/group
diff --git a/tests/tests/usertools/41_usermod_-d_invalid_shell/config/etc/gshadow b/tests/usertools/41_usermod_-d_invalid_shell/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/41_usermod_-d_invalid_shell/config/etc/gshadow
rename to tests/usertools/41_usermod_-d_invalid_shell/config/etc/gshadow
diff --git a/tests/tests/usertools/41_usermod_-d_invalid_shell/config/etc/passwd b/tests/usertools/41_usermod_-d_invalid_shell/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/41_usermod_-d_invalid_shell/config/etc/passwd
rename to tests/usertools/41_usermod_-d_invalid_shell/config/etc/passwd
diff --git a/tests/tests/usertools/41_usermod_-d_invalid_shell/config/etc/shadow b/tests/usertools/41_usermod_-d_invalid_shell/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/41_usermod_-d_invalid_shell/config/etc/shadow
rename to tests/usertools/41_usermod_-d_invalid_shell/config/etc/shadow
diff --git a/tests/tests/usertools/41_usermod_-d_invalid_shell/data/usermod.err b/tests/usertools/41_usermod_-d_invalid_shell/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/41_usermod_-d_invalid_shell/data/usermod.err
rename to tests/usertools/41_usermod_-d_invalid_shell/data/usermod.err
diff --git a/tests/tests/usertools/41_usermod_-d_invalid_shell/usermod.test b/tests/usertools/41_usermod_-d_invalid_shell/usermod.test
similarity index 100%
rename from tests/tests/usertools/41_usermod_-d_invalid_shell/usermod.test
rename to tests/usertools/41_usermod_-d_invalid_shell/usermod.test
diff --git a/tests/tests/usertools/42_usermod_-g_invalid_group_name/config.txt b/tests/usertools/42_usermod_-g_invalid_group_name/config.txt
similarity index 100%
rename from tests/tests/usertools/42_usermod_-g_invalid_group_name/config.txt
rename to tests/usertools/42_usermod_-g_invalid_group_name/config.txt
diff --git a/tests/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/default/useradd b/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/default/useradd
rename to tests/usertools/42_usermod_-g_invalid_group_name/config/etc/default/useradd
diff --git a/tests/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/group b/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/group
similarity index 100%
rename from tests/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/group
rename to tests/usertools/42_usermod_-g_invalid_group_name/config/etc/group
diff --git a/tests/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/gshadow b/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/gshadow
rename to tests/usertools/42_usermod_-g_invalid_group_name/config/etc/gshadow
diff --git a/tests/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/passwd b/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/passwd
rename to tests/usertools/42_usermod_-g_invalid_group_name/config/etc/passwd
diff --git a/tests/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/shadow b/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/42_usermod_-g_invalid_group_name/config/etc/shadow
rename to tests/usertools/42_usermod_-g_invalid_group_name/config/etc/shadow
diff --git a/tests/tests/usertools/42_usermod_-g_invalid_group_name/data/usermod.err b/tests/usertools/42_usermod_-g_invalid_group_name/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/42_usermod_-g_invalid_group_name/data/usermod.err
rename to tests/usertools/42_usermod_-g_invalid_group_name/data/usermod.err
diff --git a/tests/tests/usertools/42_usermod_-g_invalid_group_name/usermod.test b/tests/usertools/42_usermod_-g_invalid_group_name/usermod.test
similarity index 100%
rename from tests/tests/usertools/42_usermod_-g_invalid_group_name/usermod.test
rename to tests/usertools/42_usermod_-g_invalid_group_name/usermod.test
diff --git a/tests/tests/usertools/43_usermod_-g_invalid_group_ID/config.txt b/tests/usertools/43_usermod_-g_invalid_group_ID/config.txt
similarity index 100%
rename from tests/tests/usertools/43_usermod_-g_invalid_group_ID/config.txt
rename to tests/usertools/43_usermod_-g_invalid_group_ID/config.txt
diff --git a/tests/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/default/useradd b/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/default/useradd
rename to tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/default/useradd
diff --git a/tests/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/group b/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/group
similarity index 100%
rename from tests/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/group
rename to tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/group
diff --git a/tests/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/gshadow b/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/gshadow
rename to tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/gshadow
diff --git a/tests/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/passwd b/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/passwd
rename to tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/passwd
diff --git a/tests/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/shadow b/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/shadow
rename to tests/usertools/43_usermod_-g_invalid_group_ID/config/etc/shadow
diff --git a/tests/tests/usertools/43_usermod_-g_invalid_group_ID/data/usermod.err b/tests/usertools/43_usermod_-g_invalid_group_ID/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/43_usermod_-g_invalid_group_ID/data/usermod.err
rename to tests/usertools/43_usermod_-g_invalid_group_ID/data/usermod.err
diff --git a/tests/tests/usertools/43_usermod_-g_invalid_group_ID/usermod.test b/tests/usertools/43_usermod_-g_invalid_group_ID/usermod.test
similarity index 100%
rename from tests/tests/usertools/43_usermod_-g_invalid_group_ID/usermod.test
rename to tests/usertools/43_usermod_-g_invalid_group_ID/usermod.test
diff --git a/tests/tests/usertools/44_usermod-l_existing_username/config.txt b/tests/usertools/44_usermod-l_existing_username/config.txt
similarity index 100%
rename from tests/tests/usertools/44_usermod-l_existing_username/config.txt
rename to tests/usertools/44_usermod-l_existing_username/config.txt
diff --git a/tests/tests/usertools/44_usermod-l_existing_username/config/etc/default/useradd b/tests/usertools/44_usermod-l_existing_username/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/44_usermod-l_existing_username/config/etc/default/useradd
rename to tests/usertools/44_usermod-l_existing_username/config/etc/default/useradd
diff --git a/tests/tests/usertools/44_usermod-l_existing_username/config/etc/group b/tests/usertools/44_usermod-l_existing_username/config/etc/group
similarity index 100%
rename from tests/tests/usertools/44_usermod-l_existing_username/config/etc/group
rename to tests/usertools/44_usermod-l_existing_username/config/etc/group
diff --git a/tests/tests/usertools/44_usermod-l_existing_username/config/etc/gshadow b/tests/usertools/44_usermod-l_existing_username/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/44_usermod-l_existing_username/config/etc/gshadow
rename to tests/usertools/44_usermod-l_existing_username/config/etc/gshadow
diff --git a/tests/tests/usertools/44_usermod-l_existing_username/config/etc/passwd b/tests/usertools/44_usermod-l_existing_username/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/44_usermod-l_existing_username/config/etc/passwd
rename to tests/usertools/44_usermod-l_existing_username/config/etc/passwd
diff --git a/tests/tests/usertools/44_usermod-l_existing_username/config/etc/shadow b/tests/usertools/44_usermod-l_existing_username/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/44_usermod-l_existing_username/config/etc/shadow
rename to tests/usertools/44_usermod-l_existing_username/config/etc/shadow
diff --git a/tests/tests/usertools/44_usermod-l_existing_username/data/usermod.err b/tests/usertools/44_usermod-l_existing_username/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/44_usermod-l_existing_username/data/usermod.err
rename to tests/usertools/44_usermod-l_existing_username/data/usermod.err
diff --git a/tests/tests/usertools/44_usermod-l_existing_username/usermod.test b/tests/usertools/44_usermod-l_existing_username/usermod.test
similarity index 100%
rename from tests/tests/usertools/44_usermod-l_existing_username/usermod.test
rename to tests/usertools/44_usermod-l_existing_username/usermod.test
diff --git a/tests/tests/usertools/45_usermod-l_existing_username_passwd/config.txt b/tests/usertools/45_usermod-l_existing_username_passwd/config.txt
similarity index 100%
rename from tests/tests/usertools/45_usermod-l_existing_username_passwd/config.txt
rename to tests/usertools/45_usermod-l_existing_username_passwd/config.txt
diff --git a/tests/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/default/useradd b/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/default/useradd
rename to tests/usertools/45_usermod-l_existing_username_passwd/config/etc/default/useradd
diff --git a/tests/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/group b/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/group
similarity index 100%
rename from tests/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/group
rename to tests/usertools/45_usermod-l_existing_username_passwd/config/etc/group
diff --git a/tests/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/gshadow b/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/gshadow
rename to tests/usertools/45_usermod-l_existing_username_passwd/config/etc/gshadow
diff --git a/tests/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/passwd b/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/passwd
rename to tests/usertools/45_usermod-l_existing_username_passwd/config/etc/passwd
diff --git a/tests/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/shadow b/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/45_usermod-l_existing_username_passwd/config/etc/shadow
rename to tests/usertools/45_usermod-l_existing_username_passwd/config/etc/shadow
diff --git a/tests/tests/usertools/45_usermod-l_existing_username_passwd/data/usermod.err b/tests/usertools/45_usermod-l_existing_username_passwd/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/45_usermod-l_existing_username_passwd/data/usermod.err
rename to tests/usertools/45_usermod-l_existing_username_passwd/data/usermod.err
diff --git a/tests/tests/usertools/45_usermod-l_existing_username_passwd/usermod.test b/tests/usertools/45_usermod-l_existing_username_passwd/usermod.test
similarity index 100%
rename from tests/tests/usertools/45_usermod-l_existing_username_passwd/usermod.test
rename to tests/usertools/45_usermod-l_existing_username_passwd/usermod.test
diff --git a/tests/tests/usertools/46_usermod-l_existing_username_shadow/config.txt b/tests/usertools/46_usermod-l_existing_username_shadow/config.txt
similarity index 100%
rename from tests/tests/usertools/46_usermod-l_existing_username_shadow/config.txt
rename to tests/usertools/46_usermod-l_existing_username_shadow/config.txt
diff --git a/tests/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/default/useradd b/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/default/useradd
rename to tests/usertools/46_usermod-l_existing_username_shadow/config/etc/default/useradd
diff --git a/tests/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/group b/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/group
similarity index 100%
rename from tests/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/group
rename to tests/usertools/46_usermod-l_existing_username_shadow/config/etc/group
diff --git a/tests/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/gshadow b/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/gshadow
rename to tests/usertools/46_usermod-l_existing_username_shadow/config/etc/gshadow
diff --git a/tests/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/passwd b/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/passwd
rename to tests/usertools/46_usermod-l_existing_username_shadow/config/etc/passwd
diff --git a/tests/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/shadow b/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/46_usermod-l_existing_username_shadow/config/etc/shadow
rename to tests/usertools/46_usermod-l_existing_username_shadow/config/etc/shadow
diff --git a/tests/tests/usertools/46_usermod-l_existing_username_shadow/data/usermod.err b/tests/usertools/46_usermod-l_existing_username_shadow/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/46_usermod-l_existing_username_shadow/data/usermod.err
rename to tests/usertools/46_usermod-l_existing_username_shadow/data/usermod.err
diff --git a/tests/tests/usertools/46_usermod-l_existing_username_shadow/usermod.test b/tests/usertools/46_usermod-l_existing_username_shadow/usermod.test
similarity index 100%
rename from tests/tests/usertools/46_usermod-l_existing_username_shadow/usermod.test
rename to tests/usertools/46_usermod-l_existing_username_shadow/usermod.test
diff --git a/tests/tests/usertools/47_usermod-l_no_shadow_file/config.txt b/tests/usertools/47_usermod-l_no_shadow_file/config.txt
similarity index 100%
rename from tests/tests/usertools/47_usermod-l_no_shadow_file/config.txt
rename to tests/usertools/47_usermod-l_no_shadow_file/config.txt
diff --git a/tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/default/useradd b/tests/usertools/47_usermod-l_no_shadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/default/useradd
rename to tests/usertools/47_usermod-l_no_shadow_file/config/etc/default/useradd
diff --git a/tests/tests/usertools/30_usermod-l_locked_group/config/etc/group b/tests/usertools/47_usermod-l_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/30_usermod-l_locked_group/config/etc/group
rename to tests/usertools/47_usermod-l_no_shadow_file/config/etc/group
diff --git a/tests/tests/usertools/30_usermod-l_locked_group/config/etc/gshadow b/tests/usertools/47_usermod-l_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/30_usermod-l_locked_group/config/etc/gshadow
rename to tests/usertools/47_usermod-l_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/passwd b/tests/usertools/47_usermod-l_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/passwd
rename to tests/usertools/47_usermod-l_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/28_usermod-c_locked_group/config/etc/shadow b/tests/usertools/47_usermod-l_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/28_usermod-c_locked_group/config/etc/shadow
rename to tests/usertools/47_usermod-l_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/47_usermod-l_no_shadow_file/data/group b/tests/usertools/47_usermod-l_no_shadow_file/data/group
similarity index 100%
rename from tests/tests/usertools/47_usermod-l_no_shadow_file/data/group
rename to tests/usertools/47_usermod-l_no_shadow_file/data/group
diff --git a/tests/tests/usertools/47_usermod-l_no_shadow_file/data/gshadow b/tests/usertools/47_usermod-l_no_shadow_file/data/gshadow
similarity index 100%
rename from tests/tests/usertools/47_usermod-l_no_shadow_file/data/gshadow
rename to tests/usertools/47_usermod-l_no_shadow_file/data/gshadow
diff --git a/tests/tests/usertools/47_usermod-l_no_shadow_file/data/passwd b/tests/usertools/47_usermod-l_no_shadow_file/data/passwd
similarity index 100%
rename from tests/tests/usertools/47_usermod-l_no_shadow_file/data/passwd
rename to tests/usertools/47_usermod-l_no_shadow_file/data/passwd
diff --git a/tests/tests/usertools/47_usermod-l_no_shadow_file/usermod.test b/tests/usertools/47_usermod-l_no_shadow_file/usermod.test
similarity index 100%
rename from tests/tests/usertools/47_usermod-l_no_shadow_file/usermod.test
rename to tests/usertools/47_usermod-l_no_shadow_file/usermod.test
diff --git a/tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/config.txt b/tests/usertools/48_userdel_keep_group_if_primary_other_user/config.txt
similarity index 100%
rename from tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/config.txt
rename to tests/usertools/48_userdel_keep_group_if_primary_other_user/config.txt
diff --git a/tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/default/useradd b/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/default/useradd
rename to tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/default/useradd
diff --git a/tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/group b/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/group
similarity index 100%
rename from tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/group
rename to tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/group
diff --git a/tests/tests/usertools/13_usermod_move_homedir_file/config/etc/gshadow b/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/13_usermod_move_homedir_file/config/etc/gshadow
rename to tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/gshadow
diff --git a/tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/passwd b/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/passwd
rename to tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/passwd
diff --git a/tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/shadow b/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/shadow
rename to tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/shadow
diff --git a/tests/tests/subids/69_invalid_subuid_file3/data/group b/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/group
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/data/group
rename to tests/usertools/48_userdel_keep_group_if_primary_other_user/data/group
diff --git a/tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/passwd b/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/passwd
similarity index 100%
rename from tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/passwd
rename to tests/usertools/48_userdel_keep_group_if_primary_other_user/data/passwd
diff --git a/tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/shadow b/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/shadow
similarity index 100%
rename from tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/shadow
rename to tests/usertools/48_userdel_keep_group_if_primary_other_user/data/shadow
diff --git a/tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/userdel.err b/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/userdel.err
similarity index 100%
rename from tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/userdel.err
rename to tests/usertools/48_userdel_keep_group_if_primary_other_user/data/userdel.err
diff --git a/tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/userdel.test b/tests/usertools/48_userdel_keep_group_if_primary_other_user/userdel.test
similarity index 100%
rename from tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/userdel.test
rename to tests/usertools/48_userdel_keep_group_if_primary_other_user/userdel.test
diff --git a/tests/tests/usertools/49_userdel_delete_users_group/config.txt b/tests/usertools/49_userdel_delete_users_group/config.txt
similarity index 100%
rename from tests/tests/usertools/49_userdel_delete_users_group/config.txt
rename to tests/usertools/49_userdel_delete_users_group/config.txt
diff --git a/tests/tests/usertools/49_userdel_delete_users_group/config/etc/default/useradd b/tests/usertools/49_userdel_delete_users_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/49_userdel_delete_users_group/config/etc/default/useradd
rename to tests/usertools/49_userdel_delete_users_group/config/etc/default/useradd
diff --git a/tests/tests/usertools/49_userdel_delete_users_group/config/etc/group b/tests/usertools/49_userdel_delete_users_group/config/etc/group
similarity index 100%
rename from tests/tests/usertools/49_userdel_delete_users_group/config/etc/group
rename to tests/usertools/49_userdel_delete_users_group/config/etc/group
diff --git a/tests/tests/usertools/49_userdel_delete_users_group/config/etc/gshadow b/tests/usertools/49_userdel_delete_users_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/49_userdel_delete_users_group/config/etc/gshadow
rename to tests/usertools/49_userdel_delete_users_group/config/etc/gshadow
diff --git a/tests/tests/usertools/49_userdel_delete_users_group/config/etc/passwd b/tests/usertools/49_userdel_delete_users_group/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/49_userdel_delete_users_group/config/etc/passwd
rename to tests/usertools/49_userdel_delete_users_group/config/etc/passwd
diff --git a/tests/tests/usertools/49_userdel_delete_users_group/config/etc/shadow b/tests/usertools/49_userdel_delete_users_group/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/49_userdel_delete_users_group/config/etc/shadow
rename to tests/usertools/49_userdel_delete_users_group/config/etc/shadow
diff --git a/tests/tests/usertools/49_userdel_delete_users_group/data/group b/tests/usertools/49_userdel_delete_users_group/data/group
similarity index 100%
rename from tests/tests/usertools/49_userdel_delete_users_group/data/group
rename to tests/usertools/49_userdel_delete_users_group/data/group
diff --git a/tests/tests/usertools/49_userdel_delete_users_group/data/gshadow b/tests/usertools/49_userdel_delete_users_group/data/gshadow
similarity index 100%
rename from tests/tests/usertools/49_userdel_delete_users_group/data/gshadow
rename to tests/usertools/49_userdel_delete_users_group/data/gshadow
diff --git a/tests/tests/usertools/49_userdel_delete_users_group/data/passwd b/tests/usertools/49_userdel_delete_users_group/data/passwd
similarity index 100%
rename from tests/tests/usertools/49_userdel_delete_users_group/data/passwd
rename to tests/usertools/49_userdel_delete_users_group/data/passwd
diff --git a/tests/tests/usertools/49_userdel_delete_users_group/data/shadow b/tests/usertools/49_userdel_delete_users_group/data/shadow
similarity index 100%
rename from tests/tests/usertools/49_userdel_delete_users_group/data/shadow
rename to tests/usertools/49_userdel_delete_users_group/data/shadow
diff --git a/tests/tests/usertools/49_userdel_delete_users_group/userdel.test b/tests/usertools/49_userdel_delete_users_group/userdel.test
similarity index 100%
rename from tests/tests/usertools/49_userdel_delete_users_group/userdel.test
rename to tests/usertools/49_userdel_delete_users_group/userdel.test
diff --git a/tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config.txt b/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config.txt
similarity index 100%
rename from tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config.txt
rename to tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config.txt
diff --git a/tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/default/useradd b/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/default/useradd
rename to tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/default/useradd
diff --git a/tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/group b/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/group
similarity index 100%
rename from tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/group
rename to tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/group
diff --git a/tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/gshadow b/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/gshadow
rename to tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/gshadow
diff --git a/tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/passwd b/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/passwd
rename to tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/passwd
diff --git a/tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/shadow b/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/shadow
rename to tests/usertools/50_userdel_delete_users_group_no_gshadow_group/config/etc/shadow
diff --git a/tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/group b/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/group
similarity index 100%
rename from tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/group
rename to tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/group
diff --git a/tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/passwd b/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/passwd
similarity index 100%
rename from tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/passwd
rename to tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/passwd
diff --git a/tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/shadow b/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/shadow
similarity index 100%
rename from tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/shadow
rename to tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/shadow
diff --git a/tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/userdel.test b/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/userdel.test
similarity index 100%
rename from tests/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/userdel.test
rename to tests/usertools/50_userdel_delete_users_group_no_gshadow_group/userdel.test
diff --git a/tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config.txt b/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config.txt
rename to tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config.txt
diff --git a/tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/default/useradd b/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/default/useradd
rename to tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/group b/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/group
rename to tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/group
diff --git a/tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/gshadow b/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/gshadow
rename to tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/passwd b/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/passwd
rename to tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/shadow b/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/shadow
rename to tests/usertools/51_userdel_delete_users_group_no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/data/group b/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/data/group
rename to tests/usertools/51_userdel_delete_users_group_no_gshadow_file/data/group
diff --git a/tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/data/passwd b/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/data/passwd
similarity index 100%
rename from tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/data/passwd
rename to tests/usertools/51_userdel_delete_users_group_no_gshadow_file/data/passwd
diff --git a/tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/data/shadow b/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/data/shadow
similarity index 100%
rename from tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/data/shadow
rename to tests/usertools/51_userdel_delete_users_group_no_gshadow_file/data/shadow
diff --git a/tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/userdel.test b/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/userdel.test
similarity index 100%
rename from tests/tests/usertools/51_userdel_delete_users_group_no_gshadow_file/userdel.test
rename to tests/usertools/51_userdel_delete_users_group_no_gshadow_file/userdel.test
diff --git a/tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/config.txt b/tests/usertools/52_userdel_delete_user_no_shadow_entry/config.txt
similarity index 100%
rename from tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/config.txt
rename to tests/usertools/52_userdel_delete_user_no_shadow_entry/config.txt
diff --git a/tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/default/useradd b/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/default/useradd
rename to tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/default/useradd
diff --git a/tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/group b/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/group
rename to tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/group
diff --git a/tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/gshadow b/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/gshadow
rename to tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/passwd b/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/passwd
rename to tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/shadow b/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/shadow
rename to tests/usertools/52_userdel_delete_user_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/group b/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/group
similarity index 100%
rename from tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/group
rename to tests/usertools/52_userdel_delete_user_no_shadow_entry/data/group
diff --git a/tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/gshadow b/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/gshadow
similarity index 100%
rename from tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/gshadow
rename to tests/usertools/52_userdel_delete_user_no_shadow_entry/data/gshadow
diff --git a/tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/passwd b/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/passwd
similarity index 100%
rename from tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/passwd
rename to tests/usertools/52_userdel_delete_user_no_shadow_entry/data/passwd
diff --git a/tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/userdel.test b/tests/usertools/52_userdel_delete_user_no_shadow_entry/userdel.test
similarity index 100%
rename from tests/tests/usertools/52_userdel_delete_user_no_shadow_entry/userdel.test
rename to tests/usertools/52_userdel_delete_user_no_shadow_entry/userdel.test
diff --git a/tests/tests/usertools/53_userdel_delete_user_no_shadow_file/config.txt b/tests/usertools/53_userdel_delete_user_no_shadow_file/config.txt
similarity index 100%
rename from tests/tests/usertools/53_userdel_delete_user_no_shadow_file/config.txt
rename to tests/usertools/53_userdel_delete_user_no_shadow_file/config.txt
diff --git a/tests/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/default/useradd b/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/default/useradd
rename to tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/default/useradd
diff --git a/tests/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/group b/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/group
rename to tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/group
diff --git a/tests/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/gshadow b/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/gshadow
rename to tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/passwd b/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/passwd
rename to tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/shadow b/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/shadow
rename to tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/53_userdel_delete_user_no_shadow_file/data/group b/tests/usertools/53_userdel_delete_user_no_shadow_file/data/group
similarity index 100%
rename from tests/tests/usertools/53_userdel_delete_user_no_shadow_file/data/group
rename to tests/usertools/53_userdel_delete_user_no_shadow_file/data/group
diff --git a/tests/tests/usertools/53_userdel_delete_user_no_shadow_file/data/gshadow b/tests/usertools/53_userdel_delete_user_no_shadow_file/data/gshadow
similarity index 100%
rename from tests/tests/usertools/53_userdel_delete_user_no_shadow_file/data/gshadow
rename to tests/usertools/53_userdel_delete_user_no_shadow_file/data/gshadow
diff --git a/tests/tests/usertools/53_userdel_delete_user_no_shadow_file/data/passwd b/tests/usertools/53_userdel_delete_user_no_shadow_file/data/passwd
similarity index 100%
rename from tests/tests/usertools/53_userdel_delete_user_no_shadow_file/data/passwd
rename to tests/usertools/53_userdel_delete_user_no_shadow_file/data/passwd
diff --git a/tests/tests/usertools/53_userdel_delete_user_no_shadow_file/userdel.test b/tests/usertools/53_userdel_delete_user_no_shadow_file/userdel.test
similarity index 100%
rename from tests/tests/usertools/53_userdel_delete_user_no_shadow_file/userdel.test
rename to tests/usertools/53_userdel_delete_user_no_shadow_file/userdel.test
diff --git a/tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/config.txt b/tests/usertools/54_usermod-u_invalid_UID_4294967295/config.txt
similarity index 100%
rename from tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/config.txt
rename to tests/usertools/54_usermod-u_invalid_UID_4294967295/config.txt
diff --git a/tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/default/useradd b/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/default/useradd
rename to tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/default/useradd
diff --git a/tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/group b/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/group
similarity index 100%
rename from tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/group
rename to tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/group
diff --git a/tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/gshadow b/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/gshadow
rename to tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/gshadow
diff --git a/tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/passwd b/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/passwd
rename to tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/passwd
diff --git a/tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/shadow b/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/shadow
rename to tests/usertools/54_usermod-u_invalid_UID_4294967295/config/etc/shadow
diff --git a/tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/usermod.err b/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/data/usermod.err
rename to tests/usertools/54_usermod-u_invalid_UID_4294967295/data/usermod.err
diff --git a/tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/usermod.test b/tests/usertools/54_usermod-u_invalid_UID_4294967295/usermod.test
similarity index 100%
rename from tests/tests/usertools/54_usermod-u_invalid_UID_4294967295/usermod.test
rename to tests/usertools/54_usermod-u_invalid_UID_4294967295/usermod.test
diff --git a/tests/tests/usertools/55_userdel_busy_user/config.txt b/tests/usertools/55_userdel_busy_user/config.txt
similarity index 100%
rename from tests/tests/usertools/55_userdel_busy_user/config.txt
rename to tests/usertools/55_userdel_busy_user/config.txt
diff --git a/tests/tests/usertools/55_userdel_busy_user/config/etc/default/useradd b/tests/usertools/55_userdel_busy_user/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/55_userdel_busy_user/config/etc/default/useradd
rename to tests/usertools/55_userdel_busy_user/config/etc/default/useradd
diff --git a/tests/tests/usertools/55_userdel_busy_user/config/etc/group b/tests/usertools/55_userdel_busy_user/config/etc/group
similarity index 100%
rename from tests/tests/usertools/55_userdel_busy_user/config/etc/group
rename to tests/usertools/55_userdel_busy_user/config/etc/group
diff --git a/tests/tests/usertools/14_usermod_move_homedir_other_device/config/etc/gshadow b/tests/usertools/55_userdel_busy_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/14_usermod_move_homedir_other_device/config/etc/gshadow
rename to tests/usertools/55_userdel_busy_user/config/etc/gshadow
diff --git a/tests/tests/usertools/55_userdel_busy_user/config/etc/passwd b/tests/usertools/55_userdel_busy_user/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/55_userdel_busy_user/config/etc/passwd
rename to tests/usertools/55_userdel_busy_user/config/etc/passwd
diff --git a/tests/tests/usertools/55_userdel_busy_user/config/etc/shadow b/tests/usertools/55_userdel_busy_user/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/55_userdel_busy_user/config/etc/shadow
rename to tests/usertools/55_userdel_busy_user/config/etc/shadow
diff --git a/tests/tests/usertools/55_userdel_busy_user/data/userdel.err b/tests/usertools/55_userdel_busy_user/data/userdel.err
similarity index 100%
rename from tests/tests/usertools/55_userdel_busy_user/data/userdel.err
rename to tests/usertools/55_userdel_busy_user/data/userdel.err
diff --git a/tests/tests/usertools/55_userdel_busy_user/userdel.test b/tests/usertools/55_userdel_busy_user/userdel.test
similarity index 100%
rename from tests/tests/usertools/55_userdel_busy_user/userdel.test
rename to tests/usertools/55_userdel_busy_user/userdel.test
diff --git a/tests/tests/subids/65_useradd_fill_gap6/config.txt b/tests/usertools/56_userdel_locked_passwd/config.txt
similarity index 100%
rename from tests/tests/subids/65_useradd_fill_gap6/config.txt
rename to tests/usertools/56_userdel_locked_passwd/config.txt
diff --git a/tests/tests/usertools/56_userdel_locked_passwd/config/etc/default/useradd b/tests/usertools/56_userdel_locked_passwd/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/56_userdel_locked_passwd/config/etc/default/useradd
rename to tests/usertools/56_userdel_locked_passwd/config/etc/default/useradd
diff --git a/tests/tests/usertools/31_usermod-l_locked_gshadow/config/etc/group b/tests/usertools/56_userdel_locked_passwd/config/etc/group
similarity index 100%
rename from tests/tests/usertools/31_usermod-l_locked_gshadow/config/etc/group
rename to tests/usertools/56_userdel_locked_passwd/config/etc/group
diff --git a/tests/tests/usertools/31_usermod-l_locked_gshadow/config/etc/gshadow b/tests/usertools/56_userdel_locked_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/31_usermod-l_locked_gshadow/config/etc/gshadow
rename to tests/usertools/56_userdel_locked_passwd/config/etc/gshadow
diff --git a/tests/tests/usertools/56_userdel_locked_passwd/config/etc/passwd b/tests/usertools/56_userdel_locked_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/56_userdel_locked_passwd/config/etc/passwd
rename to tests/usertools/56_userdel_locked_passwd/config/etc/passwd
diff --git a/tests/tests/usertools/29_usermod-c_locked_gshadow/config/etc/shadow b/tests/usertools/56_userdel_locked_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/29_usermod-c_locked_gshadow/config/etc/shadow
rename to tests/usertools/56_userdel_locked_passwd/config/etc/shadow
diff --git a/tests/tests/usertools/56_userdel_locked_passwd/data/userdel.err b/tests/usertools/56_userdel_locked_passwd/data/userdel.err
similarity index 100%
rename from tests/tests/usertools/56_userdel_locked_passwd/data/userdel.err
rename to tests/usertools/56_userdel_locked_passwd/data/userdel.err
diff --git a/tests/tests/usertools/56_userdel_locked_passwd/userdel.test b/tests/usertools/56_userdel_locked_passwd/userdel.test
similarity index 100%
rename from tests/tests/usertools/56_userdel_locked_passwd/userdel.test
rename to tests/usertools/56_userdel_locked_passwd/userdel.test
diff --git a/tests/tests/subids/66_subordinate_range_cmp/config.txt b/tests/usertools/57_userdel_locked_group/config.txt
similarity index 100%
rename from tests/tests/subids/66_subordinate_range_cmp/config.txt
rename to tests/usertools/57_userdel_locked_group/config.txt
diff --git a/tests/tests/usertools/57_userdel_locked_group/config/etc/default/useradd b/tests/usertools/57_userdel_locked_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/57_userdel_locked_group/config/etc/default/useradd
rename to tests/usertools/57_userdel_locked_group/config/etc/default/useradd
diff --git a/tests/tests/usertools/32_usermod-u_new_UID/config/etc/group b/tests/usertools/57_userdel_locked_group/config/etc/group
similarity index 100%
rename from tests/tests/usertools/32_usermod-u_new_UID/config/etc/group
rename to tests/usertools/57_userdel_locked_group/config/etc/group
diff --git a/tests/tests/usertools/32_usermod-u_new_UID/config/etc/gshadow b/tests/usertools/57_userdel_locked_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/32_usermod-u_new_UID/config/etc/gshadow
rename to tests/usertools/57_userdel_locked_group/config/etc/gshadow
diff --git a/tests/tests/usertools/57_userdel_locked_group/config/etc/passwd b/tests/usertools/57_userdel_locked_group/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/57_userdel_locked_group/config/etc/passwd
rename to tests/usertools/57_userdel_locked_group/config/etc/passwd
diff --git a/tests/tests/usertools/30_usermod-l_locked_group/config/etc/shadow b/tests/usertools/57_userdel_locked_group/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/30_usermod-l_locked_group/config/etc/shadow
rename to tests/usertools/57_userdel_locked_group/config/etc/shadow
diff --git a/tests/tests/usertools/57_userdel_locked_group/data/userdel.err b/tests/usertools/57_userdel_locked_group/data/userdel.err
similarity index 100%
rename from tests/tests/usertools/57_userdel_locked_group/data/userdel.err
rename to tests/usertools/57_userdel_locked_group/data/userdel.err
diff --git a/tests/tests/usertools/57_userdel_locked_group/userdel.test b/tests/usertools/57_userdel_locked_group/userdel.test
similarity index 100%
rename from tests/tests/usertools/57_userdel_locked_group/userdel.test
rename to tests/usertools/57_userdel_locked_group/userdel.test
diff --git a/tests/tests/subids/67_invalid_subuid_file1/config.txt b/tests/usertools/58_userdel_locked_shadow/config.txt
similarity index 100%
rename from tests/tests/subids/67_invalid_subuid_file1/config.txt
rename to tests/usertools/58_userdel_locked_shadow/config.txt
diff --git a/tests/tests/usertools/58_userdel_locked_shadow/config/etc/default/useradd b/tests/usertools/58_userdel_locked_shadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/58_userdel_locked_shadow/config/etc/default/useradd
rename to tests/usertools/58_userdel_locked_shadow/config/etc/default/useradd
diff --git a/tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/group b/tests/usertools/58_userdel_locked_shadow/config/etc/group
similarity index 100%
rename from tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/group
rename to tests/usertools/58_userdel_locked_shadow/config/etc/group
diff --git a/tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/gshadow b/tests/usertools/58_userdel_locked_shadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/gshadow
rename to tests/usertools/58_userdel_locked_shadow/config/etc/gshadow
diff --git a/tests/tests/usertools/58_userdel_locked_shadow/config/etc/passwd b/tests/usertools/58_userdel_locked_shadow/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/58_userdel_locked_shadow/config/etc/passwd
rename to tests/usertools/58_userdel_locked_shadow/config/etc/passwd
diff --git a/tests/tests/usertools/31_usermod-l_locked_gshadow/config/etc/shadow b/tests/usertools/58_userdel_locked_shadow/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/31_usermod-l_locked_gshadow/config/etc/shadow
rename to tests/usertools/58_userdel_locked_shadow/config/etc/shadow
diff --git a/tests/tests/usertools/58_userdel_locked_shadow/data/userdel.err b/tests/usertools/58_userdel_locked_shadow/data/userdel.err
similarity index 100%
rename from tests/tests/usertools/58_userdel_locked_shadow/data/userdel.err
rename to tests/usertools/58_userdel_locked_shadow/data/userdel.err
diff --git a/tests/tests/usertools/58_userdel_locked_shadow/userdel.test b/tests/usertools/58_userdel_locked_shadow/userdel.test
similarity index 100%
rename from tests/tests/usertools/58_userdel_locked_shadow/userdel.test
rename to tests/usertools/58_userdel_locked_shadow/userdel.test
diff --git a/tests/tests/subids/68_invalid_subuid_file2/config.txt b/tests/usertools/59_userdel_locked_gshadow/config.txt
similarity index 100%
rename from tests/tests/subids/68_invalid_subuid_file2/config.txt
rename to tests/usertools/59_userdel_locked_gshadow/config.txt
diff --git a/tests/tests/usertools/59_userdel_locked_gshadow/config/etc/default/useradd b/tests/usertools/59_userdel_locked_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/59_userdel_locked_gshadow/config/etc/default/useradd
rename to tests/usertools/59_userdel_locked_gshadow/config/etc/default/useradd
diff --git a/tests/tests/usertools/56_userdel_locked_passwd/config/etc/group b/tests/usertools/59_userdel_locked_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/usertools/56_userdel_locked_passwd/config/etc/group
rename to tests/usertools/59_userdel_locked_gshadow/config/etc/group
diff --git a/tests/tests/usertools/56_userdel_locked_passwd/config/etc/gshadow b/tests/usertools/59_userdel_locked_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/56_userdel_locked_passwd/config/etc/gshadow
rename to tests/usertools/59_userdel_locked_gshadow/config/etc/gshadow
diff --git a/tests/tests/usertools/59_userdel_locked_gshadow/config/etc/passwd b/tests/usertools/59_userdel_locked_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/59_userdel_locked_gshadow/config/etc/passwd
rename to tests/usertools/59_userdel_locked_gshadow/config/etc/passwd
diff --git a/tests/tests/usertools/32_usermod-u_new_UID/config/etc/shadow b/tests/usertools/59_userdel_locked_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/32_usermod-u_new_UID/config/etc/shadow
rename to tests/usertools/59_userdel_locked_gshadow/config/etc/shadow
diff --git a/tests/tests/usertools/59_userdel_locked_gshadow/data/userdel.err b/tests/usertools/59_userdel_locked_gshadow/data/userdel.err
similarity index 100%
rename from tests/tests/usertools/59_userdel_locked_gshadow/data/userdel.err
rename to tests/usertools/59_userdel_locked_gshadow/data/userdel.err
diff --git a/tests/tests/usertools/59_userdel_locked_gshadow/userdel.test b/tests/usertools/59_userdel_locked_gshadow/userdel.test
similarity index 100%
rename from tests/tests/usertools/59_userdel_locked_gshadow/userdel.test
rename to tests/usertools/59_userdel_locked_gshadow/userdel.test
diff --git a/tests/tests/subids/69_invalid_subuid_file3/config.txt b/tests/usertools/60_userdel_invalid_user/config.txt
similarity index 100%
rename from tests/tests/subids/69_invalid_subuid_file3/config.txt
rename to tests/usertools/60_userdel_invalid_user/config.txt
diff --git a/tests/tests/usertools/60_userdel_invalid_user/config/etc/default/useradd b/tests/usertools/60_userdel_invalid_user/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/60_userdel_invalid_user/config/etc/default/useradd
rename to tests/usertools/60_userdel_invalid_user/config/etc/default/useradd
diff --git a/tests/tests/usertools/57_userdel_locked_group/config/etc/group b/tests/usertools/60_userdel_invalid_user/config/etc/group
similarity index 100%
rename from tests/tests/usertools/57_userdel_locked_group/config/etc/group
rename to tests/usertools/60_userdel_invalid_user/config/etc/group
diff --git a/tests/tests/usertools/57_userdel_locked_group/config/etc/gshadow b/tests/usertools/60_userdel_invalid_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/57_userdel_locked_group/config/etc/gshadow
rename to tests/usertools/60_userdel_invalid_user/config/etc/gshadow
diff --git a/tests/tests/usertools/60_userdel_invalid_user/config/etc/passwd b/tests/usertools/60_userdel_invalid_user/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/60_userdel_invalid_user/config/etc/passwd
rename to tests/usertools/60_userdel_invalid_user/config/etc/passwd
diff --git a/tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/shadow b/tests/usertools/60_userdel_invalid_user/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/shadow
rename to tests/usertools/60_userdel_invalid_user/config/etc/shadow
diff --git a/tests/tests/usertools/60_userdel_invalid_user/data/userdel.err b/tests/usertools/60_userdel_invalid_user/data/userdel.err
similarity index 100%
rename from tests/tests/usertools/60_userdel_invalid_user/data/userdel.err
rename to tests/usertools/60_userdel_invalid_user/data/userdel.err
diff --git a/tests/tests/usertools/60_userdel_invalid_user/userdel.test b/tests/usertools/60_userdel_invalid_user/userdel.test
similarity index 100%
rename from tests/tests/usertools/60_userdel_invalid_user/userdel.test
rename to tests/usertools/60_userdel_invalid_user/userdel.test
diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config.txt b/tests/usertools/61_userdel_del_homedir_with_symlinks/config.txt
similarity index 100%
rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config.txt
rename to tests/usertools/61_userdel_del_homedir_with_symlinks/config.txt
diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/default/useradd b/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/default/useradd
rename to tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/default/useradd
diff --git a/tests/tests/subids/70_invalid_subuid_file4/data/group b/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/group
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/data/group
rename to tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/group
diff --git a/tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/gshadow b/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/36_usermod_change_uid+move_homedir_other_device/config/etc/gshadow
rename to tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/gshadow
diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/passwd b/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/passwd
rename to tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/passwd
diff --git a/tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/shadow b/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/shadow
rename to tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/shadow
diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/group b/tests/usertools/61_userdel_del_homedir_with_symlinks/data/group
similarity index 100%
rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/group
rename to tests/usertools/61_userdel_del_homedir_with_symlinks/data/group
diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/gshadow b/tests/usertools/61_userdel_del_homedir_with_symlinks/data/gshadow
similarity index 100%
rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/gshadow
rename to tests/usertools/61_userdel_del_homedir_with_symlinks/data/gshadow
diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/passwd b/tests/usertools/61_userdel_del_homedir_with_symlinks/data/passwd
similarity index 100%
rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/passwd
rename to tests/usertools/61_userdel_del_homedir_with_symlinks/data/passwd
diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/shadow b/tests/usertools/61_userdel_del_homedir_with_symlinks/data/shadow
similarity index 100%
rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/shadow
rename to tests/usertools/61_userdel_del_homedir_with_symlinks/data/shadow
diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/userdel.err b/tests/usertools/61_userdel_del_homedir_with_symlinks/data/userdel.err
similarity index 100%
rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/userdel.err
rename to tests/usertools/61_userdel_del_homedir_with_symlinks/data/userdel.err
diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test b/tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test
similarity index 100%
rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test
rename to tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test
diff --git a/tests/tests/usertools/62_usermod_remove_supplementary_groups/config.txt b/tests/usertools/62_usermod_remove_supplementary_groups/config.txt
similarity index 100%
rename from tests/tests/usertools/62_usermod_remove_supplementary_groups/config.txt
rename to tests/usertools/62_usermod_remove_supplementary_groups/config.txt
diff --git a/tests/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/default/useradd b/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/default/useradd
rename to tests/usertools/62_usermod_remove_supplementary_groups/config/etc/default/useradd
diff --git a/tests/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/group b/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/group
similarity index 100%
rename from tests/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/group
rename to tests/usertools/62_usermod_remove_supplementary_groups/config/etc/group
diff --git a/tests/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/gshadow b/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/gshadow
rename to tests/usertools/62_usermod_remove_supplementary_groups/config/etc/gshadow
diff --git a/tests/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/passwd b/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/passwd
rename to tests/usertools/62_usermod_remove_supplementary_groups/config/etc/passwd
diff --git a/tests/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/shadow b/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/62_usermod_remove_supplementary_groups/config/etc/shadow
rename to tests/usertools/62_usermod_remove_supplementary_groups/config/etc/shadow
diff --git a/tests/tests/usertools/62_usermod_remove_supplementary_groups/data/group b/tests/usertools/62_usermod_remove_supplementary_groups/data/group
similarity index 100%
rename from tests/tests/usertools/62_usermod_remove_supplementary_groups/data/group
rename to tests/usertools/62_usermod_remove_supplementary_groups/data/group
diff --git a/tests/tests/usertools/62_usermod_remove_supplementary_groups/data/gshadow b/tests/usertools/62_usermod_remove_supplementary_groups/data/gshadow
similarity index 100%
rename from tests/tests/usertools/62_usermod_remove_supplementary_groups/data/gshadow
rename to tests/usertools/62_usermod_remove_supplementary_groups/data/gshadow
diff --git a/tests/tests/usertools/62_usermod_remove_supplementary_groups/usermod.test b/tests/usertools/62_usermod_remove_supplementary_groups/usermod.test
similarity index 100%
rename from tests/tests/usertools/62_usermod_remove_supplementary_groups/usermod.test
rename to tests/usertools/62_usermod_remove_supplementary_groups/usermod.test
diff --git a/tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/chpasswd.test b/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/chpasswd.test
rename to tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/chpasswd.test
diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/group b/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/group
similarity index 100%
rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/group
rename to tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/group
diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/gshadow b/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/gshadow
rename to tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/passwd b/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/passwd
rename to tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/passwd
diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/shadow b/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/shadow
rename to tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/data/chpasswd.err b/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/data/chpasswd.err
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/data/chpasswd.err
rename to tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/data/chpasswd.err
diff --git a/tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/data/shadow b/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/data/shadow
rename to tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/chpasswd.test b/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/chpasswd.test
rename to tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/group b/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/group
rename to tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/gshadow b/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/passwd b/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/shadow b/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/data/shadow b/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/data/shadow
rename to tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/chpasswd.test b/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/chpasswd.test
rename to tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/group b/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/group
rename to tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/gshadow b/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/passwd b/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/shadow b/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/data/passwd b/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/data/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/data/passwd
rename to tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/data/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/chpasswd.test b/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/chpasswd.test
rename to tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/group b/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/group
rename to tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/gshadow b/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/passwd b/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/shadow b/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/data/shadow b/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/data/shadow
rename to tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/chpasswd.test b/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/chpasswd.test
rename to tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/group b/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/group
rename to tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/gshadow b/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/passwd b/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/04_chpasswd_no_shadow_entry/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/shadow b/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/data/chpasswd.err b/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/data/chpasswd.err
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/data/chpasswd.err
rename to tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/data/chpasswd.err
diff --git a/tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/data/shadow b/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/data/shadow
rename to tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/chpasswd.test b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/chpasswd.test
rename to tests/usertools/chpasswd-PAM/06_chpasswd_usage/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config.txt b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config.txt
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config.txt
rename to tests/usertools/chpasswd-PAM/06_chpasswd_usage/config.txt
diff --git a/tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/default/useradd b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/default/useradd
rename to tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/default/useradd
diff --git a/tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/group b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/group
rename to tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/gshadow b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/passwd b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/shadow b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/05_chpasswd_error_no_password/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/data/usage.out b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/data/usage.out
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/data/usage.out
rename to tests/usertools/chpasswd-PAM/06_chpasswd_usage/data/usage.out
diff --git a/tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/chpasswd.test b/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/chpasswd.test
rename to tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config.txt b/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config.txt
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config.txt
rename to tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config.txt
diff --git a/tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/default/useradd b/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/default/useradd
rename to tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/default/useradd
diff --git a/tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/group b/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/group
rename to tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/gshadow b/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/passwd b/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/shadow b/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/data/usage.out b/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/data/usage.out
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/data/usage.out
rename to tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/data/usage.out
diff --git a/tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/chpasswd.test b/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/chpasswd.test
rename to tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config.txt b/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config.txt
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config.txt
rename to tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config.txt
diff --git a/tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/default/useradd b/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/default/useradd
rename to tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/default/useradd
diff --git a/tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/group b/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/group
rename to tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/gshadow b/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/passwd b/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/shadow b/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/data/usage.out b/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/data/usage.out
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/data/usage.out
rename to tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/data/usage.out
diff --git a/tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/chpasswd.test b/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/chpasswd.test
rename to tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config.txt b/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config.txt
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config.txt
rename to tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config.txt
diff --git a/tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/default/useradd b/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/default/useradd
rename to tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/default/useradd
diff --git a/tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/group b/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/group
rename to tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/gshadow b/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/gshadow
diff --git a/tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/passwd b/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/passwd
similarity index 100%
rename from tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/shadow b/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/data/usage.out b/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/data/usage.out
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/data/usage.out
rename to tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/data/usage.out
diff --git a/tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/chpasswd.test b/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/chpasswd.test
rename to tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config.txt b/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config.txt
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config.txt
rename to tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config.txt
diff --git a/tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/default/useradd b/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/default/useradd
rename to tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/default/useradd
diff --git a/tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/group b/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/group
rename to tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/gshadow b/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/passwd b/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/shadow b/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/data/usage.out b/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/data/usage.out
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/data/usage.out
rename to tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/data/usage.out
diff --git a/tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/chpasswd.test b/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/chpasswd.test
rename to tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config.txt b/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config.txt
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config.txt
rename to tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config.txt
diff --git a/tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/default/useradd b/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/default/useradd
rename to tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/default/useradd
diff --git a/tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/group b/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/group
rename to tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/gshadow b/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/passwd b/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/shadow b/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/data/usage.out b/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/data/usage.out
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/data/usage.out
rename to tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/data/usage.out
diff --git a/tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/chpasswd.test b/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/chpasswd.test
rename to tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config.txt b/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config.txt
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config.txt
rename to tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config.txt
diff --git a/tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/default/useradd b/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/default/useradd
rename to tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/default/useradd
diff --git a/tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/group b/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/group
rename to tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/gshadow b/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/passwd b/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/shadow b/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/data/usage.out b/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/data/usage.out
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/data/usage.out
rename to tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/data/usage.out
diff --git a/tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/chpasswd.test b/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/chpasswd.test
rename to tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config.txt b/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config.txt
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config.txt
rename to tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config.txt
diff --git a/tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/default/useradd b/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/default/useradd
rename to tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/default/useradd
diff --git a/tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/group b/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/group
rename to tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/gshadow b/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/passwd b/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/shadow b/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/data/usage.out b/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/data/usage.out
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/data/usage.out
rename to tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/data/usage.out
diff --git a/tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/chpasswd.test b/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/chpasswd.test
rename to tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/group b/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/group
rename to tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/gshadow b/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/passwd b/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/shadow b/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/data/shadow b/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/data/shadow
rename to tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/chpasswd.test b/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/chpasswd.test
rename to tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/group b/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/group
rename to tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/gshadow b/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/passwd b/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/shadow b/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/data/shadow b/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/data/shadow
rename to tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/chpasswd.test b/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/chpasswd.test
rename to tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/group b/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/group
rename to tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/gshadow b/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/passwd b/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/shadow b/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/data/shadow b/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/data/shadow
rename to tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/chpasswd.test b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/chpasswd.test
rename to tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/group b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/group
rename to tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/gshadow b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/passwd b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/shadow b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/data/shadow b/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/data/shadow
rename to tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/chpasswd.test b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/chpasswd.test
rename to tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/group b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/group
rename to tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/gshadow b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/passwd b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/shadow b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/data/shadow b/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/data/shadow
rename to tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/chpasswd.test b/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/chpasswd.test
rename to tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/group b/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/group
rename to tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/gshadow b/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/passwd b/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/shadow b/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/data/shadow b/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/data/shadow
rename to tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/chpasswd.test b/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/chpasswd.test
rename to tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/group b/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/group
rename to tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/gshadow b/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/passwd b/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/shadow b/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/data/shadow b/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/data/shadow
rename to tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/chpasswd.test b/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/chpasswd.test
rename to tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/group b/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/group
rename to tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/gshadow b/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/passwd b/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/shadow b/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/20_chpasswd_password_SHA256_rounds_900/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/data/shadow b/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/data/shadow
rename to tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/chpasswd.test b/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/chpasswd.test
rename to tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/group b/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/group
rename to tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/gshadow b/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/passwd b/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/shadow b/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/21_chpasswd_password_SHA256_rounds_9000/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/data/shadow b/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/data/shadow
rename to tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/chpasswd.test b/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/chpasswd.test
rename to tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/group b/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/group
rename to tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/gshadow b/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/passwd b/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/shadow b/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/data/shadow b/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/data/shadow
rename to tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/chpasswd.test b/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/chpasswd.test
rename to tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/group b/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/group
rename to tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/gshadow b/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/passwd b/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/shadow b/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/23_chpasswd_password_SHA512_rounds_900/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/data/shadow b/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/data/shadow
rename to tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/chpasswd.test b/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/chpasswd.test
rename to tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/group b/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/group
rename to tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/gshadow b/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/passwd b/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/shadow b/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/24_chpasswd_password_SHA512_rounds_9000/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/data/passwd b/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/data/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/data/passwd
rename to tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/data/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/chpasswd.test b/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/chpasswd.test
rename to tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/group b/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/group
rename to tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/gshadow b/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/passwd b/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/shadow b/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/25_chpasswd-e_no_shadow_file/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/data/chpasswd.err b/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/data/chpasswd.err
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/data/chpasswd.err
rename to tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/data/chpasswd.err
diff --git a/tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/chpasswd.test b/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/chpasswd.test
rename to tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/group b/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/group
rename to tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/gshadow b/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/passwd b/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/shadow b/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/data/chpasswd.err b/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/data/chpasswd.err
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/data/chpasswd.err
rename to tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/data/chpasswd.err
diff --git a/tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/data/passwd b/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/data/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/data/passwd
rename to tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/data/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/chpasswd.test b/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/chpasswd.test
rename to tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/group b/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/group
rename to tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/gshadow b/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/passwd b/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/shadow b/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/data/chpasswd.err b/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/data/chpasswd.err
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/data/chpasswd.err
rename to tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/data/chpasswd.err
diff --git a/tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/data/passwd b/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/data/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/data/passwd
rename to tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/data/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/chpasswd.test b/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/chpasswd.test
rename to tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/group b/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/group
rename to tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/gshadow b/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/passwd b/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/shadow b/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/passwd b/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/data/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/data/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/data/shadow b/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/data/shadow
rename to tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/chpasswd.test b/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/chpasswd.test
rename to tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/chpasswd.test
diff --git a/tests/tests/subids/70_invalid_subuid_file4/config.txt b/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config.txt
similarity index 100%
rename from tests/tests/subids/70_invalid_subuid_file4/config.txt
rename to tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config.txt
diff --git a/tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/default/useradd b/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/default/useradd
rename to tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/default/useradd
diff --git a/tests/tests/usertools/58_userdel_locked_shadow/config/etc/group b/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/group
similarity index 100%
rename from tests/tests/usertools/58_userdel_locked_shadow/config/etc/group
rename to tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/group
diff --git a/tests/tests/usertools/58_userdel_locked_shadow/config/etc/gshadow b/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/58_userdel_locked_shadow/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/passwd b/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/passwd
diff --git a/tests/tests/usertools/56_userdel_locked_passwd/config/etc/shadow b/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/56_userdel_locked_passwd/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/data/chpasswd.err b/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/data/chpasswd.err
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/data/chpasswd.err
rename to tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/data/chpasswd.err
diff --git a/tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/chpasswd.test b/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/chpasswd.test
rename to tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/chpasswd.test
diff --git a/tests/tests/subids/71_useradd_subids_for_system/config.txt b/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config.txt
similarity index 100%
rename from tests/tests/subids/71_useradd_subids_for_system/config.txt
rename to tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config.txt
diff --git a/tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/default/useradd b/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/default/useradd
rename to tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/default/useradd
diff --git a/tests/tests/usertools/59_userdel_locked_gshadow/config/etc/group b/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/group
similarity index 100%
rename from tests/tests/usertools/59_userdel_locked_gshadow/config/etc/group
rename to tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/group
diff --git a/tests/tests/usertools/59_userdel_locked_gshadow/config/etc/gshadow b/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/59_userdel_locked_gshadow/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/passwd b/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/passwd
diff --git a/tests/tests/usertools/57_userdel_locked_group/config/etc/shadow b/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/57_userdel_locked_group/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/data/chpasswd.err b/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/data/chpasswd.err
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/data/chpasswd.err
rename to tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/data/chpasswd.err
diff --git a/tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/chpasswd.test b/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/chpasswd.test
rename to tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/chpasswd.test
diff --git a/tests/tests/usertools/24_usermod_locked_passwd/config.txt b/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config.txt
similarity index 100%
rename from tests/tests/usertools/24_usermod_locked_passwd/config.txt
rename to tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config.txt
diff --git a/tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/default/useradd b/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/default/useradd
rename to tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/default/useradd
diff --git a/tests/tests/usertools/60_userdel_invalid_user/config/etc/group b/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/group
similarity index 100%
rename from tests/tests/usertools/60_userdel_invalid_user/config/etc/group
rename to tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/group
diff --git a/tests/tests/usertools/60_userdel_invalid_user/config/etc/gshadow b/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/60_userdel_invalid_user/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/passwd b/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/passwd
diff --git a/tests/tests/usertools/58_userdel_locked_shadow/config/etc/shadow b/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/58_userdel_locked_shadow/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/data/chpasswd.err b/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/data/chpasswd.err
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/data/chpasswd.err
rename to tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/data/chpasswd.err
diff --git a/tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/data/shadow b/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/data/shadow
rename to tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/data/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/chpasswd.test b/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/chpasswd.test
rename to tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/chpasswd.test
diff --git a/tests/tests/usertools/25_usermod-G_locked_group/config.txt b/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config.txt
similarity index 100%
rename from tests/tests/usertools/25_usermod-G_locked_group/config.txt
rename to tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config.txt
diff --git a/tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/default/useradd b/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/default/useradd
rename to tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/default/useradd
diff --git a/tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/group b/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/group
rename to tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/gshadow b/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/passwd b/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/passwd
diff --git a/tests/tests/usertools/59_userdel_locked_gshadow/config/etc/shadow b/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/59_userdel_locked_gshadow/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/data/chpasswd.err b/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/data/chpasswd.err
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/data/chpasswd.err
rename to tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/data/chpasswd.err
diff --git a/tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/chpasswd.test b/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/chpasswd.test
rename to tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/group b/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/config/etc/group
rename to tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/gshadow b/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/gshadow
rename to tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/pam.d/chpasswd b/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/pam.d/chpasswd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/pam.d/chpasswd
rename to tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/pam.d/chpasswd
diff --git a/tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/pam.d/common-password b/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/pam.d/common-password
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/pam.d/common-password
rename to tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/pam.d/common-password
diff --git a/tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/passwd b/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/passwd
rename to tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/shadow b/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/28_chpasswd_no_shadow_file_2nd_invalid_passwd_entry/config/etc/shadow
rename to tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/data/passwd b/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/data/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/data/passwd
rename to tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/data/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/data/shadow b/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/data/shadow
rename to tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/data/shadow
diff --git a/tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/chpasswd.test b/tests/usertools/chpasswd/01_chpasswd_invalid_user/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/chpasswd.test
rename to tests/usertools/chpasswd/01_chpasswd_invalid_user/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/group b/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/group
rename to tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/gshadow b/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/gshadow
rename to tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/login.defs b/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/login.defs
similarity index 100%
rename from tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/login.defs
rename to tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/login.defs
diff --git a/tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/data/passwd b/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/29_chpasswd-e_no_shadow_entry/data/passwd
rename to tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/shadow b/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/34_chpasswd-e_password_shadow_and_passwd/config/etc/shadow
rename to tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/data/chpasswd.err b/tests/usertools/chpasswd/01_chpasswd_invalid_user/data/chpasswd.err
similarity index 100%
rename from tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/data/chpasswd.err
rename to tests/usertools/chpasswd/01_chpasswd_invalid_user/data/chpasswd.err
diff --git a/tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/chpasswd.test b/tests/usertools/chpasswd/02_chpasswd_multiple_users/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/chpasswd.test
rename to tests/usertools/chpasswd/02_chpasswd_multiple_users/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/group b/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/group
rename to tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/group
diff --git a/tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/gshadow b/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/gshadow
rename to tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/login.defs b/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/login.defs
similarity index 100%
rename from tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/login.defs
rename to tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/login.defs
diff --git a/tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/passwd b/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/passwd
rename to tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/shadow b/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/shadow
rename to tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/data/shadow b/tests/usertools/chpasswd/02_chpasswd_multiple_users/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/data/shadow
rename to tests/usertools/chpasswd/02_chpasswd_multiple_users/data/shadow
diff --git a/tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/chpasswd.test b/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/chpasswd.test
rename to tests/usertools/chpasswd/03_chpasswd_no_shadow_file/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/group b/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/group
rename to tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/group
diff --git a/tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/gshadow b/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/gshadow
rename to tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/login.defs b/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/login.defs
similarity index 100%
rename from tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/login.defs
rename to tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/login.defs
diff --git a/tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/passwd b/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/passwd
rename to tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/shadow b/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/shadow
rename to tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/data/passwd b/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/data/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/data/passwd
rename to tests/usertools/chpasswd/03_chpasswd_no_shadow_file/data/passwd
diff --git a/tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/chpasswd.test b/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/chpasswd.test
rename to tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/group b/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/group
rename to tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/group
diff --git a/tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/gshadow b/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/gshadow
rename to tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/login.defs b/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/login.defs
similarity index 100%
rename from tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/login.defs
rename to tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/login.defs
diff --git a/tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/passwd b/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/passwd
rename to tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/shadow b/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/shadow
rename to tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/data/passwd b/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/data/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/data/passwd
rename to tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/data/passwd
diff --git a/tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/data/shadow b/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/data/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/data/shadow
rename to tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/data/shadow
diff --git a/tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/chpasswd.test b/tests/usertools/chpasswd/05_chpasswd_error_no_password/chpasswd.test
similarity index 100%
rename from tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/chpasswd.test
rename to tests/usertools/chpasswd/05_chpasswd_error_no_password/chpasswd.test
diff --git a/tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/group b/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/group
rename to tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/group
diff --git a/tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/gshadow b/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/gshadow
rename to tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/login.defs b/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/login.defs
similarity index 100%
rename from tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/login.defs
rename to tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/login.defs
diff --git a/tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/passwd b/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/config/etc/passwd
rename to tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/shadow b/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/shadow
rename to tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/shadow
diff --git a/tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/data/chpasswd.err b/tests/usertools/chpasswd/05_chpasswd_error_no_password/data/chpasswd.err
similarity index 100%
rename from tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/data/chpasswd.err
rename to tests/usertools/chpasswd/05_chpasswd_error_no_password/data/chpasswd.err
diff --git a/tests/tests/usertools/useradd/01_useradd_usage/config.txt b/tests/usertools/useradd/01_useradd_usage/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/01_useradd_usage/config.txt
rename to tests/usertools/useradd/01_useradd_usage/config.txt
diff --git a/tests/tests/usertools/useradd/01_useradd_usage/config/etc/default/useradd b/tests/usertools/useradd/01_useradd_usage/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/01_useradd_usage/config/etc/default/useradd
rename to tests/usertools/useradd/01_useradd_usage/config/etc/default/useradd
diff --git a/tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/group b/tests/usertools/useradd/01_useradd_usage/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/group
rename to tests/usertools/useradd/01_useradd_usage/config/etc/group
diff --git a/tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/gshadow b/tests/usertools/useradd/01_useradd_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/gshadow
rename to tests/usertools/useradd/01_useradd_usage/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/passwd b/tests/usertools/useradd/01_useradd_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/passwd
rename to tests/usertools/useradd/01_useradd_usage/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/shadow b/tests/usertools/useradd/01_useradd_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/shadow
rename to tests/usertools/useradd/01_useradd_usage/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/01_useradd_usage/data/usage.out b/tests/usertools/useradd/01_useradd_usage/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/01_useradd_usage/data/usage.out
rename to tests/usertools/useradd/01_useradd_usage/data/usage.out
diff --git a/tests/tests/usertools/useradd/01_useradd_usage/useradd.test b/tests/usertools/useradd/01_useradd_usage/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/01_useradd_usage/useradd.test
rename to tests/usertools/useradd/01_useradd_usage/useradd.test
diff --git a/tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config.txt b/tests/usertools/useradd/02_useradd_usage_invalid_option/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config.txt
rename to tests/usertools/useradd/02_useradd_usage_invalid_option/config.txt
diff --git a/tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/default/useradd b/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/default/useradd
rename to tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/01_useradd_usage/config/etc/group b/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/01_useradd_usage/config/etc/group
rename to tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/group
diff --git a/tests/tests/usertools/useradd/01_useradd_usage/config/etc/gshadow b/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/01_useradd_usage/config/etc/gshadow
rename to tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/01_useradd_usage/config/etc/passwd b/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/01_useradd_usage/config/etc/passwd
rename to tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/01_useradd_usage/config/etc/shadow b/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/01_useradd_usage/config/etc/shadow
rename to tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/02_useradd_usage_invalid_option/data/usage.out b/tests/usertools/useradd/02_useradd_usage_invalid_option/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/02_useradd_usage_invalid_option/data/usage.out
rename to tests/usertools/useradd/02_useradd_usage_invalid_option/data/usage.out
diff --git a/tests/tests/usertools/useradd/02_useradd_usage_invalid_option/useradd.test b/tests/usertools/useradd/02_useradd_usage_invalid_option/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/02_useradd_usage_invalid_option/useradd.test
rename to tests/usertools/useradd/02_useradd_usage_invalid_option/useradd.test
diff --git a/tests/tests/usertools/useradd/03_useradd_usage_no_users/config.txt b/tests/usertools/useradd/03_useradd_usage_no_users/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/03_useradd_usage_no_users/config.txt
rename to tests/usertools/useradd/03_useradd_usage_no_users/config.txt
diff --git a/tests/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/default/useradd b/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/default/useradd
rename to tests/usertools/useradd/03_useradd_usage_no_users/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/group b/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/group
rename to tests/usertools/useradd/03_useradd_usage_no_users/config/etc/group
diff --git a/tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/gshadow b/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/gshadow
rename to tests/usertools/useradd/03_useradd_usage_no_users/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/passwd b/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/passwd
rename to tests/usertools/useradd/03_useradd_usage_no_users/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/shadow b/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/shadow
rename to tests/usertools/useradd/03_useradd_usage_no_users/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/03_useradd_usage_no_users/data/usage.out b/tests/usertools/useradd/03_useradd_usage_no_users/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/03_useradd_usage_no_users/data/usage.out
rename to tests/usertools/useradd/03_useradd_usage_no_users/data/usage.out
diff --git a/tests/tests/usertools/useradd/03_useradd_usage_no_users/useradd.test b/tests/usertools/useradd/03_useradd_usage_no_users/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/03_useradd_usage_no_users/useradd.test
rename to tests/usertools/useradd/03_useradd_usage_no_users/useradd.test
diff --git a/tests/tests/usertools/useradd/04_useradd_usage_2_users/config.txt b/tests/usertools/useradd/04_useradd_usage_2_users/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/04_useradd_usage_2_users/config.txt
rename to tests/usertools/useradd/04_useradd_usage_2_users/config.txt
diff --git a/tests/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/default/useradd b/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/default/useradd
rename to tests/usertools/useradd/04_useradd_usage_2_users/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/group b/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/group
rename to tests/usertools/useradd/04_useradd_usage_2_users/config/etc/group
diff --git a/tests/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/gshadow b/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/gshadow
rename to tests/usertools/useradd/04_useradd_usage_2_users/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/passwd b/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/passwd
rename to tests/usertools/useradd/04_useradd_usage_2_users/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/shadow b/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/shadow
rename to tests/usertools/useradd/04_useradd_usage_2_users/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/04_useradd_usage_2_users/data/usage.out b/tests/usertools/useradd/04_useradd_usage_2_users/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/04_useradd_usage_2_users/data/usage.out
rename to tests/usertools/useradd/04_useradd_usage_2_users/data/usage.out
diff --git a/tests/tests/usertools/useradd/04_useradd_usage_2_users/useradd.test b/tests/usertools/useradd/04_useradd_usage_2_users/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/04_useradd_usage_2_users/useradd.test
rename to tests/usertools/useradd/04_useradd_usage_2_users/useradd.test
diff --git a/tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config.txt b/tests/usertools/useradd/05_useradd_usage-b_invalid1/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config.txt
rename to tests/usertools/useradd/05_useradd_usage-b_invalid1/config.txt
diff --git a/tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/default/useradd b/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/default/useradd
rename to tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/group b/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/group
rename to tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/group
diff --git a/tests/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/gshadow b/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/gshadow
rename to tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/passwd b/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/passwd
rename to tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/shadow b/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/04_useradd_usage_2_users/config/etc/shadow
rename to tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/data/usage.out b/tests/usertools/useradd/05_useradd_usage-b_invalid1/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/data/usage.out
rename to tests/usertools/useradd/05_useradd_usage-b_invalid1/data/usage.out
diff --git a/tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/useradd.test b/tests/usertools/useradd/05_useradd_usage-b_invalid1/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/useradd.test
rename to tests/usertools/useradd/05_useradd_usage-b_invalid1/useradd.test
diff --git a/tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config.txt b/tests/usertools/useradd/06_useradd_usage-b_invalid2/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config.txt
rename to tests/usertools/useradd/06_useradd_usage-b_invalid2/config.txt
diff --git a/tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/default/useradd b/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/default/useradd
rename to tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/group b/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/group
rename to tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/group
diff --git a/tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/gshadow b/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/gshadow
rename to tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/passwd b/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/passwd
rename to tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/shadow b/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/shadow
rename to tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/data/usage.out b/tests/usertools/useradd/06_useradd_usage-b_invalid2/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/data/usage.out
rename to tests/usertools/useradd/06_useradd_usage-b_invalid2/data/usage.out
diff --git a/tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/useradd.test b/tests/usertools/useradd/06_useradd_usage-b_invalid2/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/useradd.test
rename to tests/usertools/useradd/06_useradd_usage-b_invalid2/useradd.test
diff --git a/tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config.txt b/tests/usertools/useradd/07_useradd_usage-b_invalid3/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config.txt
rename to tests/usertools/useradd/07_useradd_usage-b_invalid3/config.txt
diff --git a/tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/default/useradd b/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/default/useradd
rename to tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/group b/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/group
rename to tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/group
diff --git a/tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/gshadow b/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/gshadow
rename to tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/passwd b/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/passwd
rename to tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/shadow b/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/shadow
rename to tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/data/usage.out b/tests/usertools/useradd/07_useradd_usage-b_invalid3/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/data/usage.out
rename to tests/usertools/useradd/07_useradd_usage-b_invalid3/data/usage.out
diff --git a/tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/useradd.test b/tests/usertools/useradd/07_useradd_usage-b_invalid3/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/useradd.test
rename to tests/usertools/useradd/07_useradd_usage-b_invalid3/useradd.test
diff --git a/tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config.txt b/tests/usertools/useradd/08_useradd_usage-c_invalid1/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config.txt
rename to tests/usertools/useradd/08_useradd_usage-c_invalid1/config.txt
diff --git a/tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/default/useradd b/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/default/useradd
rename to tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/group b/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/group
rename to tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/group
diff --git a/tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/gshadow b/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/gshadow
rename to tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/passwd b/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/passwd
rename to tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/shadow b/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/shadow
rename to tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/data/usage.out b/tests/usertools/useradd/08_useradd_usage-c_invalid1/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/data/usage.out
rename to tests/usertools/useradd/08_useradd_usage-c_invalid1/data/usage.out
diff --git a/tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/useradd.test b/tests/usertools/useradd/08_useradd_usage-c_invalid1/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/useradd.test
rename to tests/usertools/useradd/08_useradd_usage-c_invalid1/useradd.test
diff --git a/tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config.txt b/tests/usertools/useradd/09_useradd_usage-c_invalid2/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config.txt
rename to tests/usertools/useradd/09_useradd_usage-c_invalid2/config.txt
diff --git a/tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/default/useradd b/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/default/useradd
rename to tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/group b/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/group
rename to tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/group
diff --git a/tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/gshadow b/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/gshadow
rename to tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/passwd b/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/passwd
rename to tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/shadow b/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/shadow
rename to tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/data/usage.out b/tests/usertools/useradd/09_useradd_usage-c_invalid2/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/data/usage.out
rename to tests/usertools/useradd/09_useradd_usage-c_invalid2/data/usage.out
diff --git a/tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/useradd.test b/tests/usertools/useradd/09_useradd_usage-c_invalid2/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/useradd.test
rename to tests/usertools/useradd/09_useradd_usage-c_invalid2/useradd.test
diff --git a/tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config.txt b/tests/usertools/useradd/10_useradd_usage-d_invalid1/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config.txt
rename to tests/usertools/useradd/10_useradd_usage-d_invalid1/config.txt
diff --git a/tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/default/useradd b/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/default/useradd
rename to tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/group b/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/group
rename to tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/group
diff --git a/tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/gshadow b/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/gshadow
rename to tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/passwd b/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/passwd
rename to tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/shadow b/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/shadow
rename to tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/data/usage.out b/tests/usertools/useradd/10_useradd_usage-d_invalid1/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/data/usage.out
rename to tests/usertools/useradd/10_useradd_usage-d_invalid1/data/usage.out
diff --git a/tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/useradd.test b/tests/usertools/useradd/10_useradd_usage-d_invalid1/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/useradd.test
rename to tests/usertools/useradd/10_useradd_usage-d_invalid1/useradd.test
diff --git a/tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config.txt b/tests/usertools/useradd/11_useradd_usage-d_invalid2/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config.txt
rename to tests/usertools/useradd/11_useradd_usage-d_invalid2/config.txt
diff --git a/tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/default/useradd b/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/default/useradd
rename to tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/group b/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/group
rename to tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/group
diff --git a/tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/gshadow b/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/gshadow
rename to tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/passwd b/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/passwd
rename to tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/shadow b/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/shadow
rename to tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/data/usage.out b/tests/usertools/useradd/11_useradd_usage-d_invalid2/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/data/usage.out
rename to tests/usertools/useradd/11_useradd_usage-d_invalid2/data/usage.out
diff --git a/tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/useradd.test b/tests/usertools/useradd/11_useradd_usage-d_invalid2/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/useradd.test
rename to tests/usertools/useradd/11_useradd_usage-d_invalid2/useradd.test
diff --git a/tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config.txt b/tests/usertools/useradd/12_useradd_usage-d_invalid3/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config.txt
rename to tests/usertools/useradd/12_useradd_usage-d_invalid3/config.txt
diff --git a/tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/default/useradd b/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/default/useradd
rename to tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/group b/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/group
rename to tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/group
diff --git a/tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/gshadow b/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/gshadow
rename to tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/passwd b/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/passwd
rename to tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/shadow b/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/shadow
rename to tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/data/usage.out b/tests/usertools/useradd/12_useradd_usage-d_invalid3/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/data/usage.out
rename to tests/usertools/useradd/12_useradd_usage-d_invalid3/data/usage.out
diff --git a/tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/useradd.test b/tests/usertools/useradd/12_useradd_usage-d_invalid3/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/useradd.test
rename to tests/usertools/useradd/12_useradd_usage-d_invalid3/useradd.test
diff --git a/tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config.txt b/tests/usertools/useradd/13_useradd_usage-e_invalid1/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config.txt
rename to tests/usertools/useradd/13_useradd_usage-e_invalid1/config.txt
diff --git a/tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/default/useradd b/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/default/useradd
rename to tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/group b/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/group
rename to tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/group
diff --git a/tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/gshadow b/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/gshadow
rename to tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/passwd b/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/passwd
rename to tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/shadow b/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/shadow
rename to tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/data/usage.out b/tests/usertools/useradd/13_useradd_usage-e_invalid1/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/data/usage.out
rename to tests/usertools/useradd/13_useradd_usage-e_invalid1/data/usage.out
diff --git a/tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/useradd.test b/tests/usertools/useradd/13_useradd_usage-e_invalid1/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/useradd.test
rename to tests/usertools/useradd/13_useradd_usage-e_invalid1/useradd.test
diff --git a/tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config.txt b/tests/usertools/useradd/14_useradd_usage-e_invalid2/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config.txt
rename to tests/usertools/useradd/14_useradd_usage-e_invalid2/config.txt
diff --git a/tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/default/useradd b/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/default/useradd
rename to tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/group b/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/group
rename to tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/group
diff --git a/tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/gshadow b/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/gshadow
rename to tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/passwd b/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/passwd
rename to tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/shadow b/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/shadow
rename to tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/data/usage.out b/tests/usertools/useradd/14_useradd_usage-e_invalid2/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/data/usage.out
rename to tests/usertools/useradd/14_useradd_usage-e_invalid2/data/usage.out
diff --git a/tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/useradd.test b/tests/usertools/useradd/14_useradd_usage-e_invalid2/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/useradd.test
rename to tests/usertools/useradd/14_useradd_usage-e_invalid2/useradd.test
diff --git a/tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config.txt b/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config.txt
rename to tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config.txt
diff --git a/tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/default/useradd b/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/default/useradd
rename to tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/group b/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/group
rename to tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/group
diff --git a/tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/gshadow b/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/gshadow
rename to tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/passwd b/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/passwd
rename to tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/shadow b/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/shadow
rename to tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/data/usage.out b/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/data/usage.out
rename to tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/data/usage.out
diff --git a/tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/useradd.test b/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/useradd.test
rename to tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/useradd.test
diff --git a/tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config.txt b/tests/usertools/useradd/16_useradd_usage-f_invalid1/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config.txt
rename to tests/usertools/useradd/16_useradd_usage-f_invalid1/config.txt
diff --git a/tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/default/useradd b/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/default/useradd
rename to tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/group b/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/group
rename to tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/group
diff --git a/tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/gshadow b/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/gshadow
rename to tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/passwd b/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/passwd
rename to tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/shadow b/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/15_useradd_usage-e_no_shadow_file/config/etc/shadow
rename to tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/data/usage.out b/tests/usertools/useradd/16_useradd_usage-f_invalid1/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/data/usage.out
rename to tests/usertools/useradd/16_useradd_usage-f_invalid1/data/usage.out
diff --git a/tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/useradd.test b/tests/usertools/useradd/16_useradd_usage-f_invalid1/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/useradd.test
rename to tests/usertools/useradd/16_useradd_usage-f_invalid1/useradd.test
diff --git a/tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config.txt b/tests/usertools/useradd/17_useradd_usage-f_invalid2/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config.txt
rename to tests/usertools/useradd/17_useradd_usage-f_invalid2/config.txt
diff --git a/tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/default/useradd b/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/default/useradd
rename to tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/group b/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/group
rename to tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/group
diff --git a/tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/gshadow b/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/gshadow
rename to tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/passwd b/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/passwd
rename to tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/shadow b/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/shadow
rename to tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/data/usage.out b/tests/usertools/useradd/17_useradd_usage-f_invalid2/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/data/usage.out
rename to tests/usertools/useradd/17_useradd_usage-f_invalid2/data/usage.out
diff --git a/tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/useradd.test b/tests/usertools/useradd/17_useradd_usage-f_invalid2/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/useradd.test
rename to tests/usertools/useradd/17_useradd_usage-f_invalid2/useradd.test
diff --git a/tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config.txt b/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config.txt
rename to tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config.txt
diff --git a/tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/default/useradd b/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/default/useradd
rename to tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/group b/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/group
rename to tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/group
diff --git a/tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/gshadow b/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/gshadow
rename to tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/passwd b/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/passwd
rename to tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/shadow b/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/shadow
rename to tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/data/usage.out b/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/data/usage.out
rename to tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/data/usage.out
diff --git a/tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/useradd.test b/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/useradd.test
rename to tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/useradd.test
diff --git a/tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config.txt b/tests/usertools/useradd/19_useradd_usage-K_invalid1/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config.txt
rename to tests/usertools/useradd/19_useradd_usage-K_invalid1/config.txt
diff --git a/tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/default/useradd b/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/default/useradd
rename to tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/group b/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/group
rename to tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/group
diff --git a/tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/gshadow b/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/gshadow
rename to tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/passwd b/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/passwd
rename to tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/shadow b/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/18_useradd_usage-f_no_shadow_file/config/etc/shadow
rename to tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/data/usage.out b/tests/usertools/useradd/19_useradd_usage-K_invalid1/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/data/usage.out
rename to tests/usertools/useradd/19_useradd_usage-K_invalid1/data/usage.out
diff --git a/tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/useradd.test b/tests/usertools/useradd/19_useradd_usage-K_invalid1/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/useradd.test
rename to tests/usertools/useradd/19_useradd_usage-K_invalid1/useradd.test
diff --git a/tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config.txt b/tests/usertools/useradd/20_useradd_usage-O_invalid2/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config.txt
rename to tests/usertools/useradd/20_useradd_usage-O_invalid2/config.txt
diff --git a/tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/default/useradd b/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/default/useradd
rename to tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/group b/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/group
rename to tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/group
diff --git a/tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/gshadow b/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/gshadow
rename to tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/passwd b/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/passwd
rename to tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/shadow b/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/shadow
rename to tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/data/usage.out b/tests/usertools/useradd/20_useradd_usage-O_invalid2/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/data/usage.out
rename to tests/usertools/useradd/20_useradd_usage-O_invalid2/data/usage.out
diff --git a/tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/useradd.test b/tests/usertools/useradd/20_useradd_usage-O_invalid2/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/useradd.test
rename to tests/usertools/useradd/20_useradd_usage-O_invalid2/useradd.test
diff --git a/tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config.txt b/tests/usertools/useradd/21_useradd_usage-p_invalid1/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config.txt
rename to tests/usertools/useradd/21_useradd_usage-p_invalid1/config.txt
diff --git a/tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/default/useradd b/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/default/useradd
rename to tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/group b/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/group
rename to tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/group
diff --git a/tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/gshadow b/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/gshadow
rename to tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/passwd b/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/passwd
rename to tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/shadow b/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/shadow
rename to tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/data/usage.out b/tests/usertools/useradd/21_useradd_usage-p_invalid1/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/data/usage.out
rename to tests/usertools/useradd/21_useradd_usage-p_invalid1/data/usage.out
diff --git a/tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/useradd.test b/tests/usertools/useradd/21_useradd_usage-p_invalid1/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/useradd.test
rename to tests/usertools/useradd/21_useradd_usage-p_invalid1/useradd.test
diff --git a/tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config.txt b/tests/usertools/useradd/22_useradd_usage-p_invalid2/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config.txt
rename to tests/usertools/useradd/22_useradd_usage-p_invalid2/config.txt
diff --git a/tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/default/useradd b/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/default/useradd
rename to tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/group b/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/group
rename to tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/group
diff --git a/tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/gshadow b/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/gshadow
rename to tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/passwd b/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/passwd
rename to tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/shadow b/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/shadow
rename to tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/data/usage.out b/tests/usertools/useradd/22_useradd_usage-p_invalid2/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/data/usage.out
rename to tests/usertools/useradd/22_useradd_usage-p_invalid2/data/usage.out
diff --git a/tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/useradd.test b/tests/usertools/useradd/22_useradd_usage-p_invalid2/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/useradd.test
rename to tests/usertools/useradd/22_useradd_usage-p_invalid2/useradd.test
diff --git a/tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config.txt b/tests/usertools/useradd/23_useradd_usage-s_invalid1/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config.txt
rename to tests/usertools/useradd/23_useradd_usage-s_invalid1/config.txt
diff --git a/tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/default/useradd b/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/default/useradd
rename to tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/group b/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/group
rename to tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/group
diff --git a/tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/gshadow b/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/gshadow
rename to tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/passwd b/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/passwd
rename to tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/shadow b/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/shadow
rename to tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/data/usage.out b/tests/usertools/useradd/23_useradd_usage-s_invalid1/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/data/usage.out
rename to tests/usertools/useradd/23_useradd_usage-s_invalid1/data/usage.out
diff --git a/tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/useradd.test b/tests/usertools/useradd/23_useradd_usage-s_invalid1/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/useradd.test
rename to tests/usertools/useradd/23_useradd_usage-s_invalid1/useradd.test
diff --git a/tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config.txt b/tests/usertools/useradd/24_useradd_usage-s_invalid2/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config.txt
rename to tests/usertools/useradd/24_useradd_usage-s_invalid2/config.txt
diff --git a/tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/default/useradd b/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/default/useradd
rename to tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/group b/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/group
rename to tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/group
diff --git a/tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/gshadow b/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/gshadow
rename to tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/passwd b/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/passwd
rename to tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/shadow b/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/shadow
rename to tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/data/usage.out b/tests/usertools/useradd/24_useradd_usage-s_invalid2/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/data/usage.out
rename to tests/usertools/useradd/24_useradd_usage-s_invalid2/data/usage.out
diff --git a/tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/useradd.test b/tests/usertools/useradd/24_useradd_usage-s_invalid2/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/useradd.test
rename to tests/usertools/useradd/24_useradd_usage-s_invalid2/useradd.test
diff --git a/tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config.txt b/tests/usertools/useradd/25_useradd_usage-s_invalid3/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config.txt
rename to tests/usertools/useradd/25_useradd_usage-s_invalid3/config.txt
diff --git a/tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/default/useradd b/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/default/useradd
rename to tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/group b/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/group
rename to tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/group
diff --git a/tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/gshadow b/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/gshadow
rename to tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/passwd b/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/passwd
rename to tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/shadow b/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/shadow
rename to tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/data/usage.out b/tests/usertools/useradd/25_useradd_usage-s_invalid3/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/data/usage.out
rename to tests/usertools/useradd/25_useradd_usage-s_invalid3/data/usage.out
diff --git a/tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/useradd.test b/tests/usertools/useradd/25_useradd_usage-s_invalid3/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/useradd.test
rename to tests/usertools/useradd/25_useradd_usage-s_invalid3/useradd.test
diff --git a/tests/tests/usertools/useradd/26_useradd_usage-o_without-u/config.txt b/tests/usertools/useradd/26_useradd_usage-o_without-u/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/26_useradd_usage-o_without-u/config.txt
rename to tests/usertools/useradd/26_useradd_usage-o_without-u/config.txt
diff --git a/tests/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/default/useradd b/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/default/useradd
rename to tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/group b/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/group
rename to tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/group
diff --git a/tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/gshadow b/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/gshadow
rename to tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/passwd b/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/config/etc/passwd
rename to tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/shadow b/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/shadow
rename to tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/26_useradd_usage-o_without-u/data/usage.out b/tests/usertools/useradd/26_useradd_usage-o_without-u/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/26_useradd_usage-o_without-u/data/usage.out
rename to tests/usertools/useradd/26_useradd_usage-o_without-u/data/usage.out
diff --git a/tests/tests/usertools/useradd/26_useradd_usage-o_without-u/useradd.test b/tests/usertools/useradd/26_useradd_usage-o_without-u/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/26_useradd_usage-o_without-u/useradd.test
rename to tests/usertools/useradd/26_useradd_usage-o_without-u/useradd.test
diff --git a/tests/tests/usertools/useradd/27_useradd_usage-k_without-m/config.txt b/tests/usertools/useradd/27_useradd_usage-k_without-m/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/27_useradd_usage-k_without-m/config.txt
rename to tests/usertools/useradd/27_useradd_usage-k_without-m/config.txt
diff --git a/tests/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/default/useradd b/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/default/useradd
rename to tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/group b/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/group
rename to tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/group
diff --git a/tests/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/gshadow b/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/gshadow
rename to tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/gshadow
diff --git a/tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/passwd b/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/config/etc/passwd
rename to tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/shadow b/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/shadow
rename to tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/27_useradd_usage-k_without-m/data/usage.out b/tests/usertools/useradd/27_useradd_usage-k_without-m/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/27_useradd_usage-k_without-m/data/usage.out
rename to tests/usertools/useradd/27_useradd_usage-k_without-m/data/usage.out
diff --git a/tests/tests/usertools/useradd/27_useradd_usage-k_without-m/useradd.test b/tests/usertools/useradd/27_useradd_usage-k_without-m/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/27_useradd_usage-k_without-m/useradd.test
rename to tests/usertools/useradd/27_useradd_usage-k_without-m/useradd.test
diff --git a/tests/tests/usertools/useradd/28_useradd_usage-U_with-g/config.txt b/tests/usertools/useradd/28_useradd_usage-U_with-g/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/28_useradd_usage-U_with-g/config.txt
rename to tests/usertools/useradd/28_useradd_usage-U_with-g/config.txt
diff --git a/tests/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/default/useradd b/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/default/useradd
rename to tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/group b/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/group
rename to tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/group
diff --git a/tests/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/gshadow b/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/gshadow
rename to tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/passwd b/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/passwd
rename to tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/shadow b/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/shadow
rename to tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/28_useradd_usage-U_with-g/data/usage.out b/tests/usertools/useradd/28_useradd_usage-U_with-g/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/28_useradd_usage-U_with-g/data/usage.out
rename to tests/usertools/useradd/28_useradd_usage-U_with-g/data/usage.out
diff --git a/tests/tests/usertools/useradd/28_useradd_usage-U_with-g/useradd.test b/tests/usertools/useradd/28_useradd_usage-U_with-g/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/28_useradd_usage-U_with-g/useradd.test
rename to tests/usertools/useradd/28_useradd_usage-U_with-g/useradd.test
diff --git a/tests/tests/usertools/useradd/29_useradd_usage-U_with-N/config.txt b/tests/usertools/useradd/29_useradd_usage-U_with-N/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/29_useradd_usage-U_with-N/config.txt
rename to tests/usertools/useradd/29_useradd_usage-U_with-N/config.txt
diff --git a/tests/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/default/useradd b/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/default/useradd
rename to tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/group b/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/group
rename to tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/group
diff --git a/tests/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/gshadow b/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/gshadow
rename to tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/passwd b/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/passwd
rename to tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/shadow b/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/shadow
rename to tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/29_useradd_usage-U_with-N/data/usage.out b/tests/usertools/useradd/29_useradd_usage-U_with-N/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/29_useradd_usage-U_with-N/data/usage.out
rename to tests/usertools/useradd/29_useradd_usage-U_with-N/data/usage.out
diff --git a/tests/tests/usertools/useradd/29_useradd_usage-U_with-N/useradd.test b/tests/usertools/useradd/29_useradd_usage-U_with-N/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/29_useradd_usage-U_with-N/useradd.test
rename to tests/usertools/useradd/29_useradd_usage-U_with-N/useradd.test
diff --git a/tests/tests/usertools/useradd/30_useradd_usage-m_with-M/config.txt b/tests/usertools/useradd/30_useradd_usage-m_with-M/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/30_useradd_usage-m_with-M/config.txt
rename to tests/usertools/useradd/30_useradd_usage-m_with-M/config.txt
diff --git a/tests/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/default/useradd b/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/default/useradd
rename to tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/group b/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/group
rename to tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/group
diff --git a/tests/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/gshadow b/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/gshadow
rename to tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/passwd b/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/passwd
rename to tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/shadow b/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/shadow
rename to tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/30_useradd_usage-m_with-M/data/usage.out b/tests/usertools/useradd/30_useradd_usage-m_with-M/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/30_useradd_usage-m_with-M/data/usage.out
rename to tests/usertools/useradd/30_useradd_usage-m_with-M/data/usage.out
diff --git a/tests/tests/usertools/useradd/30_useradd_usage-m_with-M/useradd.test b/tests/usertools/useradd/30_useradd_usage-m_with-M/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/30_useradd_usage-m_with-M/useradd.test
rename to tests/usertools/useradd/30_useradd_usage-m_with-M/useradd.test
diff --git a/tests/tests/usertools/useradd/31_useradd_usage_user_with-D/config.txt b/tests/usertools/useradd/31_useradd_usage_user_with-D/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/31_useradd_usage_user_with-D/config.txt
rename to tests/usertools/useradd/31_useradd_usage_user_with-D/config.txt
diff --git a/tests/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/default/useradd b/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/default/useradd
rename to tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/group b/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/group
rename to tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/group
diff --git a/tests/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/gshadow b/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/gshadow
rename to tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/passwd b/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/passwd
rename to tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/shadow b/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/shadow
rename to tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/31_useradd_usage_user_with-D/data/usage.out b/tests/usertools/useradd/31_useradd_usage_user_with-D/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/31_useradd_usage_user_with-D/data/usage.out
rename to tests/usertools/useradd/31_useradd_usage_user_with-D/data/usage.out
diff --git a/tests/tests/usertools/useradd/31_useradd_usage_user_with-D/useradd.test b/tests/usertools/useradd/31_useradd_usage_user_with-D/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/31_useradd_usage_user_with-D/useradd.test
rename to tests/usertools/useradd/31_useradd_usage_user_with-D/useradd.test
diff --git a/tests/tests/usertools/useradd/32_useradd_usage-D_with_other/config.txt b/tests/usertools/useradd/32_useradd_usage-D_with_other/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/32_useradd_usage-D_with_other/config.txt
rename to tests/usertools/useradd/32_useradd_usage-D_with_other/config.txt
diff --git a/tests/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/default/useradd b/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/default/useradd
rename to tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/group b/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/group
rename to tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/group
diff --git a/tests/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/gshadow b/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/gshadow
rename to tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/passwd b/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/passwd
rename to tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/shadow b/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/shadow
rename to tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/32_useradd_usage-D_with_other/data/usage.out b/tests/usertools/useradd/32_useradd_usage-D_with_other/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/32_useradd_usage-D_with_other/data/usage.out
rename to tests/usertools/useradd/32_useradd_usage-D_with_other/data/usage.out
diff --git a/tests/tests/usertools/useradd/32_useradd_usage-D_with_other/useradd.test b/tests/usertools/useradd/32_useradd_usage-D_with_other/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/32_useradd_usage-D_with_other/useradd.test
rename to tests/usertools/useradd/32_useradd_usage-D_with_other/useradd.test
diff --git a/tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config.txt b/tests/usertools/useradd/33_useradd_usage_invalid_username/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config.txt
rename to tests/usertools/useradd/33_useradd_usage_invalid_username/config.txt
diff --git a/tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/default/useradd b/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/default/useradd
rename to tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/group b/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/group
rename to tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/group
diff --git a/tests/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/gshadow b/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/gshadow
rename to tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/passwd b/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/passwd
rename to tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/shadow b/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/shadow
rename to tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/33_useradd_usage_invalid_username/data/usage.out b/tests/usertools/useradd/33_useradd_usage_invalid_username/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/33_useradd_usage_invalid_username/data/usage.out
rename to tests/usertools/useradd/33_useradd_usage_invalid_username/data/usage.out
diff --git a/tests/tests/usertools/useradd/33_useradd_usage_invalid_username/useradd.test b/tests/usertools/useradd/33_useradd_usage_invalid_username/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/33_useradd_usage_invalid_username/useradd.test
rename to tests/usertools/useradd/33_useradd_usage_invalid_username/useradd.test
diff --git a/tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config.txt b/tests/usertools/useradd/34_useradd_default_GROUP_GID/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config.txt
rename to tests/usertools/useradd/34_useradd_default_GROUP_GID/config.txt
diff --git a/tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/default/useradd b/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/default/useradd
rename to tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/group b/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/group
rename to tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/group
diff --git a/tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/gshadow b/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/gshadow
rename to tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/passwd b/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/passwd
rename to tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/shadow b/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/shadow
rename to tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/data/passwd b/tests/usertools/useradd/34_useradd_default_GROUP_GID/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/data/passwd
rename to tests/usertools/useradd/34_useradd_default_GROUP_GID/data/passwd
diff --git a/tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/data/shadow b/tests/usertools/useradd/34_useradd_default_GROUP_GID/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/data/shadow
rename to tests/usertools/useradd/34_useradd_default_GROUP_GID/data/shadow
diff --git a/tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/useradd.test b/tests/usertools/useradd/34_useradd_default_GROUP_GID/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/useradd.test
rename to tests/usertools/useradd/34_useradd_default_GROUP_GID/useradd.test
diff --git a/tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config.txt b/tests/usertools/useradd/35_useradd_default_GROUP_name/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config.txt
rename to tests/usertools/useradd/35_useradd_default_GROUP_name/config.txt
diff --git a/tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/default/useradd b/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/default/useradd
rename to tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/group b/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/group
rename to tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/group
diff --git a/tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/gshadow b/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/gshadow
rename to tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/passwd b/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/passwd
rename to tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/shadow b/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/shadow
rename to tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/35_useradd_default_GROUP_name/data/passwd b/tests/usertools/useradd/35_useradd_default_GROUP_name/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/35_useradd_default_GROUP_name/data/passwd
rename to tests/usertools/useradd/35_useradd_default_GROUP_name/data/passwd
diff --git a/tests/tests/usertools/useradd/35_useradd_default_GROUP_name/data/shadow b/tests/usertools/useradd/35_useradd_default_GROUP_name/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/35_useradd_default_GROUP_name/data/shadow
rename to tests/usertools/useradd/35_useradd_default_GROUP_name/data/shadow
diff --git a/tests/tests/usertools/useradd/35_useradd_default_GROUP_name/useradd.test b/tests/usertools/useradd/35_useradd_default_GROUP_name/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/35_useradd_default_GROUP_name/useradd.test
rename to tests/usertools/useradd/35_useradd_default_GROUP_name/useradd.test
diff --git a/tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config.txt b/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config.txt
rename to tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config.txt
diff --git a/tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/default/useradd b/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/default/useradd
rename to tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/group b/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/group
rename to tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/group
diff --git a/tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/gshadow b/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/gshadow
rename to tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/passwd b/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/passwd
rename to tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/shadow b/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/shadow
rename to tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/data/passwd b/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/data/passwd
rename to tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/data/passwd
diff --git a/tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/data/shadow b/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/data/shadow
rename to tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/data/shadow
diff --git a/tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/data/usage.out b/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/data/usage.out
rename to tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/data/usage.out
diff --git a/tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/useradd.test b/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/useradd.test
rename to tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/useradd.test
diff --git a/tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config.txt b/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config.txt
rename to tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config.txt
diff --git a/tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/default/useradd b/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/default/useradd
rename to tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/group b/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/group
rename to tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/group
diff --git a/tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/gshadow b/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/gshadow
rename to tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/passwd b/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/passwd
rename to tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/shadow b/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/shadow
rename to tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/data/passwd b/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/data/passwd
rename to tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/data/passwd
diff --git a/tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/data/shadow b/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/data/shadow
rename to tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/data/shadow
diff --git a/tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/data/usage.out b/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/data/usage.out
rename to tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/data/usage.out
diff --git a/tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/useradd.test b/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/useradd.test
rename to tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/useradd.test
diff --git a/tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config.txt b/tests/usertools/useradd/38_useradd_default_INACTIVE/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config.txt
rename to tests/usertools/useradd/38_useradd_default_INACTIVE/config.txt
diff --git a/tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/default/useradd b/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/default/useradd
rename to tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/group b/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/group
rename to tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/group
diff --git a/tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/gshadow b/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/gshadow
rename to tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/passwd b/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/passwd
rename to tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/shadow b/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/shadow
rename to tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/38_useradd_default_INACTIVE/data/passwd b/tests/usertools/useradd/38_useradd_default_INACTIVE/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/38_useradd_default_INACTIVE/data/passwd
rename to tests/usertools/useradd/38_useradd_default_INACTIVE/data/passwd
diff --git a/tests/tests/usertools/useradd/38_useradd_default_INACTIVE/data/shadow b/tests/usertools/useradd/38_useradd_default_INACTIVE/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/38_useradd_default_INACTIVE/data/shadow
rename to tests/usertools/useradd/38_useradd_default_INACTIVE/data/shadow
diff --git a/tests/tests/usertools/useradd/38_useradd_default_INACTIVE/useradd.test b/tests/usertools/useradd/38_useradd_default_INACTIVE/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/38_useradd_default_INACTIVE/useradd.test
rename to tests/usertools/useradd/38_useradd_default_INACTIVE/useradd.test
diff --git a/tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config.txt b/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config.txt
rename to tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config.txt
diff --git a/tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/default/useradd b/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/default/useradd
rename to tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/group b/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/group
rename to tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/group
diff --git a/tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/gshadow b/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/gshadow
rename to tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/passwd b/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/passwd
rename to tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/shadow b/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/shadow
rename to tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/data/passwd b/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/data/passwd
rename to tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/data/passwd
diff --git a/tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/data/shadow b/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/data/shadow
rename to tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/data/shadow
diff --git a/tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/data/usage.out b/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/data/usage.out
rename to tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/data/usage.out
diff --git a/tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/useradd.test b/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/useradd.test
rename to tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/useradd.test
diff --git a/tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config.txt b/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config.txt
rename to tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config.txt
diff --git a/tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/default/useradd b/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/default/useradd
rename to tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/group b/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/group
rename to tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/group
diff --git a/tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/gshadow b/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/gshadow
rename to tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/passwd b/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/passwd
rename to tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/shadow b/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/shadow
rename to tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/data/passwd b/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/data/passwd
rename to tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/data/passwd
diff --git a/tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/data/shadow b/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/data/shadow
rename to tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/data/shadow
diff --git a/tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/data/usage.out b/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/data/usage.out
rename to tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/data/usage.out
diff --git a/tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/useradd.test b/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/useradd.test
rename to tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/useradd.test
diff --git a/tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config.txt b/tests/usertools/useradd/41_useradd_default_default_SKEL/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config.txt
rename to tests/usertools/useradd/41_useradd_default_default_SKEL/config.txt
diff --git a/tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/default/useradd b/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/default/useradd
rename to tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/group b/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/group
rename to tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/group
diff --git a/tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/gshadow b/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/gshadow
rename to tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/passwd b/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/passwd
rename to tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/shadow b/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/shadow
rename to tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/41_useradd_default_default_SKEL/data/defaults b/tests/usertools/useradd/41_useradd_default_default_SKEL/data/defaults
similarity index 100%
rename from tests/tests/usertools/useradd/41_useradd_default_default_SKEL/data/defaults
rename to tests/usertools/useradd/41_useradd_default_default_SKEL/data/defaults
diff --git a/tests/tests/usertools/useradd/41_useradd_default_default_SKEL/useradd.test b/tests/usertools/useradd/41_useradd_default_default_SKEL/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/41_useradd_default_default_SKEL/useradd.test
rename to tests/usertools/useradd/41_useradd_default_default_SKEL/useradd.test
diff --git a/tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config.txt b/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config.txt
rename to tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config.txt
diff --git a/tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/default/useradd b/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/default/useradd
rename to tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/group b/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/group
rename to tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/group
diff --git a/tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/gshadow b/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/gshadow
rename to tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/passwd b/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/passwd
rename to tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/shadow b/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/shadow
rename to tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/data/defaults b/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/data/defaults
similarity index 100%
rename from tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/data/defaults
rename to tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/data/defaults
diff --git a/tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/useradd.test b/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/useradd.test
rename to tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/useradd.test
diff --git a/tests/tests/usertools/useradd/43_useradd_default_no_final_eol/config.txt b/tests/usertools/useradd/43_useradd_default_no_final_eol/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/43_useradd_default_no_final_eol/config.txt
rename to tests/usertools/useradd/43_useradd_default_no_final_eol/config.txt
diff --git a/tests/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/default/useradd b/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/default/useradd
rename to tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/group b/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/group
rename to tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/group
diff --git a/tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/gshadow b/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/gshadow
rename to tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/passwd b/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/passwd
rename to tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/shadow b/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/42_useradd_default_default_CREATE_MAIL_SPOOL/config/etc/shadow
rename to tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/43_useradd_default_no_final_eol/data/useradd b/tests/usertools/useradd/43_useradd_default_no_final_eol/data/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/43_useradd_default_no_final_eol/data/useradd
rename to tests/usertools/useradd/43_useradd_default_no_final_eol/data/useradd
diff --git a/tests/tests/usertools/useradd/43_useradd_default_no_final_eol/useradd.test b/tests/usertools/useradd/43_useradd_default_no_final_eol/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/43_useradd_default_no_final_eol/useradd.test
rename to tests/usertools/useradd/43_useradd_default_no_final_eol/useradd.test
diff --git a/tests/tests/usertools/useradd/44_useradd_default_no_file/config.txt b/tests/usertools/useradd/44_useradd_default_no_file/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/44_useradd_default_no_file/config.txt
rename to tests/usertools/useradd/44_useradd_default_no_file/config.txt
diff --git a/tests/tests/usertools/useradd/44_useradd_default_no_file/config/etc/default/useradd b/tests/usertools/useradd/44_useradd_default_no_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/44_useradd_default_no_file/config/etc/default/useradd
rename to tests/usertools/useradd/44_useradd_default_no_file/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/group b/tests/usertools/useradd/44_useradd_default_no_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/group
rename to tests/usertools/useradd/44_useradd_default_no_file/config/etc/group
diff --git a/tests/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/gshadow b/tests/usertools/useradd/44_useradd_default_no_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/gshadow
rename to tests/usertools/useradd/44_useradd_default_no_file/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/passwd b/tests/usertools/useradd/44_useradd_default_no_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/passwd
rename to tests/usertools/useradd/44_useradd_default_no_file/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/shadow b/tests/usertools/useradd/44_useradd_default_no_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/shadow
rename to tests/usertools/useradd/44_useradd_default_no_file/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/44_useradd_default_no_file/data/useradd b/tests/usertools/useradd/44_useradd_default_no_file/data/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/44_useradd_default_no_file/data/useradd
rename to tests/usertools/useradd/44_useradd_default_no_file/data/useradd
diff --git a/tests/tests/usertools/useradd/44_useradd_default_no_file/useradd.test b/tests/usertools/useradd/44_useradd_default_no_file/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/44_useradd_default_no_file/useradd.test
rename to tests/usertools/useradd/44_useradd_default_no_file/useradd.test
diff --git a/tests/tests/usertools/useradd/45_useradd-G_UID_name/config.txt b/tests/usertools/useradd/45_useradd-G_UID_name/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/45_useradd-G_UID_name/config.txt
rename to tests/usertools/useradd/45_useradd-G_UID_name/config.txt
diff --git a/tests/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/default/useradd b/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/default/useradd
rename to tests/usertools/useradd/45_useradd-G_UID_name/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/44_useradd_default_no_file/config/etc/group b/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/44_useradd_default_no_file/config/etc/group
rename to tests/usertools/useradd/45_useradd-G_UID_name/config/etc/group
diff --git a/tests/tests/usertools/useradd/44_useradd_default_no_file/config/etc/gshadow b/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/44_useradd_default_no_file/config/etc/gshadow
rename to tests/usertools/useradd/45_useradd-G_UID_name/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/44_useradd_default_no_file/config/etc/passwd b/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/44_useradd_default_no_file/config/etc/passwd
rename to tests/usertools/useradd/45_useradd-G_UID_name/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/44_useradd_default_no_file/config/etc/shadow b/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/44_useradd_default_no_file/config/etc/shadow
rename to tests/usertools/useradd/45_useradd-G_UID_name/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/45_useradd-G_UID_name/data/group b/tests/usertools/useradd/45_useradd-G_UID_name/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/45_useradd-G_UID_name/data/group
rename to tests/usertools/useradd/45_useradd-G_UID_name/data/group
diff --git a/tests/tests/usertools/useradd/45_useradd-G_UID_name/data/gshadow b/tests/usertools/useradd/45_useradd-G_UID_name/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/45_useradd-G_UID_name/data/gshadow
rename to tests/usertools/useradd/45_useradd-G_UID_name/data/gshadow
diff --git a/tests/tests/usertools/useradd/45_useradd-G_UID_name/data/passwd b/tests/usertools/useradd/45_useradd-G_UID_name/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/45_useradd-G_UID_name/data/passwd
rename to tests/usertools/useradd/45_useradd-G_UID_name/data/passwd
diff --git a/tests/tests/usertools/useradd/45_useradd-G_UID_name/data/shadow b/tests/usertools/useradd/45_useradd-G_UID_name/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/45_useradd-G_UID_name/data/shadow
rename to tests/usertools/useradd/45_useradd-G_UID_name/data/shadow
diff --git a/tests/tests/usertools/useradd/45_useradd-G_UID_name/useradd.test b/tests/usertools/useradd/45_useradd-G_UID_name/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/45_useradd-G_UID_name/useradd.test
rename to tests/usertools/useradd/45_useradd-G_UID_name/useradd.test
diff --git a/tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config.txt b/tests/usertools/useradd/46_useradd-G_UID_duplicate/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config.txt
rename to tests/usertools/useradd/46_useradd-G_UID_duplicate/config.txt
diff --git a/tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/default/useradd b/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/default/useradd
rename to tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/group b/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/group
rename to tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/group
diff --git a/tests/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/gshadow b/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/gshadow
rename to tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/passwd b/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/passwd
rename to tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/shadow b/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/shadow
rename to tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/data/group b/tests/usertools/useradd/46_useradd-G_UID_duplicate/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/data/group
rename to tests/usertools/useradd/46_useradd-G_UID_duplicate/data/group
diff --git a/tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/data/gshadow b/tests/usertools/useradd/46_useradd-G_UID_duplicate/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/data/gshadow
rename to tests/usertools/useradd/46_useradd-G_UID_duplicate/data/gshadow
diff --git a/tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/data/passwd b/tests/usertools/useradd/46_useradd-G_UID_duplicate/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/data/passwd
rename to tests/usertools/useradd/46_useradd-G_UID_duplicate/data/passwd
diff --git a/tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/data/shadow b/tests/usertools/useradd/46_useradd-G_UID_duplicate/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/data/shadow
rename to tests/usertools/useradd/46_useradd-G_UID_duplicate/data/shadow
diff --git a/tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/useradd.test b/tests/usertools/useradd/46_useradd-G_UID_duplicate/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/useradd.test
rename to tests/usertools/useradd/46_useradd-G_UID_duplicate/useradd.test
diff --git a/tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config.txt b/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config.txt
rename to tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config.txt
diff --git a/tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/default/useradd b/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/default/useradd
rename to tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/group b/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/group
rename to tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/group
diff --git a/tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/gshadow b/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/gshadow
rename to tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/passwd b/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/passwd
rename to tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/shadow b/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/shadow
rename to tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/group b/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/group
rename to tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/group
diff --git a/tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/gshadow b/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/gshadow
rename to tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/gshadow
diff --git a/tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/passwd b/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/passwd
rename to tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/passwd
diff --git a/tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/shadow b/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/shadow
rename to tests/usertools/useradd/47_useradd-G_UID_name_duplicate/data/shadow
diff --git a/tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/useradd.test b/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/useradd.test
rename to tests/usertools/useradd/47_useradd-G_UID_name_duplicate/useradd.test
diff --git a/tests/tests/usertools/useradd/48_useradd-G_name_duplicate/config.txt b/tests/usertools/useradd/48_useradd-G_name_duplicate/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/48_useradd-G_name_duplicate/config.txt
rename to tests/usertools/useradd/48_useradd-G_name_duplicate/config.txt
diff --git a/tests/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/default/useradd b/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/default/useradd
rename to tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/group b/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/group
rename to tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/group
diff --git a/tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/gshadow b/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/gshadow
rename to tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/passwd b/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/passwd
rename to tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/shadow b/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/47_useradd-G_UID_name_duplicate/config/etc/shadow
rename to tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/48_useradd-G_name_duplicate/data/group b/tests/usertools/useradd/48_useradd-G_name_duplicate/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/48_useradd-G_name_duplicate/data/group
rename to tests/usertools/useradd/48_useradd-G_name_duplicate/data/group
diff --git a/tests/tests/usertools/useradd/48_useradd-G_name_duplicate/data/gshadow b/tests/usertools/useradd/48_useradd-G_name_duplicate/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/48_useradd-G_name_duplicate/data/gshadow
rename to tests/usertools/useradd/48_useradd-G_name_duplicate/data/gshadow
diff --git a/tests/tests/usertools/useradd/48_useradd-G_name_duplicate/data/passwd b/tests/usertools/useradd/48_useradd-G_name_duplicate/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/48_useradd-G_name_duplicate/data/passwd
rename to tests/usertools/useradd/48_useradd-G_name_duplicate/data/passwd
diff --git a/tests/tests/usertools/useradd/48_useradd-G_name_duplicate/data/shadow b/tests/usertools/useradd/48_useradd-G_name_duplicate/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/48_useradd-G_name_duplicate/data/shadow
rename to tests/usertools/useradd/48_useradd-G_name_duplicate/data/shadow
diff --git a/tests/tests/usertools/useradd/48_useradd-G_name_duplicate/useradd.test b/tests/usertools/useradd/48_useradd-G_name_duplicate/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/48_useradd-G_name_duplicate/useradd.test
rename to tests/usertools/useradd/48_useradd-G_name_duplicate/useradd.test
diff --git a/tests/tests/usertools/useradd/49_useradd-G_invalid_group/config.txt b/tests/usertools/useradd/49_useradd-G_invalid_group/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/49_useradd-G_invalid_group/config.txt
rename to tests/usertools/useradd/49_useradd-G_invalid_group/config.txt
diff --git a/tests/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/default/useradd b/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/default/useradd
rename to tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/group b/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/group
rename to tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/group
diff --git a/tests/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/gshadow b/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/gshadow
rename to tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/passwd b/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/passwd
rename to tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/shadow b/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/48_useradd-G_name_duplicate/config/etc/shadow
rename to tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/49_useradd-G_invalid_group/data/usage.out b/tests/usertools/useradd/49_useradd-G_invalid_group/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/49_useradd-G_invalid_group/data/usage.out
rename to tests/usertools/useradd/49_useradd-G_invalid_group/data/usage.out
diff --git a/tests/tests/usertools/useradd/49_useradd-G_invalid_group/useradd.test b/tests/usertools/useradd/49_useradd-G_invalid_group/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/49_useradd-G_invalid_group/useradd.test
rename to tests/usertools/useradd/49_useradd-G_invalid_group/useradd.test
diff --git a/tests/tests/usertools/useradd/50_useradd-r/config.txt b/tests/usertools/useradd/50_useradd-r/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/50_useradd-r/config.txt
rename to tests/usertools/useradd/50_useradd-r/config.txt
diff --git a/tests/tests/usertools/useradd/50_useradd-r/config/etc/default/useradd b/tests/usertools/useradd/50_useradd-r/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/50_useradd-r/config/etc/default/useradd
rename to tests/usertools/useradd/50_useradd-r/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/group b/tests/usertools/useradd/50_useradd-r/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/group
rename to tests/usertools/useradd/50_useradd-r/config/etc/group
diff --git a/tests/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/gshadow b/tests/usertools/useradd/50_useradd-r/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/gshadow
rename to tests/usertools/useradd/50_useradd-r/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/passwd b/tests/usertools/useradd/50_useradd-r/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/passwd
rename to tests/usertools/useradd/50_useradd-r/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/shadow b/tests/usertools/useradd/50_useradd-r/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/shadow
rename to tests/usertools/useradd/50_useradd-r/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/50_useradd-r/data/group b/tests/usertools/useradd/50_useradd-r/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/50_useradd-r/data/group
rename to tests/usertools/useradd/50_useradd-r/data/group
diff --git a/tests/tests/usertools/useradd/50_useradd-r/data/gshadow b/tests/usertools/useradd/50_useradd-r/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/50_useradd-r/data/gshadow
rename to tests/usertools/useradd/50_useradd-r/data/gshadow
diff --git a/tests/tests/usertools/useradd/50_useradd-r/data/passwd b/tests/usertools/useradd/50_useradd-r/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/50_useradd-r/data/passwd
rename to tests/usertools/useradd/50_useradd-r/data/passwd
diff --git a/tests/tests/usertools/useradd/50_useradd-r/data/shadow b/tests/usertools/useradd/50_useradd-r/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/50_useradd-r/data/shadow
rename to tests/usertools/useradd/50_useradd-r/data/shadow
diff --git a/tests/tests/usertools/useradd/50_useradd-r/useradd.test b/tests/usertools/useradd/50_useradd-r/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/50_useradd-r/useradd.test
rename to tests/usertools/useradd/50_useradd-r/useradd.test
diff --git a/tests/tests/usertools/useradd/51_useradd_already_exist/config.txt b/tests/usertools/useradd/51_useradd_already_exist/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/51_useradd_already_exist/config.txt
rename to tests/usertools/useradd/51_useradd_already_exist/config.txt
diff --git a/tests/tests/usertools/useradd/51_useradd_already_exist/config/etc/default/useradd b/tests/usertools/useradd/51_useradd_already_exist/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/51_useradd_already_exist/config/etc/default/useradd
rename to tests/usertools/useradd/51_useradd_already_exist/config/etc/default/useradd
diff --git a/tests/tests/usertools/09_userdel_del_homedir/config/etc/group b/tests/usertools/useradd/51_useradd_already_exist/config/etc/group
similarity index 100%
rename from tests/tests/usertools/09_userdel_del_homedir/config/etc/group
rename to tests/usertools/useradd/51_useradd_already_exist/config/etc/group
diff --git a/tests/tests/usertools/useradd/51_useradd_already_exist/config/etc/gshadow b/tests/usertools/useradd/51_useradd_already_exist/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/51_useradd_already_exist/config/etc/gshadow
rename to tests/usertools/useradd/51_useradd_already_exist/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/passwd b/tests/usertools/useradd/51_useradd_already_exist/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/passwd
rename to tests/usertools/useradd/51_useradd_already_exist/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/51_useradd_already_exist/config/etc/shadow b/tests/usertools/useradd/51_useradd_already_exist/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/51_useradd_already_exist/config/etc/shadow
rename to tests/usertools/useradd/51_useradd_already_exist/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/51_useradd_already_exist/data/usage.out b/tests/usertools/useradd/51_useradd_already_exist/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/51_useradd_already_exist/data/usage.out
rename to tests/usertools/useradd/51_useradd_already_exist/data/usage.out
diff --git a/tests/tests/usertools/useradd/51_useradd_already_exist/useradd.test b/tests/usertools/useradd/51_useradd_already_exist/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/51_useradd_already_exist/useradd.test
rename to tests/usertools/useradd/51_useradd_already_exist/useradd.test
diff --git a/tests/tests/usertools/useradd/52_useradd-U_group_already_exist/config.txt b/tests/usertools/useradd/52_useradd-U_group_already_exist/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/52_useradd-U_group_already_exist/config.txt
rename to tests/usertools/useradd/52_useradd-U_group_already_exist/config.txt
diff --git a/tests/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/default/useradd b/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/default/useradd
rename to tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/default/useradd
diff --git a/tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/group b/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/group
similarity index 100%
rename from tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/group
rename to tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/group
diff --git a/tests/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/gshadow b/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/gshadow
rename to tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/50_useradd-r/config/etc/passwd b/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/50_useradd-r/config/etc/passwd
rename to tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/50_useradd-r/config/etc/shadow b/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/50_useradd-r/config/etc/shadow
rename to tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/52_useradd-U_group_already_exist/data/usage.out b/tests/usertools/useradd/52_useradd-U_group_already_exist/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/52_useradd-U_group_already_exist/data/usage.out
rename to tests/usertools/useradd/52_useradd-U_group_already_exist/data/usage.out
diff --git a/tests/tests/usertools/useradd/52_useradd-U_group_already_exist/useradd.test b/tests/usertools/useradd/52_useradd-U_group_already_exist/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/52_useradd-U_group_already_exist/useradd.test
rename to tests/usertools/useradd/52_useradd-U_group_already_exist/useradd.test
diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/config.txt b/tests/usertools/useradd/53_useradd-G_empty/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/53_useradd-G_empty/config.txt
rename to tests/usertools/useradd/53_useradd-G_empty/config.txt
diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/default/useradd b/tests/usertools/useradd/53_useradd-G_empty/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/default/useradd
rename to tests/usertools/useradd/53_useradd-G_empty/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/50_useradd-r/config/etc/group b/tests/usertools/useradd/53_useradd-G_empty/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/50_useradd-r/config/etc/group
rename to tests/usertools/useradd/53_useradd-G_empty/config/etc/group
diff --git a/tests/tests/usertools/useradd/50_useradd-r/config/etc/gshadow b/tests/usertools/useradd/53_useradd-G_empty/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/50_useradd-r/config/etc/gshadow
rename to tests/usertools/useradd/53_useradd-G_empty/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/passwd b/tests/usertools/useradd/53_useradd-G_empty/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/passwd
rename to tests/usertools/useradd/53_useradd-G_empty/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/shadow b/tests/usertools/useradd/53_useradd-G_empty/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/shadow
rename to tests/usertools/useradd/53_useradd-G_empty/config/etc/shadow
diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/group b/tests/usertools/useradd/53_useradd-G_empty/data/group
similarity index 100%
rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/group
rename to tests/usertools/useradd/53_useradd-G_empty/data/group
diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/data/gshadow b/tests/usertools/useradd/53_useradd-G_empty/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/53_useradd-G_empty/data/gshadow
rename to tests/usertools/useradd/53_useradd-G_empty/data/gshadow
diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/data/passwd b/tests/usertools/useradd/53_useradd-G_empty/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/53_useradd-G_empty/data/passwd
rename to tests/usertools/useradd/53_useradd-G_empty/data/passwd
diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/data/shadow b/tests/usertools/useradd/53_useradd-G_empty/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/53_useradd-G_empty/data/shadow
rename to tests/usertools/useradd/53_useradd-G_empty/data/shadow
diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/useradd.test b/tests/usertools/useradd/53_useradd-G_empty/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/53_useradd-G_empty/useradd.test
rename to tests/usertools/useradd/53_useradd-G_empty/useradd.test
diff --git a/tests/tests/usertools/useradd/54_useradd_no_shadow_file/config.txt b/tests/usertools/useradd/54_useradd_no_shadow_file/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/54_useradd_no_shadow_file/config.txt
rename to tests/usertools/useradd/54_useradd_no_shadow_file/config.txt
diff --git a/tests/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/default/useradd b/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/default/useradd
rename to tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/group b/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/group
rename to tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/group
diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/gshadow b/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/gshadow
rename to tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/passwd b/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/passwd
rename to tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/shadow b/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/shadow
rename to tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/54_useradd_no_shadow_file/data/group b/tests/usertools/useradd/54_useradd_no_shadow_file/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/54_useradd_no_shadow_file/data/group
rename to tests/usertools/useradd/54_useradd_no_shadow_file/data/group
diff --git a/tests/tests/usertools/useradd/54_useradd_no_shadow_file/data/gshadow b/tests/usertools/useradd/54_useradd_no_shadow_file/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/54_useradd_no_shadow_file/data/gshadow
rename to tests/usertools/useradd/54_useradd_no_shadow_file/data/gshadow
diff --git a/tests/tests/usertools/useradd/54_useradd_no_shadow_file/data/passwd b/tests/usertools/useradd/54_useradd_no_shadow_file/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/54_useradd_no_shadow_file/data/passwd
rename to tests/usertools/useradd/54_useradd_no_shadow_file/data/passwd
diff --git a/tests/tests/usertools/useradd/54_useradd_no_shadow_file/useradd.test b/tests/usertools/useradd/54_useradd_no_shadow_file/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/54_useradd_no_shadow_file/useradd.test
rename to tests/usertools/useradd/54_useradd_no_shadow_file/useradd.test
diff --git a/tests/tests/usertools/useradd/55_useradd_no_gshadow_file/config.txt b/tests/usertools/useradd/55_useradd_no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/55_useradd_no_gshadow_file/config.txt
rename to tests/usertools/useradd/55_useradd_no_gshadow_file/config.txt
diff --git a/tests/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/default/useradd b/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/default/useradd
rename to tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/group b/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/group
rename to tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/group
diff --git a/tests/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/gshadow b/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/gshadow
rename to tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/passwd b/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/passwd
rename to tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/shadow b/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/shadow
rename to tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/55_useradd_no_gshadow_file/data/group b/tests/usertools/useradd/55_useradd_no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/55_useradd_no_gshadow_file/data/group
rename to tests/usertools/useradd/55_useradd_no_gshadow_file/data/group
diff --git a/tests/tests/usertools/useradd/55_useradd_no_gshadow_file/data/passwd b/tests/usertools/useradd/55_useradd_no_gshadow_file/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/55_useradd_no_gshadow_file/data/passwd
rename to tests/usertools/useradd/55_useradd_no_gshadow_file/data/passwd
diff --git a/tests/tests/usertools/useradd/55_useradd_no_gshadow_file/data/shadow b/tests/usertools/useradd/55_useradd_no_gshadow_file/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/55_useradd_no_gshadow_file/data/shadow
rename to tests/usertools/useradd/55_useradd_no_gshadow_file/data/shadow
diff --git a/tests/tests/usertools/useradd/55_useradd_no_gshadow_file/useradd.test b/tests/usertools/useradd/55_useradd_no_gshadow_file/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/55_useradd_no_gshadow_file/useradd.test
rename to tests/usertools/useradd/55_useradd_no_gshadow_file/useradd.test
diff --git a/tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config.txt b/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config.txt
rename to tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config.txt
diff --git a/tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/default/useradd b/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/default/useradd
rename to tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/group b/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/group
rename to tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/group
diff --git a/tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/gshadow b/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/gshadow
rename to tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/passwd b/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/passwd
rename to tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/shadow b/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/shadow
rename to tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/group b/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/group
rename to tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/group
diff --git a/tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/gshadow b/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/gshadow
rename to tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/gshadow
diff --git a/tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/passwd b/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/passwd
rename to tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/passwd
diff --git a/tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/shadow b/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/shadow
rename to tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/data/shadow
diff --git a/tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/useradd.test b/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/useradd.test
rename to tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/useradd.test
diff --git a/tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config.txt b/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config.txt
rename to tests/usertools/useradd/57_useradd_usage-D_not_first_option/config.txt
diff --git a/tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/default/useradd b/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/default/useradd
rename to tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/group b/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/group
rename to tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/group
diff --git a/tests/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/gshadow b/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/gshadow
rename to tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/passwd b/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/passwd
rename to tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/shadow b/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/56_useradd_gshadow_entry_without_group_entry/config/etc/shadow
rename to tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/data/usage.out b/tests/usertools/useradd/57_useradd_usage-D_not_first_option/data/usage.out
similarity index 100%
rename from tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/data/usage.out
rename to tests/usertools/useradd/57_useradd_usage-D_not_first_option/data/usage.out
diff --git a/tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/useradd.test b/tests/usertools/useradd/57_useradd_usage-D_not_first_option/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/useradd.test
rename to tests/usertools/useradd/57_useradd_usage-D_not_first_option/useradd.test
diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/config.txt b/tests/usertools/useradd/58_useradd-e_empty/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/58_useradd-e_empty/config.txt
rename to tests/usertools/useradd/58_useradd-e_empty/config.txt
diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/default/useradd b/tests/usertools/useradd/58_useradd-e_empty/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/default/useradd
rename to tests/usertools/useradd/58_useradd-e_empty/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/group b/tests/usertools/useradd/58_useradd-e_empty/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/group
rename to tests/usertools/useradd/58_useradd-e_empty/config/etc/group
diff --git a/tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/gshadow b/tests/usertools/useradd/58_useradd-e_empty/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/gshadow
rename to tests/usertools/useradd/58_useradd-e_empty/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/passwd b/tests/usertools/useradd/58_useradd-e_empty/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/passwd
rename to tests/usertools/useradd/58_useradd-e_empty/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/shadow b/tests/usertools/useradd/58_useradd-e_empty/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/57_useradd_usage-D_not_first_option/config/etc/shadow
rename to tests/usertools/useradd/58_useradd-e_empty/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/51_useradd_already_exist/config/etc/group b/tests/usertools/useradd/58_useradd-e_empty/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/51_useradd_already_exist/config/etc/group
rename to tests/usertools/useradd/58_useradd-e_empty/data/group
diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/data/gshadow b/tests/usertools/useradd/58_useradd-e_empty/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/58_useradd-e_empty/data/gshadow
rename to tests/usertools/useradd/58_useradd-e_empty/data/gshadow
diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/data/passwd b/tests/usertools/useradd/58_useradd-e_empty/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/58_useradd-e_empty/data/passwd
rename to tests/usertools/useradd/58_useradd-e_empty/data/passwd
diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/data/shadow b/tests/usertools/useradd/58_useradd-e_empty/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/58_useradd-e_empty/data/shadow
rename to tests/usertools/useradd/58_useradd-e_empty/data/shadow
diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/useradd.test b/tests/usertools/useradd/58_useradd-e_empty/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/58_useradd-e_empty/useradd.test
rename to tests/usertools/useradd/58_useradd-e_empty/useradd.test
diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/config.txt b/tests/usertools/useradd/59_useradd-e-1-f-1/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/59_useradd-e-1-f-1/config.txt
rename to tests/usertools/useradd/59_useradd-e-1-f-1/config.txt
diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/default/useradd b/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/default/useradd
rename to tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/group b/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/group
rename to tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/group
diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/gshadow b/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/gshadow
rename to tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/passwd b/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/passwd
rename to tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/shadow b/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/shadow
rename to tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/group b/tests/usertools/useradd/59_useradd-e-1-f-1/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/group
rename to tests/usertools/useradd/59_useradd-e-1-f-1/data/group
diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/data/gshadow b/tests/usertools/useradd/59_useradd-e-1-f-1/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/59_useradd-e-1-f-1/data/gshadow
rename to tests/usertools/useradd/59_useradd-e-1-f-1/data/gshadow
diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/data/passwd b/tests/usertools/useradd/59_useradd-e-1-f-1/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/59_useradd-e-1-f-1/data/passwd
rename to tests/usertools/useradd/59_useradd-e-1-f-1/data/passwd
diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/data/shadow b/tests/usertools/useradd/59_useradd-e-1-f-1/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/59_useradd-e-1-f-1/data/shadow
rename to tests/usertools/useradd/59_useradd-e-1-f-1/data/shadow
diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/useradd.test b/tests/usertools/useradd/59_useradd-e-1-f-1/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/59_useradd-e-1-f-1/useradd.test
rename to tests/usertools/useradd/59_useradd-e-1-f-1/useradd.test
diff --git a/tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config.txt b/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config.txt
rename to tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config.txt
diff --git a/tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/default/useradd b/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/default/useradd
rename to tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/group b/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/group
rename to tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/group
diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/gshadow b/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/gshadow
rename to tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/passwd b/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/passwd
rename to tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/shadow b/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/shadow
rename to tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/data/group b/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/53_useradd-G_empty/data/group
rename to tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/data/group
diff --git a/tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/data/gshadow b/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/data/gshadow
rename to tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/data/gshadow
diff --git a/tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/data/passwd b/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/data/passwd
rename to tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/data/passwd
diff --git a/tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/useradd.test b/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/useradd.test
rename to tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/useradd.test
diff --git a/tests/tests/usertools/useradd/61_useradd-K/config.txt b/tests/usertools/useradd/61_useradd-K/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/61_useradd-K/config.txt
rename to tests/usertools/useradd/61_useradd-K/config.txt
diff --git a/tests/tests/usertools/useradd/61_useradd-K/config/etc/default/useradd b/tests/usertools/useradd/61_useradd-K/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/61_useradd-K/config/etc/default/useradd
rename to tests/usertools/useradd/61_useradd-K/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/group b/tests/usertools/useradd/61_useradd-K/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/group
rename to tests/usertools/useradd/61_useradd-K/config/etc/group
diff --git a/tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/gshadow b/tests/usertools/useradd/61_useradd-K/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/gshadow
rename to tests/usertools/useradd/61_useradd-K/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/passwd b/tests/usertools/useradd/61_useradd-K/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/passwd
rename to tests/usertools/useradd/61_useradd-K/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/shadow b/tests/usertools/useradd/61_useradd-K/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/config/etc/shadow
rename to tests/usertools/useradd/61_useradd-K/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/data/group b/tests/usertools/useradd/61_useradd-K/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/58_useradd-e_empty/data/group
rename to tests/usertools/useradd/61_useradd-K/data/group
diff --git a/tests/tests/usertools/useradd/61_useradd-K/data/gshadow b/tests/usertools/useradd/61_useradd-K/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/61_useradd-K/data/gshadow
rename to tests/usertools/useradd/61_useradd-K/data/gshadow
diff --git a/tests/tests/usertools/useradd/61_useradd-K/data/passwd b/tests/usertools/useradd/61_useradd-K/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/61_useradd-K/data/passwd
rename to tests/usertools/useradd/61_useradd-K/data/passwd
diff --git a/tests/tests/usertools/useradd/61_useradd-K/data/shadow b/tests/usertools/useradd/61_useradd-K/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/61_useradd-K/data/shadow
rename to tests/usertools/useradd/61_useradd-K/data/shadow
diff --git a/tests/tests/usertools/useradd/61_useradd-K/useradd.test b/tests/usertools/useradd/61_useradd-K/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/61_useradd-K/useradd.test
rename to tests/usertools/useradd/61_useradd-K/useradd.test
diff --git a/tests/tests/usertools/useradd/62_useradd-p/config.txt b/tests/usertools/useradd/62_useradd-p/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/62_useradd-p/config.txt
rename to tests/usertools/useradd/62_useradd-p/config.txt
diff --git a/tests/tests/usertools/useradd/62_useradd-p/config/etc/default/useradd b/tests/usertools/useradd/62_useradd-p/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/62_useradd-p/config/etc/default/useradd
rename to tests/usertools/useradd/62_useradd-p/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/61_useradd-K/config/etc/group b/tests/usertools/useradd/62_useradd-p/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/61_useradd-K/config/etc/group
rename to tests/usertools/useradd/62_useradd-p/config/etc/group
diff --git a/tests/tests/usertools/useradd/61_useradd-K/config/etc/gshadow b/tests/usertools/useradd/62_useradd-p/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/61_useradd-K/config/etc/gshadow
rename to tests/usertools/useradd/62_useradd-p/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/61_useradd-K/config/etc/passwd b/tests/usertools/useradd/62_useradd-p/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/61_useradd-K/config/etc/passwd
rename to tests/usertools/useradd/62_useradd-p/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/61_useradd-K/config/etc/shadow b/tests/usertools/useradd/62_useradd-p/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/61_useradd-K/config/etc/shadow
rename to tests/usertools/useradd/62_useradd-p/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/data/group b/tests/usertools/useradd/62_useradd-p/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/59_useradd-e-1-f-1/data/group
rename to tests/usertools/useradd/62_useradd-p/data/group
diff --git a/tests/tests/usertools/useradd/62_useradd-p/data/gshadow b/tests/usertools/useradd/62_useradd-p/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/62_useradd-p/data/gshadow
rename to tests/usertools/useradd/62_useradd-p/data/gshadow
diff --git a/tests/tests/usertools/useradd/62_useradd-p/data/passwd b/tests/usertools/useradd/62_useradd-p/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/62_useradd-p/data/passwd
rename to tests/usertools/useradd/62_useradd-p/data/passwd
diff --git a/tests/tests/usertools/useradd/62_useradd-p/data/shadow b/tests/usertools/useradd/62_useradd-p/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/62_useradd-p/data/shadow
rename to tests/usertools/useradd/62_useradd-p/data/shadow
diff --git a/tests/tests/usertools/useradd/62_useradd-p/useradd.test b/tests/usertools/useradd/62_useradd-p/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/62_useradd-p/useradd.test
rename to tests/usertools/useradd/62_useradd-p/useradd.test
diff --git a/tests/tests/usertools/useradd/63_useradd-s/config.txt b/tests/usertools/useradd/63_useradd-s/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/63_useradd-s/config.txt
rename to tests/usertools/useradd/63_useradd-s/config.txt
diff --git a/tests/tests/usertools/useradd/63_useradd-s/config/etc/default/useradd b/tests/usertools/useradd/63_useradd-s/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/63_useradd-s/config/etc/default/useradd
rename to tests/usertools/useradd/63_useradd-s/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/62_useradd-p/config/etc/group b/tests/usertools/useradd/63_useradd-s/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/62_useradd-p/config/etc/group
rename to tests/usertools/useradd/63_useradd-s/config/etc/group
diff --git a/tests/tests/usertools/useradd/62_useradd-p/config/etc/gshadow b/tests/usertools/useradd/63_useradd-s/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/62_useradd-p/config/etc/gshadow
rename to tests/usertools/useradd/63_useradd-s/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/62_useradd-p/config/etc/passwd b/tests/usertools/useradd/63_useradd-s/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/62_useradd-p/config/etc/passwd
rename to tests/usertools/useradd/63_useradd-s/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/62_useradd-p/config/etc/shadow b/tests/usertools/useradd/63_useradd-s/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/62_useradd-p/config/etc/shadow
rename to tests/usertools/useradd/63_useradd-s/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/data/group b/tests/usertools/useradd/63_useradd-s/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/60_useradd-e-1-f-1_no_shadow_file/data/group
rename to tests/usertools/useradd/63_useradd-s/data/group
diff --git a/tests/tests/usertools/useradd/63_useradd-s/data/gshadow b/tests/usertools/useradd/63_useradd-s/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/63_useradd-s/data/gshadow
rename to tests/usertools/useradd/63_useradd-s/data/gshadow
diff --git a/tests/tests/usertools/useradd/63_useradd-s/data/passwd b/tests/usertools/useradd/63_useradd-s/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/63_useradd-s/data/passwd
rename to tests/usertools/useradd/63_useradd-s/data/passwd
diff --git a/tests/tests/usertools/useradd/63_useradd-s/data/shadow b/tests/usertools/useradd/63_useradd-s/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/63_useradd-s/data/shadow
rename to tests/usertools/useradd/63_useradd-s/data/shadow
diff --git a/tests/tests/usertools/useradd/63_useradd-s/useradd.test b/tests/usertools/useradd/63_useradd-s/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/63_useradd-s/useradd.test
rename to tests/usertools/useradd/63_useradd-s/useradd.test
diff --git a/tests/tests/usertools/26_usermod_locked_shadow/config.txt b/tests/usertools/useradd/64_useradd_locked_passwd/config.txt
similarity index 100%
rename from tests/tests/usertools/26_usermod_locked_shadow/config.txt
rename to tests/usertools/useradd/64_useradd_locked_passwd/config.txt
diff --git a/tests/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/default/useradd b/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/default/useradd
rename to tests/usertools/useradd/64_useradd_locked_passwd/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/group b/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/group
rename to tests/usertools/useradd/64_useradd_locked_passwd/config/etc/group
diff --git a/tests/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/gshadow b/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/gshadow
rename to tests/usertools/useradd/64_useradd_locked_passwd/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/63_useradd-s/config/etc/passwd b/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/63_useradd-s/config/etc/passwd
rename to tests/usertools/useradd/64_useradd_locked_passwd/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/63_useradd-s/config/etc/shadow b/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/63_useradd-s/config/etc/shadow
rename to tests/usertools/useradd/64_useradd_locked_passwd/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/64_useradd_locked_passwd/data/useradd.err b/tests/usertools/useradd/64_useradd_locked_passwd/data/useradd.err
similarity index 100%
rename from tests/tests/usertools/useradd/64_useradd_locked_passwd/data/useradd.err
rename to tests/usertools/useradd/64_useradd_locked_passwd/data/useradd.err
diff --git a/tests/tests/usertools/useradd/64_useradd_locked_passwd/useradd.test b/tests/usertools/useradd/64_useradd_locked_passwd/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/64_useradd_locked_passwd/useradd.test
rename to tests/usertools/useradd/64_useradd_locked_passwd/useradd.test
diff --git a/tests/tests/usertools/27_usermod-G_locked_gshadow/config.txt b/tests/usertools/useradd/65_useradd_locked_group/config.txt
similarity index 100%
rename from tests/tests/usertools/27_usermod-G_locked_gshadow/config.txt
rename to tests/usertools/useradd/65_useradd_locked_group/config.txt
diff --git a/tests/tests/usertools/useradd/65_useradd_locked_group/config/etc/default/useradd b/tests/usertools/useradd/65_useradd_locked_group/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/65_useradd_locked_group/config/etc/default/useradd
rename to tests/usertools/useradd/65_useradd_locked_group/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/65_useradd_locked_group/config/etc/group b/tests/usertools/useradd/65_useradd_locked_group/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/65_useradd_locked_group/config/etc/group
rename to tests/usertools/useradd/65_useradd_locked_group/config/etc/group
diff --git a/tests/tests/usertools/useradd/65_useradd_locked_group/config/etc/gshadow b/tests/usertools/useradd/65_useradd_locked_group/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/65_useradd_locked_group/config/etc/gshadow
rename to tests/usertools/useradd/65_useradd_locked_group/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/passwd b/tests/usertools/useradd/65_useradd_locked_group/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/passwd
rename to tests/usertools/useradd/65_useradd_locked_group/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/shadow b/tests/usertools/useradd/65_useradd_locked_group/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/shadow
rename to tests/usertools/useradd/65_useradd_locked_group/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/65_useradd_locked_group/data/useradd.err b/tests/usertools/useradd/65_useradd_locked_group/data/useradd.err
similarity index 100%
rename from tests/tests/usertools/useradd/65_useradd_locked_group/data/useradd.err
rename to tests/usertools/useradd/65_useradd_locked_group/data/useradd.err
diff --git a/tests/tests/usertools/useradd/65_useradd_locked_group/useradd.test b/tests/usertools/useradd/65_useradd_locked_group/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/65_useradd_locked_group/useradd.test
rename to tests/usertools/useradd/65_useradd_locked_group/useradd.test
diff --git a/tests/tests/usertools/56_userdel_locked_passwd/config.txt b/tests/usertools/useradd/66_useradd_locked_shadow/config.txt
similarity index 100%
rename from tests/tests/usertools/56_userdel_locked_passwd/config.txt
rename to tests/usertools/useradd/66_useradd_locked_shadow/config.txt
diff --git a/tests/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/default/useradd b/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/default/useradd
rename to tests/usertools/useradd/66_useradd_locked_shadow/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/group b/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/group
rename to tests/usertools/useradd/66_useradd_locked_shadow/config/etc/group
diff --git a/tests/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/gshadow b/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/gshadow
rename to tests/usertools/useradd/66_useradd_locked_shadow/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/65_useradd_locked_group/config/etc/passwd b/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/65_useradd_locked_group/config/etc/passwd
rename to tests/usertools/useradd/66_useradd_locked_shadow/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/65_useradd_locked_group/config/etc/shadow b/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/65_useradd_locked_group/config/etc/shadow
rename to tests/usertools/useradd/66_useradd_locked_shadow/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/66_useradd_locked_shadow/data/useradd.err b/tests/usertools/useradd/66_useradd_locked_shadow/data/useradd.err
similarity index 100%
rename from tests/tests/usertools/useradd/66_useradd_locked_shadow/data/useradd.err
rename to tests/usertools/useradd/66_useradd_locked_shadow/data/useradd.err
diff --git a/tests/tests/usertools/useradd/66_useradd_locked_shadow/useradd.test b/tests/usertools/useradd/66_useradd_locked_shadow/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/66_useradd_locked_shadow/useradd.test
rename to tests/usertools/useradd/66_useradd_locked_shadow/useradd.test
diff --git a/tests/tests/usertools/57_userdel_locked_group/config.txt b/tests/usertools/useradd/67_useradd_locked_gshadow/config.txt
similarity index 100%
rename from tests/tests/usertools/57_userdel_locked_group/config.txt
rename to tests/usertools/useradd/67_useradd_locked_gshadow/config.txt
diff --git a/tests/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/default/useradd b/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/default/useradd
rename to tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/group b/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/group
rename to tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/group
diff --git a/tests/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/gshadow b/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/gshadow
rename to tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/passwd b/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/passwd
rename to tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/shadow b/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/shadow
rename to tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/67_useradd_locked_gshadow/data/useradd.err b/tests/usertools/useradd/67_useradd_locked_gshadow/data/useradd.err
similarity index 100%
rename from tests/tests/usertools/useradd/67_useradd_locked_gshadow/data/useradd.err
rename to tests/usertools/useradd/67_useradd_locked_gshadow/data/useradd.err
diff --git a/tests/tests/usertools/useradd/67_useradd_locked_gshadow/useradd.test b/tests/usertools/useradd/67_useradd_locked_gshadow/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/67_useradd_locked_gshadow/useradd.test
rename to tests/usertools/useradd/67_useradd_locked_gshadow/useradd.test
diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/config.txt b/tests/usertools/useradd/68_useradd-s_empty/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/68_useradd-s_empty/config.txt
rename to tests/usertools/useradd/68_useradd-s_empty/config.txt
diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/default/useradd b/tests/usertools/useradd/68_useradd-s_empty/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/default/useradd
rename to tests/usertools/useradd/68_useradd-s_empty/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/63_useradd-s/config/etc/group b/tests/usertools/useradd/68_useradd-s_empty/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/63_useradd-s/config/etc/group
rename to tests/usertools/useradd/68_useradd-s_empty/config/etc/group
diff --git a/tests/tests/usertools/useradd/63_useradd-s/config/etc/gshadow b/tests/usertools/useradd/68_useradd-s_empty/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/63_useradd-s/config/etc/gshadow
rename to tests/usertools/useradd/68_useradd-s_empty/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/passwd b/tests/usertools/useradd/68_useradd-s_empty/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/passwd
rename to tests/usertools/useradd/68_useradd-s_empty/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/shadow b/tests/usertools/useradd/68_useradd-s_empty/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/shadow
rename to tests/usertools/useradd/68_useradd-s_empty/config/etc/shadow
diff --git a/tests/tests/usertools/useradd/61_useradd-K/data/group b/tests/usertools/useradd/68_useradd-s_empty/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/61_useradd-K/data/group
rename to tests/usertools/useradd/68_useradd-s_empty/data/group
diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/data/gshadow b/tests/usertools/useradd/68_useradd-s_empty/data/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/68_useradd-s_empty/data/gshadow
rename to tests/usertools/useradd/68_useradd-s_empty/data/gshadow
diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/data/passwd b/tests/usertools/useradd/68_useradd-s_empty/data/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/68_useradd-s_empty/data/passwd
rename to tests/usertools/useradd/68_useradd-s_empty/data/passwd
diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/data/shadow b/tests/usertools/useradd/68_useradd-s_empty/data/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/68_useradd-s_empty/data/shadow
rename to tests/usertools/useradd/68_useradd-s_empty/data/shadow
diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/useradd.test b/tests/usertools/useradd/68_useradd-s_empty/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/68_useradd-s_empty/useradd.test
rename to tests/usertools/useradd/68_useradd-s_empty/useradd.test
diff --git a/tests/tests/usertools/useradd/69_useradd_default_GROUPS_name/config.txt b/tests/usertools/useradd/69_useradd_default_GROUPS_name/config.txt
similarity index 100%
rename from tests/tests/usertools/useradd/69_useradd_default_GROUPS_name/config.txt
rename to tests/usertools/useradd/69_useradd_default_GROUPS_name/config.txt
diff --git a/tests/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/default/useradd b/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/default/useradd
rename to tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/group b/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/group
rename to tests/usertools/useradd/69_useradd_default_GROUPS_name/config/etc/group
diff --git a/tests/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/group b/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/group
similarity index 100%
rename from tests/tests/usertools/useradd/69_useradd_default_GROUPS_name/data/group
rename to tests/usertools/useradd/69_useradd_default_GROUPS_name/data/group
diff --git a/tests/tests/usertools/useradd/69_useradd_default_GROUPS_name/useradd.test b/tests/usertools/useradd/69_useradd_default_GROUPS_name/useradd.test
similarity index 100%
rename from tests/tests/usertools/useradd/69_useradd_default_GROUPS_name/useradd.test
rename to tests/usertools/useradd/69_useradd_default_GROUPS_name/useradd.test
diff --git a/tests/tests/usertools/userdel/01_userdel_usage/config.txt b/tests/usertools/userdel/01_userdel_usage/config.txt
similarity index 100%
rename from tests/tests/usertools/userdel/01_userdel_usage/config.txt
rename to tests/usertools/userdel/01_userdel_usage/config.txt
diff --git a/tests/tests/usertools/userdel/01_userdel_usage/config/etc/default/useradd b/tests/usertools/userdel/01_userdel_usage/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/userdel/01_userdel_usage/config/etc/default/useradd
rename to tests/usertools/userdel/01_userdel_usage/config/etc/default/useradd
diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/group b/tests/usertools/userdel/01_userdel_usage/config/etc/group
similarity index 100%
rename from tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/group
rename to tests/usertools/userdel/01_userdel_usage/config/etc/group
diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/gshadow b/tests/usertools/userdel/01_userdel_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/gshadow
rename to tests/usertools/userdel/01_userdel_usage/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/passwd b/tests/usertools/userdel/01_userdel_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/passwd
rename to tests/usertools/userdel/01_userdel_usage/config/etc/passwd
diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/shadow b/tests/usertools/userdel/01_userdel_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/shadow
rename to tests/usertools/userdel/01_userdel_usage/config/etc/shadow
diff --git a/tests/tests/usertools/userdel/01_userdel_usage/data/usage.out b/tests/usertools/userdel/01_userdel_usage/data/usage.out
similarity index 100%
rename from tests/tests/usertools/userdel/01_userdel_usage/data/usage.out
rename to tests/usertools/userdel/01_userdel_usage/data/usage.out
diff --git a/tests/tests/usertools/userdel/01_userdel_usage/userdel.test b/tests/usertools/userdel/01_userdel_usage/userdel.test
similarity index 100%
rename from tests/tests/usertools/userdel/01_userdel_usage/userdel.test
rename to tests/usertools/userdel/01_userdel_usage/userdel.test
diff --git a/tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config.txt b/tests/usertools/userdel/02_userdel_usage_invalid_option/config.txt
similarity index 100%
rename from tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config.txt
rename to tests/usertools/userdel/02_userdel_usage_invalid_option/config.txt
diff --git a/tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/default/useradd b/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/default/useradd
rename to tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/default/useradd
diff --git a/tests/tests/usertools/userdel/01_userdel_usage/config/etc/group b/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/group
similarity index 100%
rename from tests/tests/usertools/userdel/01_userdel_usage/config/etc/group
rename to tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/group
diff --git a/tests/tests/usertools/userdel/01_userdel_usage/config/etc/gshadow b/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/01_userdel_usage/config/etc/gshadow
rename to tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/gshadow
diff --git a/tests/tests/usertools/userdel/01_userdel_usage/config/etc/passwd b/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/01_userdel_usage/config/etc/passwd
rename to tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/passwd
diff --git a/tests/tests/usertools/userdel/01_userdel_usage/config/etc/shadow b/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/01_userdel_usage/config/etc/shadow
rename to tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/shadow
diff --git a/tests/tests/usertools/userdel/02_userdel_usage_invalid_option/data/usage.out b/tests/usertools/userdel/02_userdel_usage_invalid_option/data/usage.out
similarity index 100%
rename from tests/tests/usertools/userdel/02_userdel_usage_invalid_option/data/usage.out
rename to tests/usertools/userdel/02_userdel_usage_invalid_option/data/usage.out
diff --git a/tests/tests/usertools/userdel/02_userdel_usage_invalid_option/userdel.test b/tests/usertools/userdel/02_userdel_usage_invalid_option/userdel.test
similarity index 100%
rename from tests/tests/usertools/userdel/02_userdel_usage_invalid_option/userdel.test
rename to tests/usertools/userdel/02_userdel_usage_invalid_option/userdel.test
diff --git a/tests/tests/usertools/userdel/03_userdel_usage_no_users/config.txt b/tests/usertools/userdel/03_userdel_usage_no_users/config.txt
similarity index 100%
rename from tests/tests/usertools/userdel/03_userdel_usage_no_users/config.txt
rename to tests/usertools/userdel/03_userdel_usage_no_users/config.txt
diff --git a/tests/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/default/useradd b/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/default/useradd
rename to tests/usertools/userdel/03_userdel_usage_no_users/config/etc/default/useradd
diff --git a/tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/group b/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/group
similarity index 100%
rename from tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/group
rename to tests/usertools/userdel/03_userdel_usage_no_users/config/etc/group
diff --git a/tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/gshadow b/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/gshadow
rename to tests/usertools/userdel/03_userdel_usage_no_users/config/etc/gshadow
diff --git a/tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/passwd b/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/passwd
rename to tests/usertools/userdel/03_userdel_usage_no_users/config/etc/passwd
diff --git a/tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/shadow b/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/shadow
rename to tests/usertools/userdel/03_userdel_usage_no_users/config/etc/shadow
diff --git a/tests/tests/usertools/userdel/03_userdel_usage_no_users/data/usage.out b/tests/usertools/userdel/03_userdel_usage_no_users/data/usage.out
similarity index 100%
rename from tests/tests/usertools/userdel/03_userdel_usage_no_users/data/usage.out
rename to tests/usertools/userdel/03_userdel_usage_no_users/data/usage.out
diff --git a/tests/tests/usertools/userdel/03_userdel_usage_no_users/userdel.test b/tests/usertools/userdel/03_userdel_usage_no_users/userdel.test
similarity index 100%
rename from tests/tests/usertools/userdel/03_userdel_usage_no_users/userdel.test
rename to tests/usertools/userdel/03_userdel_usage_no_users/userdel.test
diff --git a/tests/tests/usertools/userdel/04_userdel_usage_2_users/config.txt b/tests/usertools/userdel/04_userdel_usage_2_users/config.txt
similarity index 100%
rename from tests/tests/usertools/userdel/04_userdel_usage_2_users/config.txt
rename to tests/usertools/userdel/04_userdel_usage_2_users/config.txt
diff --git a/tests/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/default/useradd b/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/default/useradd
rename to tests/usertools/userdel/04_userdel_usage_2_users/config/etc/default/useradd
diff --git a/tests/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/group b/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/group
similarity index 100%
rename from tests/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/group
rename to tests/usertools/userdel/04_userdel_usage_2_users/config/etc/group
diff --git a/tests/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/gshadow b/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/gshadow
rename to tests/usertools/userdel/04_userdel_usage_2_users/config/etc/gshadow
diff --git a/tests/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/passwd b/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/passwd
rename to tests/usertools/userdel/04_userdel_usage_2_users/config/etc/passwd
diff --git a/tests/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/shadow b/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/shadow
rename to tests/usertools/userdel/04_userdel_usage_2_users/config/etc/shadow
diff --git a/tests/tests/usertools/userdel/04_userdel_usage_2_users/data/usage.out b/tests/usertools/userdel/04_userdel_usage_2_users/data/usage.out
similarity index 100%
rename from tests/tests/usertools/userdel/04_userdel_usage_2_users/data/usage.out
rename to tests/usertools/userdel/04_userdel_usage_2_users/data/usage.out
diff --git a/tests/tests/usertools/userdel/04_userdel_usage_2_users/userdel.test b/tests/usertools/userdel/04_userdel_usage_2_users/userdel.test
similarity index 100%
rename from tests/tests/usertools/userdel/04_userdel_usage_2_users/userdel.test
rename to tests/usertools/userdel/04_userdel_usage_2_users/userdel.test
diff --git a/tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config.txt b/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config.txt
similarity index 100%
rename from tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config.txt
rename to tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config.txt
diff --git a/tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/default/useradd b/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/default/useradd
rename to tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/default/useradd
diff --git a/tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/group b/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/group
similarity index 100%
rename from tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/group
rename to tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/group
diff --git a/tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/gshadow b/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/gshadow
rename to tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/gshadow
diff --git a/tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/login.defs b/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/login.defs
similarity index 100%
rename from tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/login.defs
rename to tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/login.defs
diff --git a/tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/passwd b/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/passwd
rename to tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/passwd
diff --git a/tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/shadow b/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/shadow
rename to tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/config/etc/shadow
diff --git a/tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/group b/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/group
similarity index 100%
rename from tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/group
rename to tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/group
diff --git a/tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/gshadow b/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/gshadow
rename to tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/gshadow
diff --git a/tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/passwd b/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/passwd
rename to tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/passwd
diff --git a/tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/shadow b/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/shadow
rename to tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/data/shadow
diff --git a/tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/userdel.test b/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/userdel.test
similarity index 100%
rename from tests/tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/userdel.test
rename to tests/usertools/userdel/05_userdel_no_USERGROUPS_ENAB/userdel.test
diff --git a/tests/tests/usertools/userdel/06_userdel_no_usergroup/config.txt b/tests/usertools/userdel/06_userdel_no_usergroup/config.txt
similarity index 100%
rename from tests/tests/usertools/userdel/06_userdel_no_usergroup/config.txt
rename to tests/usertools/userdel/06_userdel_no_usergroup/config.txt
diff --git a/tests/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/default/useradd b/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/default/useradd
rename to tests/usertools/userdel/06_userdel_no_usergroup/config/etc/default/useradd
diff --git a/tests/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/group b/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/group
similarity index 100%
rename from tests/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/group
rename to tests/usertools/userdel/06_userdel_no_usergroup/config/etc/group
diff --git a/tests/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/gshadow b/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/gshadow
rename to tests/usertools/userdel/06_userdel_no_usergroup/config/etc/gshadow
diff --git a/tests/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/login.defs b/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/login.defs
similarity index 100%
rename from tests/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/login.defs
rename to tests/usertools/userdel/06_userdel_no_usergroup/config/etc/login.defs
diff --git a/tests/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/passwd b/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/passwd
rename to tests/usertools/userdel/06_userdel_no_usergroup/config/etc/passwd
diff --git a/tests/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/shadow b/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/06_userdel_no_usergroup/config/etc/shadow
rename to tests/usertools/userdel/06_userdel_no_usergroup/config/etc/shadow
diff --git a/tests/tests/usertools/userdel/06_userdel_no_usergroup/data/group b/tests/usertools/userdel/06_userdel_no_usergroup/data/group
similarity index 100%
rename from tests/tests/usertools/userdel/06_userdel_no_usergroup/data/group
rename to tests/usertools/userdel/06_userdel_no_usergroup/data/group
diff --git a/tests/tests/usertools/userdel/06_userdel_no_usergroup/data/gshadow b/tests/usertools/userdel/06_userdel_no_usergroup/data/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/06_userdel_no_usergroup/data/gshadow
rename to tests/usertools/userdel/06_userdel_no_usergroup/data/gshadow
diff --git a/tests/tests/usertools/userdel/06_userdel_no_usergroup/data/passwd b/tests/usertools/userdel/06_userdel_no_usergroup/data/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/06_userdel_no_usergroup/data/passwd
rename to tests/usertools/userdel/06_userdel_no_usergroup/data/passwd
diff --git a/tests/tests/usertools/userdel/06_userdel_no_usergroup/data/shadow b/tests/usertools/userdel/06_userdel_no_usergroup/data/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/06_userdel_no_usergroup/data/shadow
rename to tests/usertools/userdel/06_userdel_no_usergroup/data/shadow
diff --git a/tests/tests/usertools/userdel/06_userdel_no_usergroup/userdel.test b/tests/usertools/userdel/06_userdel_no_usergroup/userdel.test
similarity index 100%
rename from tests/tests/usertools/userdel/06_userdel_no_usergroup/userdel.test
rename to tests/usertools/userdel/06_userdel_no_usergroup/userdel.test
diff --git a/tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/config.txt b/tests/usertools/userdel/07_userdel_usergroup_not_primary/config.txt
similarity index 100%
rename from tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/config.txt
rename to tests/usertools/userdel/07_userdel_usergroup_not_primary/config.txt
diff --git a/tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/default/useradd b/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/default/useradd
rename to tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/default/useradd
diff --git a/tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/group b/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/group
similarity index 100%
rename from tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/group
rename to tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/group
diff --git a/tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/gshadow b/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/gshadow
rename to tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/gshadow
diff --git a/tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/login.defs b/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/login.defs
similarity index 100%
rename from tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/login.defs
rename to tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/login.defs
diff --git a/tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/passwd b/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/passwd
rename to tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/passwd
diff --git a/tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/shadow b/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/shadow
rename to tests/usertools/userdel/07_userdel_usergroup_not_primary/config/etc/shadow
diff --git a/tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/group b/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/group
similarity index 100%
rename from tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/group
rename to tests/usertools/userdel/07_userdel_usergroup_not_primary/data/group
diff --git a/tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/gshadow b/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/gshadow
rename to tests/usertools/userdel/07_userdel_usergroup_not_primary/data/gshadow
diff --git a/tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/passwd b/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/passwd
rename to tests/usertools/userdel/07_userdel_usergroup_not_primary/data/passwd
diff --git a/tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/shadow b/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/shadow
rename to tests/usertools/userdel/07_userdel_usergroup_not_primary/data/shadow
diff --git a/tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/userdel.out b/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/userdel.out
similarity index 100%
rename from tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/data/userdel.out
rename to tests/usertools/userdel/07_userdel_usergroup_not_primary/data/userdel.out
diff --git a/tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/userdel.test b/tests/usertools/userdel/07_userdel_usergroup_not_primary/userdel.test
similarity index 100%
rename from tests/tests/usertools/userdel/07_userdel_usergroup_not_primary/userdel.test
rename to tests/usertools/userdel/07_userdel_usergroup_not_primary/userdel.test
diff --git a/tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config.txt b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config.txt
similarity index 100%
rename from tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config.txt
rename to tests/usertools/userdel/08_userdel_usergroup_with_other_members/config.txt
diff --git a/tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/default/useradd b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/default/useradd
rename to tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/default/useradd
diff --git a/tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/group b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/group
similarity index 100%
rename from tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/group
rename to tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/group
diff --git a/tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/gshadow b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/gshadow
rename to tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/gshadow
diff --git a/tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/login.defs b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/login.defs
similarity index 100%
rename from tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/login.defs
rename to tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/login.defs
diff --git a/tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/passwd b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/passwd
rename to tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/passwd
diff --git a/tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/shadow b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/shadow
rename to tests/usertools/userdel/08_userdel_usergroup_with_other_members/config/etc/shadow
diff --git a/tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/group b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/group
similarity index 100%
rename from tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/group
rename to tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/group
diff --git a/tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/gshadow b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/gshadow
rename to tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/gshadow
diff --git a/tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/passwd b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/passwd
rename to tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/passwd
diff --git a/tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/shadow b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/shadow
rename to tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/shadow
diff --git a/tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/userdel.out b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/userdel.out
similarity index 100%
rename from tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/userdel.out
rename to tests/usertools/userdel/08_userdel_usergroup_with_other_members/data/userdel.out
diff --git a/tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/userdel.test b/tests/usertools/userdel/08_userdel_usergroup_with_other_members/userdel.test
similarity index 100%
rename from tests/tests/usertools/userdel/08_userdel_usergroup_with_other_members/userdel.test
rename to tests/usertools/userdel/08_userdel_usergroup_with_other_members/userdel.test
diff --git a/tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config.txt b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config.txt
similarity index 100%
rename from tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config.txt
rename to tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config.txt
diff --git a/tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/default/useradd b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/default/useradd
rename to tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/default/useradd
diff --git a/tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/group b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/group
similarity index 100%
rename from tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/group
rename to tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/group
diff --git a/tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/gshadow b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/gshadow
rename to tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/gshadow
diff --git a/tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/login.defs b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/login.defs
similarity index 100%
rename from tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/login.defs
rename to tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/login.defs
diff --git a/tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/passwd b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/passwd
rename to tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/passwd
diff --git a/tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/shadow b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/shadow
rename to tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/config/etc/shadow
diff --git a/tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/group b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/group
similarity index 100%
rename from tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/group
rename to tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/group
diff --git a/tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/gshadow b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/gshadow
rename to tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/gshadow
diff --git a/tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/passwd b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/passwd
rename to tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/passwd
diff --git a/tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/shadow b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/shadow
rename to tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/shadow
diff --git a/tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/userdel.out b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/userdel.out
similarity index 100%
rename from tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/userdel.out
rename to tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/data/userdel.out
diff --git a/tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/userdel.test b/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/userdel.test
similarity index 100%
rename from tests/tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/userdel.test
rename to tests/usertools/userdel/09_userdel_usergroup_no_other_members_in_gshadow/userdel.test
diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/config.txt b/tests/usertools/userdel/10_userdel_del_homedir_symlink/config.txt
similarity index 100%
rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/config.txt
rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/config.txt
diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/default/useradd b/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/default/useradd
rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/default/useradd
diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/group b/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/group
similarity index 100%
rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/group
rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/group
diff --git a/tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/gshadow b/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/config/etc/gshadow
rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/gshadow
diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/passwd b/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/passwd
rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/passwd
diff --git a/tests/tests/usertools/60_userdel_invalid_user/config/etc/shadow b/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/60_userdel_invalid_user/config/etc/shadow
rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/shadow
diff --git a/tests/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/group b/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/group
similarity index 100%
rename from tests/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/group
rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/data/group
diff --git a/tests/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/gshadow b/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/gshadow
rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/data/gshadow
diff --git a/tests/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/passwd b/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/passwd
rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/data/passwd
diff --git a/tests/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/shadow b/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/04_userdel_usage_2_users/config/etc/shadow
rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/data/shadow
diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/userdel.err b/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/userdel.err
similarity index 100%
rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/userdel.err
rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/data/userdel.err
diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/userdel.test b/tests/usertools/userdel/10_userdel_del_homedir_symlink/userdel.test
similarity index 100%
rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/userdel.test
rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/userdel.test
diff --git a/tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config.txt b/tests/usertools/usermod/01_usermod-p_no_shadow_file/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config.txt
rename to tests/usertools/usermod/01_usermod-p_no_shadow_file/config.txt
diff --git a/tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/default/useradd b/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/default/useradd
rename to tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/default/useradd
diff --git a/tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/group b/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/group
rename to tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/gshadow b/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/gshadow
rename to tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/passwd b/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/passwd
rename to tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/shadow b/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/shadow
rename to tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/data/passwd b/tests/usertools/usermod/01_usermod-p_no_shadow_file/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/data/passwd
rename to tests/usertools/usermod/01_usermod-p_no_shadow_file/data/passwd
diff --git a/tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/usermod.test b/tests/usertools/usermod/01_usermod-p_no_shadow_file/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/usermod.test
rename to tests/usertools/usermod/01_usermod-p_no_shadow_file/usermod.test
diff --git a/tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config.txt b/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config.txt
rename to tests/usertools/usermod/02_usermod-p_no_shadow_entry/config.txt
diff --git a/tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/default/useradd b/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/default/useradd
rename to tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/default/useradd
diff --git a/tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/group b/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/group
rename to tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/gshadow b/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/gshadow
rename to tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/passwd b/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/passwd
rename to tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/shadow b/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/shadow
rename to tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/data/passwd b/tests/usertools/usermod/02_usermod-p_no_shadow_entry/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/data/passwd
rename to tests/usertools/usermod/02_usermod-p_no_shadow_entry/data/passwd
diff --git a/tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/usermod.test b/tests/usertools/usermod/02_usermod-p_no_shadow_entry/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/usermod.test
rename to tests/usertools/usermod/02_usermod-p_no_shadow_entry/usermod.test
diff --git a/tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config.txt b/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config.txt
rename to tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config.txt
diff --git a/tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/default/useradd b/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/default/useradd
rename to tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/default/useradd
diff --git a/tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/group b/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/group
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/group
rename to tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/group
diff --git a/tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/gshadow b/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/gshadow
rename to tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/passwd b/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/passwd
rename to tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/shadow b/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/shadow
rename to tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/data/shadow b/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/data/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/data/shadow
rename to tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/data/shadow
diff --git a/tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/usermod.test b/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/usermod.test
rename to tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/usermod.test
diff --git a/tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config.txt b/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config.txt
rename to tests/usertools/usermod/04_usermod_lock_already_locked_password1/config.txt
diff --git a/tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/default/useradd b/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/default/useradd
rename to tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/group b/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/group
rename to tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/group
diff --git a/tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/gshadow b/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/gshadow
rename to tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/passwd b/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/passwd
rename to tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/shadow b/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/shadow
rename to tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/usermod.test b/tests/usertools/usermod/04_usermod_lock_already_locked_password1/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/usermod.test
rename to tests/usertools/usermod/04_usermod_lock_already_locked_password1/usermod.test
diff --git a/tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config.txt b/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config.txt
rename to tests/usertools/usermod/05_usermod_lock_already_locked_password2/config.txt
diff --git a/tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/default/useradd b/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/default/useradd
rename to tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/group b/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/group
rename to tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/group
diff --git a/tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/gshadow b/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/gshadow
rename to tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/passwd b/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/passwd
rename to tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/shadow b/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/shadow
rename to tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/data/shadow b/tests/usertools/usermod/05_usermod_lock_already_locked_password2/data/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/data/shadow
rename to tests/usertools/usermod/05_usermod_lock_already_locked_password2/data/shadow
diff --git a/tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/usermod.test b/tests/usertools/usermod/05_usermod_lock_already_locked_password2/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/usermod.test
rename to tests/usertools/usermod/05_usermod_lock_already_locked_password2/usermod.test
diff --git a/tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config.txt b/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config.txt
rename to tests/usertools/usermod/06_usermod_lock_already_locked_password3/config.txt
diff --git a/tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/default/useradd b/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/default/useradd
rename to tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/group b/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/group
rename to tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/group
diff --git a/tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/gshadow b/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/gshadow
rename to tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/passwd b/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/passwd
rename to tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/shadow b/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/config/etc/shadow
rename to tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/usermod.test b/tests/usertools/usermod/06_usermod_lock_already_locked_password3/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/usermod.test
rename to tests/usertools/usermod/06_usermod_lock_already_locked_password3/usermod.test
diff --git a/tests/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config.txt b/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config.txt
rename to tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config.txt
diff --git a/tests/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/default/useradd b/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/default/useradd
rename to tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/group b/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/group
rename to tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/group
diff --git a/tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/gshadow b/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/gshadow
rename to tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/passwd b/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/passwd
rename to tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/shadow b/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/shadow
rename to tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/usermod.test b/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/usermod.test
rename to tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/usermod.test
diff --git a/tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config.txt b/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config.txt
rename to tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config.txt
diff --git a/tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/default/useradd b/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/default/useradd
rename to tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/group b/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/group
rename to tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/group
diff --git a/tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/gshadow b/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/gshadow
rename to tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/gshadow
diff --git a/tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/passwd b/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/passwd
rename to tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/shadow b/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/shadow
rename to tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/data/shadow b/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/data/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/data/shadow
rename to tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/data/shadow
diff --git a/tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/usermod.test b/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/usermod.test
rename to tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/usermod.test
diff --git a/tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config.txt b/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config.txt
rename to tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config.txt
diff --git a/tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/default/useradd b/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/default/useradd
rename to tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/group b/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/group
rename to tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/group
diff --git a/tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/gshadow b/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/gshadow
rename to tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/passwd b/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/passwd
rename to tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/shadow b/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/shadow
rename to tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/usermod.test b/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/usermod.test
rename to tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/usermod.test
diff --git a/tests/tests/usertools/usermod/10_usermod_usage/config.txt b/tests/usertools/usermod/10_usermod_usage/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/10_usermod_usage/config.txt
rename to tests/usertools/usermod/10_usermod_usage/config.txt
diff --git a/tests/tests/usertools/usermod/10_usermod_usage/config/etc/default/useradd b/tests/usertools/usermod/10_usermod_usage/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/10_usermod_usage/config/etc/default/useradd
rename to tests/usertools/usermod/10_usermod_usage/config/etc/default/useradd
diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/group b/tests/usertools/usermod/10_usermod_usage/config/etc/group
similarity index 100%
rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/group
rename to tests/usertools/usermod/10_usermod_usage/config/etc/group
diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/gshadow b/tests/usertools/usermod/10_usermod_usage/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/gshadow
rename to tests/usertools/usermod/10_usermod_usage/config/etc/gshadow
diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/passwd b/tests/usertools/usermod/10_usermod_usage/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/passwd
rename to tests/usertools/usermod/10_usermod_usage/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/shadow b/tests/usertools/usermod/10_usermod_usage/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/shadow
rename to tests/usertools/usermod/10_usermod_usage/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/10_usermod_usage/data/usage.out b/tests/usertools/usermod/10_usermod_usage/data/usage.out
similarity index 100%
rename from tests/tests/usertools/usermod/10_usermod_usage/data/usage.out
rename to tests/usertools/usermod/10_usermod_usage/data/usage.out
diff --git a/tests/tests/usertools/usermod/10_usermod_usage/usermod.test b/tests/usertools/usermod/10_usermod_usage/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/10_usermod_usage/usermod.test
rename to tests/usertools/usermod/10_usermod_usage/usermod.test
diff --git a/tests/tests/usertools/usermod/11_usermod_usage_bad_option/config.txt b/tests/usertools/usermod/11_usermod_usage_bad_option/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/11_usermod_usage_bad_option/config.txt
rename to tests/usertools/usermod/11_usermod_usage_bad_option/config.txt
diff --git a/tests/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/default/useradd b/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/default/useradd
rename to tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/10_usermod_usage/config/etc/group b/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/10_usermod_usage/config/etc/group
rename to tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/group
diff --git a/tests/tests/usertools/usermod/10_usermod_usage/config/etc/gshadow b/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/10_usermod_usage/config/etc/gshadow
rename to tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/10_usermod_usage/config/etc/passwd b/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/10_usermod_usage/config/etc/passwd
rename to tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/10_usermod_usage/config/etc/shadow b/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/10_usermod_usage/config/etc/shadow
rename to tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/11_usermod_usage_bad_option/data/usage.out b/tests/usertools/usermod/11_usermod_usage_bad_option/data/usage.out
similarity index 100%
rename from tests/tests/usertools/usermod/11_usermod_usage_bad_option/data/usage.out
rename to tests/usertools/usermod/11_usermod_usage_bad_option/data/usage.out
diff --git a/tests/tests/usertools/usermod/11_usermod_usage_bad_option/usermod.test b/tests/usertools/usermod/11_usermod_usage_bad_option/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/11_usermod_usage_bad_option/usermod.test
rename to tests/usertools/usermod/11_usermod_usage_bad_option/usermod.test
diff --git a/tests/tests/usertools/usermod/12_usermod_usage_bad-f/config.txt b/tests/usertools/usermod/12_usermod_usage_bad-f/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/12_usermod_usage_bad-f/config.txt
rename to tests/usertools/usermod/12_usermod_usage_bad-f/config.txt
diff --git a/tests/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/default/useradd b/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/default/useradd
rename to tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/group b/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/group
rename to tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/group
diff --git a/tests/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/gshadow b/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/gshadow
rename to tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/passwd b/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/passwd
rename to tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/shadow b/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/shadow
rename to tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/12_usermod_usage_bad-f/data/usermod.err b/tests/usertools/usermod/12_usermod_usage_bad-f/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/usermod/12_usermod_usage_bad-f/data/usermod.err
rename to tests/usertools/usermod/12_usermod_usage_bad-f/data/usermod.err
diff --git a/tests/tests/usertools/usermod/12_usermod_usage_bad-f/usermod.test b/tests/usertools/usermod/12_usermod_usage_bad-f/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/12_usermod_usage_bad-f/usermod.test
rename to tests/usertools/usermod/12_usermod_usage_bad-f/usermod.test
diff --git a/tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config.txt b/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config.txt
rename to tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config.txt
diff --git a/tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/default/useradd b/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/default/useradd
rename to tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/group b/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/group
rename to tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/group
diff --git a/tests/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/gshadow b/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/gshadow
rename to tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/passwd b/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/passwd
rename to tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/shadow b/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/shadow
rename to tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/data/usermod.err b/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/data/usermod.err
rename to tests/usertools/usermod/13_usermod_usage_bad-f_negativ/data/usermod.err
diff --git a/tests/tests/usertools/usermod/13_usermod_usage_bad-f_negative/usermod.test b/tests/usertools/usermod/13_usermod_usage_bad-f_negative/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/13_usermod_usage_bad-f_negative/usermod.test
rename to tests/usertools/usermod/13_usermod_usage_bad-f_negative/usermod.test
diff --git a/tests/tests/usertools/usermod/14_usermod_usage_no_options/config.txt b/tests/usertools/usermod/14_usermod_usage_no_options/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/14_usermod_usage_no_options/config.txt
rename to tests/usertools/usermod/14_usermod_usage_no_options/config.txt
diff --git a/tests/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/default/useradd b/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/default/useradd
rename to tests/usertools/usermod/14_usermod_usage_no_options/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/group b/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/group
rename to tests/usertools/usermod/14_usermod_usage_no_options/config/etc/group
diff --git a/tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/gshadow b/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/gshadow
rename to tests/usertools/usermod/14_usermod_usage_no_options/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/passwd b/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/passwd
rename to tests/usertools/usermod/14_usermod_usage_no_options/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/shadow b/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/shadow
rename to tests/usertools/usermod/14_usermod_usage_no_options/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/14_usermod_usage_no_options/data/usage.out b/tests/usertools/usermod/14_usermod_usage_no_options/data/usage.out
similarity index 100%
rename from tests/tests/usertools/usermod/14_usermod_usage_no_options/data/usage.out
rename to tests/usertools/usermod/14_usermod_usage_no_options/data/usage.out
diff --git a/tests/tests/usertools/usermod/14_usermod_usage_no_options/usermod.test b/tests/usertools/usermod/14_usermod_usage_no_options/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/14_usermod_usage_no_options/usermod.test
rename to tests/usertools/usermod/14_usermod_usage_no_options/usermod.test
diff --git a/tests/tests/usertools/usermod/15_usermod_usage_no_user/config.txt b/tests/usertools/usermod/15_usermod_usage_no_user/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/15_usermod_usage_no_user/config.txt
rename to tests/usertools/usermod/15_usermod_usage_no_user/config.txt
diff --git a/tests/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/default/useradd b/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/default/useradd
rename to tests/usertools/usermod/15_usermod_usage_no_user/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/group b/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/group
rename to tests/usertools/usermod/15_usermod_usage_no_user/config/etc/group
diff --git a/tests/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/gshadow b/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/gshadow
rename to tests/usertools/usermod/15_usermod_usage_no_user/config/etc/gshadow
diff --git a/tests/tests/usertools/useradd/51_useradd_already_exist/config/etc/passwd b/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/useradd/51_useradd_already_exist/config/etc/passwd
rename to tests/usertools/usermod/15_usermod_usage_no_user/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/shadow b/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/shadow
rename to tests/usertools/usermod/15_usermod_usage_no_user/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/15_usermod_usage_no_user/data/usage.out b/tests/usertools/usermod/15_usermod_usage_no_user/data/usage.out
similarity index 100%
rename from tests/tests/usertools/usermod/15_usermod_usage_no_user/data/usage.out
rename to tests/usertools/usermod/15_usermod_usage_no_user/data/usage.out
diff --git a/tests/tests/usertools/usermod/15_usermod_usage_no_user/usermod.test b/tests/usertools/usermod/15_usermod_usage_no_user/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/15_usermod_usage_no_user/usermod.test
rename to tests/usertools/usermod/15_usermod_usage_no_user/usermod.test
diff --git a/tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config.txt b/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config.txt
rename to tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config.txt
diff --git a/tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/default/useradd b/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/default/useradd
rename to tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/group b/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/group
rename to tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/group
diff --git a/tests/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/gshadow b/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/gshadow
rename to tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/passwd b/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/passwd
rename to tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/shadow b/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/shadow
rename to tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/data/usage.out b/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/data/usage.out
similarity index 100%
rename from tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/data/usage.out
rename to tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/data/usage.out
diff --git a/tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/usermod.test b/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/usermod.test
rename to tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/usermod.test
diff --git a/tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config.txt b/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config.txt
rename to tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config.txt
diff --git a/tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/default/useradd b/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/default/useradd
rename to tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/group b/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/group
rename to tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/group
diff --git a/tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/gshadow b/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/gshadow
rename to tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/passwd b/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/passwd
rename to tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/shadow b/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/shadow
rename to tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/data/usage.out b/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/data/usage.out
similarity index 100%
rename from tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/data/usage.out
rename to tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/data/usage.out
diff --git a/tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/usermod.test b/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/usermod.test
rename to tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/usermod.test
diff --git a/tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config.txt b/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config.txt
rename to tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config.txt
diff --git a/tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/default/useradd b/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/default/useradd
rename to tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/group b/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/group
rename to tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/group
diff --git a/tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/gshadow b/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/gshadow
rename to tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/passwd b/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/16_usermod_usage_-e_no_shadow_file/config/etc/passwd
rename to tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/shadow b/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/shadow
rename to tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/data/usage.out b/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/data/usage.out
similarity index 100%
rename from tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/data/usage.out
rename to tests/usertools/usermod/18_usermod_usage-L-p_exclusive/data/usage.out
diff --git a/tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/usermod.test b/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/usermod.test
rename to tests/usertools/usermod/18_usermod_usage-L-p_exclusive/usermod.test
diff --git a/tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config.txt b/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config.txt
rename to tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config.txt
diff --git a/tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/default/useradd b/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/default/useradd
rename to tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/group b/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/group
rename to tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/group
diff --git a/tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/gshadow b/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/gshadow
rename to tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/passwd b/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/17_usermod_usage_-f_no_shadow_file/config/etc/passwd
rename to tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/shadow b/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/shadow
rename to tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/data/usage.out b/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/data/usage.out
similarity index 100%
rename from tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/data/usage.out
rename to tests/usertools/usermod/19_usermod_usage-L-U_exclusive/data/usage.out
diff --git a/tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/usermod.test b/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/usermod.test
rename to tests/usertools/usermod/19_usermod_usage-L-U_exclusive/usermod.test
diff --git a/tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config.txt b/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config.txt
rename to tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config.txt
diff --git a/tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/default/useradd b/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/default/useradd
rename to tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/group b/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/group
rename to tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/group
diff --git a/tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/gshadow b/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/gshadow
rename to tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/passwd b/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/passwd
rename to tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/shadow b/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/shadow
rename to tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/data/usage.out b/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/data/usage.out
similarity index 100%
rename from tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/data/usage.out
rename to tests/usertools/usermod/20_usermod_usage-p-U_exclusive/data/usage.out
diff --git a/tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/usermod.test b/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/usermod.test
rename to tests/usertools/usermod/20_usermod_usage-p-U_exclusive/usermod.test
diff --git a/tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config.txt b/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config.txt
rename to tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config.txt
diff --git a/tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/default/useradd b/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/default/useradd
rename to tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/group b/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/group
rename to tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/group
diff --git a/tests/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/gshadow b/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/07_usermod_unlock_already_unlocked_password1/config/etc/gshadow
rename to tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/passwd b/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/passwd
rename to tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/shadow b/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/shadow
rename to tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/data/group b/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/data/group
similarity index 100%
rename from tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/data/group
rename to tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/data/group
diff --git a/tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/data/passwd b/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/data/passwd
rename to tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/data/passwd
diff --git a/tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/data/shadow b/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/data/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/data/shadow
rename to tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/data/shadow
diff --git a/tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/usermod.test b/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/usermod.test
rename to tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/usermod.test
diff --git a/tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config.txt b/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config.txt
rename to tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config.txt
diff --git a/tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/default/useradd b/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/default/useradd
rename to tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/group b/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/group
rename to tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/group
diff --git a/tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/gshadow b/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/gshadow
rename to tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/passwd b/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/config/etc/passwd
rename to tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/shadow b/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/shadow
rename to tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/data/usage.out b/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/data/usage.out
similarity index 100%
rename from tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/data/usage.out
rename to tests/usertools/usermod/22_usermod_usage_rename_invalid_username/data/usage.out
diff --git a/tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/usermod.test b/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/usermod.test
rename to tests/usertools/usermod/22_usermod_usage_rename_invalid_username/usermod.test
diff --git a/tests/tests/usertools/usermod/23_usermod-e_date/config.txt b/tests/usertools/usermod/23_usermod-e_date/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/23_usermod-e_date/config.txt
rename to tests/usertools/usermod/23_usermod-e_date/config.txt
diff --git a/tests/tests/usertools/usermod/23_usermod-e_date/config/etc/default/useradd b/tests/usertools/usermod/23_usermod-e_date/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/23_usermod-e_date/config/etc/default/useradd
rename to tests/usertools/usermod/23_usermod-e_date/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/group b/tests/usertools/usermod/23_usermod-e_date/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/group
rename to tests/usertools/usermod/23_usermod-e_date/config/etc/group
diff --git a/tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/gshadow b/tests/usertools/usermod/23_usermod-e_date/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/gshadow
rename to tests/usertools/usermod/23_usermod-e_date/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/23_usermod-e_date/config/etc/passwd b/tests/usertools/usermod/23_usermod-e_date/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/23_usermod-e_date/config/etc/passwd
rename to tests/usertools/usermod/23_usermod-e_date/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/23_usermod-e_date/config/etc/shadow b/tests/usertools/usermod/23_usermod-e_date/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/23_usermod-e_date/config/etc/shadow
rename to tests/usertools/usermod/23_usermod-e_date/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/23_usermod-e_date/data/shadow b/tests/usertools/usermod/23_usermod-e_date/data/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/23_usermod-e_date/data/shadow
rename to tests/usertools/usermod/23_usermod-e_date/data/shadow
diff --git a/tests/tests/usertools/usermod/23_usermod-e_date/usermod.test b/tests/usertools/usermod/23_usermod-e_date/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/23_usermod-e_date/usermod.test
rename to tests/usertools/usermod/23_usermod-e_date/usermod.test
diff --git a/tests/tests/usertools/usermod/24_usermod-e_date/config.txt b/tests/usertools/usermod/24_usermod-e_date/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/24_usermod-e_date/config.txt
rename to tests/usertools/usermod/24_usermod-e_date/config.txt
diff --git a/tests/tests/usertools/usermod/24_usermod-e_date/config/etc/default/useradd b/tests/usertools/usermod/24_usermod-e_date/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/24_usermod-e_date/config/etc/default/useradd
rename to tests/usertools/usermod/24_usermod-e_date/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/group b/tests/usertools/usermod/24_usermod-e_date/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/group
rename to tests/usertools/usermod/24_usermod-e_date/config/etc/group
diff --git a/tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/gshadow b/tests/usertools/usermod/24_usermod-e_date/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/gshadow
rename to tests/usertools/usermod/24_usermod-e_date/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/24_usermod-e_date/config/etc/passwd b/tests/usertools/usermod/24_usermod-e_date/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/24_usermod-e_date/config/etc/passwd
rename to tests/usertools/usermod/24_usermod-e_date/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/24_usermod-e_date/config/etc/shadow b/tests/usertools/usermod/24_usermod-e_date/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/24_usermod-e_date/config/etc/shadow
rename to tests/usertools/usermod/24_usermod-e_date/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/24_usermod-e_date/data/shadow b/tests/usertools/usermod/24_usermod-e_date/data/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/24_usermod-e_date/data/shadow
rename to tests/usertools/usermod/24_usermod-e_date/data/shadow
diff --git a/tests/tests/usertools/usermod/24_usermod-e_date/usermod.test b/tests/usertools/usermod/24_usermod-e_date/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/24_usermod-e_date/usermod.test
rename to tests/usertools/usermod/24_usermod-e_date/usermod.test
diff --git a/tests/tests/usertools/usermod/25_usermod-e_empty_arg/config.txt b/tests/usertools/usermod/25_usermod-e_empty_arg/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/25_usermod-e_empty_arg/config.txt
rename to tests/usertools/usermod/25_usermod-e_empty_arg/config.txt
diff --git a/tests/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/default/useradd b/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/default/useradd
rename to tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/group b/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/group
rename to tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/group
diff --git a/tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/gshadow b/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/gshadow
rename to tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/passwd b/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/passwd
rename to tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/shadow b/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/shadow
rename to tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/25_usermod-e_empty_arg/data/shadow b/tests/usertools/usermod/25_usermod-e_empty_arg/data/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/25_usermod-e_empty_arg/data/shadow
rename to tests/usertools/usermod/25_usermod-e_empty_arg/data/shadow
diff --git a/tests/tests/usertools/usermod/25_usermod-e_empty_arg/usermod.test b/tests/usertools/usermod/25_usermod-e_empty_arg/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/25_usermod-e_empty_arg/usermod.test
rename to tests/usertools/usermod/25_usermod-e_empty_arg/usermod.test
diff --git a/tests/tests/usertools/usermod/26_usermod-e-1/config.txt b/tests/usertools/usermod/26_usermod-e-1/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/26_usermod-e-1/config.txt
rename to tests/usertools/usermod/26_usermod-e-1/config.txt
diff --git a/tests/tests/usertools/usermod/26_usermod-e-1/config/etc/default/useradd b/tests/usertools/usermod/26_usermod-e-1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/26_usermod-e-1/config/etc/default/useradd
rename to tests/usertools/usermod/26_usermod-e-1/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/23_usermod-e_date/config/etc/group b/tests/usertools/usermod/26_usermod-e-1/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/23_usermod-e_date/config/etc/group
rename to tests/usertools/usermod/26_usermod-e-1/config/etc/group
diff --git a/tests/tests/usertools/usermod/23_usermod-e_date/config/etc/gshadow b/tests/usertools/usermod/26_usermod-e-1/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/23_usermod-e_date/config/etc/gshadow
rename to tests/usertools/usermod/26_usermod-e-1/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/26_usermod-e-1/config/etc/passwd b/tests/usertools/usermod/26_usermod-e-1/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/26_usermod-e-1/config/etc/passwd
rename to tests/usertools/usermod/26_usermod-e-1/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/26_usermod-e-1/config/etc/shadow b/tests/usertools/usermod/26_usermod-e-1/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/26_usermod-e-1/config/etc/shadow
rename to tests/usertools/usermod/26_usermod-e-1/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/26_usermod-e-1/data/shadow b/tests/usertools/usermod/26_usermod-e-1/data/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/26_usermod-e-1/data/shadow
rename to tests/usertools/usermod/26_usermod-e-1/data/shadow
diff --git a/tests/tests/usertools/usermod/26_usermod-e-1/usermod.test b/tests/usertools/usermod/26_usermod-e-1/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/26_usermod-e-1/usermod.test
rename to tests/usertools/usermod/26_usermod-e-1/usermod.test
diff --git a/tests/tests/usertools/usermod/27_usermod-e_invalid1/config.txt b/tests/usertools/usermod/27_usermod-e_invalid1/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/27_usermod-e_invalid1/config.txt
rename to tests/usertools/usermod/27_usermod-e_invalid1/config.txt
diff --git a/tests/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/default/useradd b/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/default/useradd
rename to tests/usertools/usermod/27_usermod-e_invalid1/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/24_usermod-e_date/config/etc/group b/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/24_usermod-e_date/config/etc/group
rename to tests/usertools/usermod/27_usermod-e_invalid1/config/etc/group
diff --git a/tests/tests/usertools/usermod/24_usermod-e_date/config/etc/gshadow b/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/24_usermod-e_date/config/etc/gshadow
rename to tests/usertools/usermod/27_usermod-e_invalid1/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/passwd b/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/passwd
rename to tests/usertools/usermod/27_usermod-e_invalid1/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/shadow b/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/shadow
rename to tests/usertools/usermod/27_usermod-e_invalid1/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/27_usermod-e_invalid1/data/usermod.err b/tests/usertools/usermod/27_usermod-e_invalid1/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/usermod/27_usermod-e_invalid1/data/usermod.err
rename to tests/usertools/usermod/27_usermod-e_invalid1/data/usermod.err
diff --git a/tests/tests/usertools/usermod/27_usermod-e_invalid1/usermod.test b/tests/usertools/usermod/27_usermod-e_invalid1/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/27_usermod-e_invalid1/usermod.test
rename to tests/usertools/usermod/27_usermod-e_invalid1/usermod.test
diff --git a/tests/tests/usertools/usermod/28_usermod-e_invalid2/config.txt b/tests/usertools/usermod/28_usermod-e_invalid2/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/28_usermod-e_invalid2/config.txt
rename to tests/usertools/usermod/28_usermod-e_invalid2/config.txt
diff --git a/tests/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/default/useradd b/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/default/useradd
rename to tests/usertools/usermod/28_usermod-e_invalid2/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/group b/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/group
rename to tests/usertools/usermod/28_usermod-e_invalid2/config/etc/group
diff --git a/tests/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/gshadow b/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/gshadow
rename to tests/usertools/usermod/28_usermod-e_invalid2/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/passwd b/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/passwd
rename to tests/usertools/usermod/28_usermod-e_invalid2/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/shadow b/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/shadow
rename to tests/usertools/usermod/28_usermod-e_invalid2/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/28_usermod-e_invalid2/data/usermod.err b/tests/usertools/usermod/28_usermod-e_invalid2/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/usermod/28_usermod-e_invalid2/data/usermod.err
rename to tests/usertools/usermod/28_usermod-e_invalid2/data/usermod.err
diff --git a/tests/tests/usertools/usermod/28_usermod-e_invalid2/usermod.test b/tests/usertools/usermod/28_usermod-e_invalid2/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/28_usermod-e_invalid2/usermod.test
rename to tests/usertools/usermod/28_usermod-e_invalid2/usermod.test
diff --git a/tests/tests/usertools/usermod/29_usermod_no_changes/config.txt b/tests/usertools/usermod/29_usermod_no_changes/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/29_usermod_no_changes/config.txt
rename to tests/usertools/usermod/29_usermod_no_changes/config.txt
diff --git a/tests/tests/usertools/usermod/29_usermod_no_changes/config/etc/default/useradd b/tests/usertools/usermod/29_usermod_no_changes/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/29_usermod_no_changes/config/etc/default/useradd
rename to tests/usertools/usermod/29_usermod_no_changes/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/group b/tests/usertools/usermod/29_usermod_no_changes/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/group
rename to tests/usertools/usermod/29_usermod_no_changes/config/etc/group
diff --git a/tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/gshadow b/tests/usertools/usermod/29_usermod_no_changes/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/gshadow
rename to tests/usertools/usermod/29_usermod_no_changes/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/29_usermod_no_changes/config/etc/passwd b/tests/usertools/usermod/29_usermod_no_changes/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/29_usermod_no_changes/config/etc/passwd
rename to tests/usertools/usermod/29_usermod_no_changes/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/29_usermod_no_changes/config/etc/shadow b/tests/usertools/usermod/29_usermod_no_changes/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/29_usermod_no_changes/config/etc/shadow
rename to tests/usertools/usermod/29_usermod_no_changes/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/29_usermod_no_changes/data/usermod.err b/tests/usertools/usermod/29_usermod_no_changes/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/usermod/29_usermod_no_changes/data/usermod.err
rename to tests/usertools/usermod/29_usermod_no_changes/data/usermod.err
diff --git a/tests/tests/usertools/usermod/29_usermod_no_changes/usermod.test b/tests/usertools/usermod/29_usermod_no_changes/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/29_usermod_no_changes/usermod.test
rename to tests/usertools/usermod/29_usermod_no_changes/usermod.test
diff --git a/tests/tests/usertools/usermod/30_usermod_usage-a_without-G/config.txt b/tests/usertools/usermod/30_usermod_usage-a_without-G/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/30_usermod_usage-a_without-G/config.txt
rename to tests/usertools/usermod/30_usermod_usage-a_without-G/config.txt
diff --git a/tests/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/default/useradd b/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/default/useradd
rename to tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/29_usermod_no_changes/config/etc/group b/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/29_usermod_no_changes/config/etc/group
rename to tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/group
diff --git a/tests/tests/usertools/usermod/29_usermod_no_changes/config/etc/gshadow b/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/29_usermod_no_changes/config/etc/gshadow
rename to tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/passwd b/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/config/etc/passwd
rename to tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/shadow b/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/shadow
rename to tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/30_usermod_usage-a_without-G/data/usage.out b/tests/usertools/usermod/30_usermod_usage-a_without-G/data/usage.out
similarity index 100%
rename from tests/tests/usertools/usermod/30_usermod_usage-a_without-G/data/usage.out
rename to tests/usertools/usermod/30_usermod_usage-a_without-G/data/usage.out
diff --git a/tests/tests/usertools/usermod/30_usermod_usage-a_without-G/usermod.test b/tests/usertools/usermod/30_usermod_usage-a_without-G/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/30_usermod_usage-a_without-G/usermod.test
rename to tests/usertools/usermod/30_usermod_usage-a_without-G/usermod.test
diff --git a/tests/tests/usertools/usermod/31_usermod_usage-o_without-u/config.txt b/tests/usertools/usermod/31_usermod_usage-o_without-u/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/31_usermod_usage-o_without-u/config.txt
rename to tests/usertools/usermod/31_usermod_usage-o_without-u/config.txt
diff --git a/tests/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/default/useradd b/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/default/useradd
rename to tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/group b/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/group
rename to tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/group
diff --git a/tests/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/gshadow b/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/gshadow
rename to tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/passwd b/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/passwd
rename to tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/shadow b/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/shadow
rename to tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/31_usermod_usage-o_without-u/data/usage.out b/tests/usertools/usermod/31_usermod_usage-o_without-u/data/usage.out
similarity index 100%
rename from tests/tests/usertools/usermod/31_usermod_usage-o_without-u/data/usage.out
rename to tests/usertools/usermod/31_usermod_usage-o_without-u/data/usage.out
diff --git a/tests/tests/usertools/usermod/31_usermod_usage-o_without-u/usermod.test b/tests/usertools/usermod/31_usermod_usage-o_without-u/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/31_usermod_usage-o_without-u/usermod.test
rename to tests/usertools/usermod/31_usermod_usage-o_without-u/usermod.test
diff --git a/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config.txt b/tests/usertools/usermod/32_usermod_usage-m_without-d/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config.txt
rename to tests/usertools/usermod/32_usermod_usage-m_without-d/config.txt
diff --git a/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/default/useradd b/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/default/useradd
rename to tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/group b/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/group
rename to tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/group
diff --git a/tests/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/gshadow b/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/gshadow
rename to tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/passwd b/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/passwd
rename to tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/shadow b/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/shadow
rename to tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/data/usage.out b/tests/usertools/usermod/32_usermod_usage-m_without-d/data/usage.out
similarity index 100%
rename from tests/tests/usertools/usermod/32_usermod_usage-m_without-d/data/usage.out
rename to tests/usertools/usermod/32_usermod_usage-m_without-d/data/usage.out
diff --git a/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/usermod.test b/tests/usertools/usermod/32_usermod_usage-m_without-d/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/32_usermod_usage-m_without-d/usermod.test
rename to tests/usertools/usermod/32_usermod_usage-m_without-d/usermod.test
diff --git a/tests/tests/usertools/usermod/33_usermod_change_shell/config.txt b/tests/usertools/usermod/33_usermod_change_shell/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/33_usermod_change_shell/config.txt
rename to tests/usertools/usermod/33_usermod_change_shell/config.txt
diff --git a/tests/tests/usertools/usermod/33_usermod_change_shell/config/etc/default/useradd b/tests/usertools/usermod/33_usermod_change_shell/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/33_usermod_change_shell/config/etc/default/useradd
rename to tests/usertools/usermod/33_usermod_change_shell/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/26_usermod-e-1/config/etc/group b/tests/usertools/usermod/33_usermod_change_shell/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/26_usermod-e-1/config/etc/group
rename to tests/usertools/usermod/33_usermod_change_shell/config/etc/group
diff --git a/tests/tests/usertools/usermod/26_usermod-e-1/config/etc/gshadow b/tests/usertools/usermod/33_usermod_change_shell/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/26_usermod-e-1/config/etc/gshadow
rename to tests/usertools/usermod/33_usermod_change_shell/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/33_usermod_change_shell/config/etc/passwd b/tests/usertools/usermod/33_usermod_change_shell/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/33_usermod_change_shell/config/etc/passwd
rename to tests/usertools/usermod/33_usermod_change_shell/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/33_usermod_change_shell/config/etc/shadow b/tests/usertools/usermod/33_usermod_change_shell/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/33_usermod_change_shell/config/etc/shadow
rename to tests/usertools/usermod/33_usermod_change_shell/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/33_usermod_change_shell/data/passwd b/tests/usertools/usermod/33_usermod_change_shell/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/33_usermod_change_shell/data/passwd
rename to tests/usertools/usermod/33_usermod_change_shell/data/passwd
diff --git a/tests/tests/usertools/usermod/33_usermod_change_shell/usermod.test b/tests/usertools/usermod/33_usermod_change_shell/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/33_usermod_change_shell/usermod.test
rename to tests/usertools/usermod/33_usermod_change_shell/usermod.test
diff --git a/tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config.txt b/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config.txt
rename to tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config.txt
diff --git a/tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/default/useradd b/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/default/useradd
rename to tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/group b/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/group
rename to tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/group
diff --git a/tests/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/gshadow b/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/gshadow
rename to tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/passwd b/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/passwd
rename to tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/shadow b/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/shadow
rename to tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/data/shadow b/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/data/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/data/shadow
rename to tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/data/shadow
diff --git a/tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/usermod.test b/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/usermod.test
rename to tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/usermod.test
diff --git a/tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config.txt b/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config.txt
rename to tests/usertools/usermod/35_usermod-f_no_shadow_entry/config.txt
diff --git a/tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/default/useradd b/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/default/useradd
rename to tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/group b/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/group
rename to tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/group
diff --git a/tests/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/gshadow b/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/gshadow
rename to tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/passwd b/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/passwd
rename to tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/shadow b/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/shadow
rename to tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/data/shadow b/tests/usertools/usermod/35_usermod-f_no_shadow_entry/data/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/data/shadow
rename to tests/usertools/usermod/35_usermod-f_no_shadow_entry/data/shadow
diff --git a/tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/usermod.test b/tests/usertools/usermod/35_usermod-f_no_shadow_entry/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/usermod.test
rename to tests/usertools/usermod/35_usermod-f_no_shadow_entry/usermod.test
diff --git a/tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config.txt b/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config.txt
rename to tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config.txt
diff --git a/tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/default/useradd b/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/default/useradd
rename to tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/group b/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/group
rename to tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/group
diff --git a/tests/tests/usertools/55_userdel_busy_user/config/etc/gshadow b/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/55_userdel_busy_user/config/etc/gshadow
rename to tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/passwd b/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/passwd
rename to tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/shadow b/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/shadow
rename to tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/home_ls-a b/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/home_ls-a
similarity index 100%
rename from tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/home_ls-a
rename to tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/home_ls-a
diff --git a/tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/home_ls-a2 b/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/home_ls-a2
similarity index 100%
rename from tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/home_ls-a2
rename to tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/home_ls-a2
diff --git a/tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/passwd b/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/passwd
rename to tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/passwd
diff --git a/tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/usermod.err b/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/usermod.err
rename to tests/usertools/usermod/36_usermod_move_homedir_existing_dir/data/usermod.err
diff --git a/tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/usermod.test b/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/usermod.test
rename to tests/usertools/usermod/36_usermod_move_homedir_existing_dir/usermod.test
diff --git a/tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config.txt b/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config.txt
rename to tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config.txt
diff --git a/tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/default/useradd b/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/default/useradd
rename to tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/group b/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/group
rename to tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/group
diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/gshadow b/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/gshadow
rename to tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/passwd b/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/passwd
rename to tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/shadow b/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/shadow
rename to tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/data/passwd b/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/data/passwd
rename to tests/usertools/usermod/37_usermod_move_nonexistent_homedir/data/passwd
diff --git a/tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/usermod.test b/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/usermod.test
rename to tests/usertools/usermod/37_usermod_move_nonexistent_homedir/usermod.test
diff --git a/tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config.txt b/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config.txt
rename to tests/usertools/usermod/38_usermod-u_lastlog_not_created/config.txt
diff --git a/tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/default/useradd b/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/default/useradd
rename to tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/33_usermod_change_shell/config/etc/group b/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/33_usermod_change_shell/config/etc/group
rename to tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/group
diff --git a/tests/tests/usertools/usermod/33_usermod_change_shell/config/etc/gshadow b/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/33_usermod_change_shell/config/etc/gshadow
rename to tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/passwd b/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/passwd
rename to tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/passwd
diff --git a/tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/shadow b/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/shadow
rename to tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/data/passwd b/tests/usertools/usermod/38_usermod-u_lastlog_not_created/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/data/passwd
rename to tests/usertools/usermod/38_usermod-u_lastlog_not_created/data/passwd
diff --git a/tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/usermod.test b/tests/usertools/usermod/38_usermod-u_lastlog_not_created/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/usermod.test
rename to tests/usertools/usermod/38_usermod-u_lastlog_not_created/usermod.test
diff --git a/tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config.txt b/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config.txt
rename to tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config.txt
diff --git a/tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/default/useradd b/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/default/useradd
rename to tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/group b/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/group
rename to tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/group
diff --git a/tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/gshadow b/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/34_usermod-e_date_no_shadow_entry/config/etc/gshadow
rename to tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/passwd b/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/passwd
rename to tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/passwd
diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/shadow b/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/shadow
rename to tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/data/passwd b/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/data/passwd
rename to tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/data/passwd
diff --git a/tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/login.exp b/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/login.exp
similarity index 100%
rename from tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/login.exp
rename to tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/login.exp
diff --git a/tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/usermod.test b/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/usermod.test
rename to tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/usermod.test
diff --git a/tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config.txt b/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config.txt
rename to tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config.txt
diff --git a/tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/default/useradd b/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/default/useradd
rename to tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/group b/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/group
rename to tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/group
diff --git a/tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/gshadow b/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/gshadow
rename to tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/passwd b/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/passwd
rename to tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/shadow b/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/shadow
rename to tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/group b/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/group
similarity index 100%
rename from tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/group
rename to tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/group
diff --git a/tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/passwd b/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/passwd
rename to tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/passwd
diff --git a/tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/shadow b/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/shadow
rename to tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/shadow
diff --git a/tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/login.exp b/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/login.exp
similarity index 100%
rename from tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/login.exp
rename to tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/login.exp
diff --git a/tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/usermod.test b/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/usermod.test
rename to tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/usermod.test
diff --git a/tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/config.txt b/tests/usertools/usermod/41_usermod-u_faillog_not_created/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/config.txt
rename to tests/usertools/usermod/41_usermod-u_faillog_not_created/config.txt
diff --git a/tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/default/useradd b/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/default/useradd
rename to tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/group b/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/group
rename to tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/group
diff --git a/tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/gshadow b/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/gshadow
rename to tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/passwd b/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/passwd
rename to tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/shadow b/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/shadow
rename to tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/passwd b/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/passwd
rename to tests/usertools/usermod/41_usermod-u_faillog_not_created/data/passwd
diff --git a/tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/usermod.test b/tests/usertools/usermod/41_usermod-u_faillog_not_created/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/usermod.test
rename to tests/usertools/usermod/41_usermod-u_faillog_not_created/usermod.test
diff --git a/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config.txt b/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config.txt
rename to tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config.txt
diff --git a/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/default/useradd b/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/default/useradd
rename to tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/group b/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/group
rename to tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/group
diff --git a/tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/gshadow b/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/gshadow
rename to tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/pam.d/login b/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/pam.d/login
rename to tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/pam.d/login
diff --git a/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/passwd b/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/passwd
rename to tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/shadow b/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/shadow
rename to tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/passwd b/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/passwd
rename to tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/passwd
diff --git a/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/login.exp b/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/login.exp
similarity index 100%
rename from tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/login.exp
rename to tests/usertools/usermod/42_usermod-u_copy_faillog_entry/login.exp
diff --git a/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/usermod.test b/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/usermod.test
rename to tests/usertools/usermod/42_usermod-u_copy_faillog_entry/usermod.test
diff --git a/tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config.txt b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config.txt
rename to tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config.txt
diff --git a/tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/default/useradd b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/default/useradd
rename to tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/group b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/group
rename to tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/group
diff --git a/tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/gshadow b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/gshadow
rename to tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/pam.d/login b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/pam.d/login
similarity index 100%
rename from tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/pam.d/login
rename to tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/pam.d/login
diff --git a/tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/passwd b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/passwd
rename to tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/shadow b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/shadow
rename to tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/group b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/group
similarity index 100%
rename from tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/group
rename to tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/group
diff --git a/tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/passwd b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/passwd
rename to tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/passwd
diff --git a/tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/shadow b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/shadow
rename to tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/shadow
diff --git a/tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/login.exp b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/login.exp
similarity index 100%
rename from tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/login.exp
rename to tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/login.exp
diff --git a/tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/usermod.test b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/usermod.test
rename to tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/usermod.test
diff --git a/tests/tests/usertools/usermod/44_usermod-l_move_mailbox/config.txt b/tests/usertools/usermod/44_usermod-l_move_mailbox/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/44_usermod-l_move_mailbox/config.txt
rename to tests/usertools/usermod/44_usermod-l_move_mailbox/config.txt
diff --git a/tests/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/default/useradd b/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/default/useradd
rename to tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/group b/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/group
rename to tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/group
diff --git a/tests/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/gshadow b/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/gshadow
rename to tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/passwd b/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/passwd
rename to tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/shadow b/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/21_usermod_rename_user_no_gshadow_file/config/etc/shadow
rename to tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/44_usermod-l_move_mailbox/data/mailbox.perms b/tests/usertools/usermod/44_usermod-l_move_mailbox/data/mailbox.perms
similarity index 100%
rename from tests/tests/usertools/usermod/44_usermod-l_move_mailbox/data/mailbox.perms
rename to tests/usertools/usermod/44_usermod-l_move_mailbox/data/mailbox.perms
diff --git a/tests/tests/usertools/usermod/44_usermod-l_move_mailbox/data/passwd b/tests/usertools/usermod/44_usermod-l_move_mailbox/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/44_usermod-l_move_mailbox/data/passwd
rename to tests/usertools/usermod/44_usermod-l_move_mailbox/data/passwd
diff --git a/tests/tests/usertools/usermod/44_usermod-l_move_mailbox/data/shadow b/tests/usertools/usermod/44_usermod-l_move_mailbox/data/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/44_usermod-l_move_mailbox/data/shadow
rename to tests/usertools/usermod/44_usermod-l_move_mailbox/data/shadow
diff --git a/tests/tests/usertools/usermod/44_usermod-l_move_mailbox/test b/tests/usertools/usermod/44_usermod-l_move_mailbox/test
similarity index 100%
rename from tests/tests/usertools/usermod/44_usermod-l_move_mailbox/test
rename to tests/usertools/usermod/44_usermod-l_move_mailbox/test
diff --git a/tests/tests/usertools/usermod/44_usermod-l_move_mailbox/usermod.test b/tests/usertools/usermod/44_usermod-l_move_mailbox/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/44_usermod-l_move_mailbox/usermod.test
rename to tests/usertools/usermod/44_usermod-l_move_mailbox/usermod.test
diff --git a/tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config.txt b/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config.txt
rename to tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config.txt
diff --git a/tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/default/useradd b/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/default/useradd
rename to tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/group b/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/group
rename to tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/group
diff --git a/tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/gshadow b/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/gshadow
rename to tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/passwd b/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/passwd
rename to tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/shadow b/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/shadow
rename to tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/data/mailbox.perms b/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/data/mailbox.perms
similarity index 100%
rename from tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/data/mailbox.perms
rename to tests/usertools/usermod/45_usermod-u_change_mailbox_owner/data/mailbox.perms
diff --git a/tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/data/passwd b/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/data/passwd
rename to tests/usertools/usermod/45_usermod-u_change_mailbox_owner/data/passwd
diff --git a/tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/usermod.test b/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/usermod.test
rename to tests/usertools/usermod/45_usermod-u_change_mailbox_owner/usermod.test
diff --git a/tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config.txt b/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config.txt
rename to tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config.txt
diff --git a/tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/default/useradd b/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/default/useradd
rename to tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/group b/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/group
rename to tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/group
diff --git a/tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/gshadow b/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/gshadow
rename to tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/passwd b/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/passwd
rename to tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/shadow b/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/shadow
rename to tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/data/mailbox.perms b/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/data/mailbox.perms
similarity index 100%
rename from tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/data/mailbox.perms
rename to tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/data/mailbox.perms
diff --git a/tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/data/passwd b/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/data/passwd
rename to tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/data/passwd
diff --git a/tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/data/usermod.err b/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/data/usermod.err
rename to tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/data/usermod.err
diff --git a/tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/usermod.test b/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/usermod.test
rename to tests/usertools/usermod/46_usermod-u_checks_mailbox_owner/usermod.test
diff --git a/tests/tests/usertools/usermod/47_usermod-u_default_maildir/config.txt b/tests/usertools/usermod/47_usermod-u_default_maildir/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/47_usermod-u_default_maildir/config.txt
rename to tests/usertools/usermod/47_usermod-u_default_maildir/config.txt
diff --git a/tests/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/default/useradd b/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/default/useradd
rename to tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/group b/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/group
rename to tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/group
diff --git a/tests/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/gshadow b/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/gshadow
rename to tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/login.defs b/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/login.defs
similarity index 100%
rename from tests/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/login.defs
rename to tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/login.defs
diff --git a/tests/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/passwd b/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/passwd
rename to tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/shadow b/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/shadow
rename to tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/47_usermod-u_default_maildir/data/mailbox.perms b/tests/usertools/usermod/47_usermod-u_default_maildir/data/mailbox.perms
similarity index 100%
rename from tests/tests/usertools/usermod/47_usermod-u_default_maildir/data/mailbox.perms
rename to tests/usertools/usermod/47_usermod-u_default_maildir/data/mailbox.perms
diff --git a/tests/tests/usertools/usermod/47_usermod-u_default_maildir/data/passwd b/tests/usertools/usermod/47_usermod-u_default_maildir/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/47_usermod-u_default_maildir/data/passwd
rename to tests/usertools/usermod/47_usermod-u_default_maildir/data/passwd
diff --git a/tests/tests/usertools/usermod/47_usermod-u_default_maildir/usermod.test b/tests/usertools/usermod/47_usermod-u_default_maildir/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/47_usermod-u_default_maildir/usermod.test
rename to tests/usertools/usermod/47_usermod-u_default_maildir/usermod.test
diff --git a/tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config.txt b/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config.txt
rename to tests/usertools/usermod/48_usermod-u_MAIL_FILE/config.txt
diff --git a/tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/default/useradd b/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/default/useradd
rename to tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/group b/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/group
rename to tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/group
diff --git a/tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/gshadow b/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/gshadow
rename to tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/login.defs b/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/login.defs
similarity index 100%
rename from tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/login.defs
rename to tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/login.defs
diff --git a/tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/passwd b/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/passwd
rename to tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/shadow b/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/shadow
rename to tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/data/mailbox.perms b/tests/usertools/usermod/48_usermod-u_MAIL_FILE/data/mailbox.perms
similarity index 100%
rename from tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/data/mailbox.perms
rename to tests/usertools/usermod/48_usermod-u_MAIL_FILE/data/mailbox.perms
diff --git a/tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/data/passwd b/tests/usertools/usermod/48_usermod-u_MAIL_FILE/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/data/passwd
rename to tests/usertools/usermod/48_usermod-u_MAIL_FILE/data/passwd
diff --git a/tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/usermod.test b/tests/usertools/usermod/48_usermod-u_MAIL_FILE/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/usermod.test
rename to tests/usertools/usermod/48_usermod-u_MAIL_FILE/usermod.test
diff --git a/tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config.txt b/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config.txt
rename to tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config.txt
diff --git a/tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/default/useradd b/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/default/useradd
rename to tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/group b/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/group
rename to tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/group
diff --git a/tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/gshadow b/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/gshadow
rename to tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/passwd b/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/passwd
rename to tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/shadow b/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/config/etc/shadow
rename to tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/data/home_ls-a b/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/data/home_ls-a
similarity index 100%
rename from tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/data/home_ls-a
rename to tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/data/home_ls-a
diff --git a/tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/data/passwd b/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/data/passwd
rename to tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/data/passwd
diff --git a/tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/usermod.test b/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/usermod.test
rename to tests/usertools/usermod/49_usermod_change_gid+move_homedir_other_device/usermod.test
diff --git a/tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config.txt b/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config.txt
rename to tests/usertools/usermod/50_usermod_change_uid+move_homedir/config.txt
diff --git a/tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/default/useradd b/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/default/useradd
rename to tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/group b/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/group
rename to tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/group
diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/gshadow b/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/gshadow
rename to tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/passwd b/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/passwd
rename to tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/shadow b/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/shadow
rename to tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/data/home_ls-a b/tests/usertools/usermod/50_usermod_change_uid+move_homedir/data/home_ls-a
similarity index 100%
rename from tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/data/home_ls-a
rename to tests/usertools/usermod/50_usermod_change_uid+move_homedir/data/home_ls-a
diff --git a/tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/data/passwd b/tests/usertools/usermod/50_usermod_change_uid+move_homedir/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/data/passwd
rename to tests/usertools/usermod/50_usermod_change_uid+move_homedir/data/passwd
diff --git a/tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/usermod.test b/tests/usertools/usermod/50_usermod_change_uid+move_homedir/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/usermod.test
rename to tests/usertools/usermod/50_usermod_change_uid+move_homedir/usermod.test
diff --git a/tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config.txt b/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config.txt
rename to tests/usertools/usermod/51_usermod_change_gid+move_homedir/config.txt
diff --git a/tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/default/useradd b/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/default/useradd
rename to tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/group b/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/group
rename to tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/group
diff --git a/tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/gshadow b/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/gshadow
rename to tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/passwd b/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/passwd
rename to tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/shadow b/tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/44_usermod-l_move_mailbox/config/etc/shadow
rename to tests/usertools/usermod/51_usermod_change_gid+move_homedir/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/data/home_ls-a b/tests/usertools/usermod/51_usermod_change_gid+move_homedir/data/home_ls-a
similarity index 100%
rename from tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/data/home_ls-a
rename to tests/usertools/usermod/51_usermod_change_gid+move_homedir/data/home_ls-a
diff --git a/tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/data/passwd b/tests/usertools/usermod/51_usermod_change_gid+move_homedir/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/data/passwd
rename to tests/usertools/usermod/51_usermod_change_gid+move_homedir/data/passwd
diff --git a/tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/usermod.test b/tests/usertools/usermod/51_usermod_change_gid+move_homedir/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/51_usermod_change_gid+move_homedir/usermod.test
rename to tests/usertools/usermod/51_usermod_change_gid+move_homedir/usermod.test
diff --git a/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/config.txt b/tests/usertools/usermod/52_usermod_move_homedir_symlink/config.txt
similarity index 100%
rename from tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/config.txt
rename to tests/usertools/usermod/52_usermod_move_homedir_symlink/config.txt
diff --git a/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/default/useradd b/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/default/useradd
similarity index 100%
rename from tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/default/useradd
rename to tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/default/useradd
diff --git a/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/group b/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/group
similarity index 100%
rename from tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/group
rename to tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/group
diff --git a/tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/gshadow b/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/gshadow
similarity index 100%
rename from tests/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/config/etc/gshadow
rename to tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/gshadow
diff --git a/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/passwd b/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/passwd
rename to tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/passwd
diff --git a/tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/shadow b/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/shadow
similarity index 100%
rename from tests/tests/usertools/usermod/45_usermod-u_change_mailbox_owner/config/etc/shadow
rename to tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/shadow
diff --git a/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/data/home_ls-a b/tests/usertools/usermod/52_usermod_move_homedir_symlink/data/home_ls-a
similarity index 100%
rename from tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/data/home_ls-a
rename to tests/usertools/usermod/52_usermod_move_homedir_symlink/data/home_ls-a
diff --git a/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/data/home_ls-a2 b/tests/usertools/usermod/52_usermod_move_homedir_symlink/data/home_ls-a2
similarity index 100%
rename from tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/data/home_ls-a2
rename to tests/usertools/usermod/52_usermod_move_homedir_symlink/data/home_ls-a2
diff --git a/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/data/passwd b/tests/usertools/usermod/52_usermod_move_homedir_symlink/data/passwd
similarity index 100%
rename from tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/data/passwd
rename to tests/usertools/usermod/52_usermod_move_homedir_symlink/data/passwd
diff --git a/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/data/usermod.err b/tests/usertools/usermod/52_usermod_move_homedir_symlink/data/usermod.err
similarity index 100%
rename from tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/data/usermod.err
rename to tests/usertools/usermod/52_usermod_move_homedir_symlink/data/usermod.err
diff --git a/tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/usermod.test b/tests/usertools/usermod/52_usermod_move_homedir_symlink/usermod.test
similarity index 100%
rename from tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/usermod.test
rename to tests/usertools/usermod/52_usermod_move_homedir_symlink/usermod.test