diff --git a/Makefile.am b/Makefile.am index 22bbd561..a92024fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,4 +15,15 @@ SUBDIRS += man endif CLEANFILES = man/8.out man/po/remove-potcdate.* man/*/login.defs.d man/*/*.mo + EXTRA_DIST = 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 66aa6b16..2ec06d4b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -623,6 +623,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 \ @@ -870,8 +873,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 \ @@ -887,6 +890,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/configure b/configure index e23e2eaf..101f3c8b 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.15.2. +# Generated by GNU Autoconf 2.71 for shadow 4.15.3. # # Report bugs to . # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='shadow' PACKAGE_TARNAME='shadow' -PACKAGE_VERSION='4.15.2' -PACKAGE_STRING='shadow 4.15.2' +PACKAGE_VERSION='4.15.3' +PACKAGE_STRING='shadow 4.15.3' PACKAGE_BUGREPORT='pkg-shadow-devel@lists.alioth.debian.org' PACKAGE_URL='https://github.com/shadow-maint/shadow' @@ -1489,7 +1489,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.15.2 to adapt to many kinds of systems. +\`configure' configures shadow 4.15.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1560,7 +1560,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of shadow 4.15.2:";; + short | recursive ) echo "Configuration of shadow 4.15.3:";; esac cat <<\_ACEOF @@ -1739,7 +1739,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -shadow configure 4.15.2 +shadow configure 4.15.3 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2339,7 +2339,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.15.2, which was +It was created by shadow $as_me 4.15.3, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3612,7 +3612,7 @@ fi # Define the identity of the package. PACKAGE='shadow' - VERSION='4.15.2' + VERSION='4.15.3' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -20990,7 +20990,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.15.2, which was +This file was extended by shadow $as_me 4.15.3, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21059,7 +21059,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.15.2 +shadow config.status 4.15.3 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 789c2c2e..9388dd18 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ m4_define([libsubid_abi_major], 4) 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.15.2], [pkg-shadow-devel@lists.alioth.debian.org], [], +AC_INIT([shadow], [4.15.3], [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]) diff --git a/lib/subordinateio.c b/lib/subordinateio.c index e7cd4b48..d8e7633c 100644 --- a/lib/subordinateio.c +++ b/lib/subordinateio.c @@ -274,40 +274,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) { @@ -574,6 +542,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); diff --git a/man/config.xml b/man/config.xml index f3420361..7990df20 100644 --- a/man/config.xml +++ b/man/config.xml @@ -1,2 +1,2 @@ - + diff --git a/man/da/man1/chfn.1 b/man/da/man1/chfn.1 index a999af8d..2209f1ce 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Danish .\" -.TH "CHFN" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHFN" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/da/man1/groups.1 b/man/da/man1/groups.1 index 81f2be2b..19dac425 100644 --- a/man/da/man1/groups.1 +++ b/man/da/man1/groups.1 @@ -2,12 +2,12 @@ .\" Title: groups .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Danish .\" -.TH "GROUPS" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "GROUPS" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/da/man1/id.1 b/man/da/man1/id.1 index 6854332b..f1753a7f 100644 --- a/man/da/man1/id.1 +++ b/man/da/man1/id.1 @@ -2,12 +2,12 @@ .\" Title: id .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Danish .\" -.TH "ID" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "ID" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/da/man1/newgrp.1 b/man/da/man1/newgrp.1 index fed91ded..4e4466b0 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Danish .\" -.TH "NEWGRP" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "NEWGRP" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/da/man1/sg.1 b/man/da/man1/sg.1 index cc288b54..111a317e 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Danish .\" -.TH "SG" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "SG" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/da/man5/gshadow.5 b/man/da/man5/gshadow.5 index 56a4e557..97dc56f8 100644 --- a/man/da/man5/gshadow.5 +++ b/man/da/man5/gshadow.5 @@ -2,12 +2,12 @@ .\" Title: gshadow .\" Author: Nicolas Fran\(,cois .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Danish .\" -.TH "GSHADOW" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "GSHADOW" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/da/man8/groupdel.8 b/man/da/man8/groupdel.8 index e370ffec..7e866299 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Danish .\" -.TH "GROUPDEL" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPDEL" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/da/man8/logoutd.8 b/man/da/man8/logoutd.8 index 88b506fe..6ccf38f6 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Danish .\" -.TH "LOGOUTD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LOGOUTD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/da/man8/nologin.8 b/man/da/man8/nologin.8 index c22b77cb..18117c16 100644 --- a/man/da/man8/nologin.8 +++ b/man/da/man8/nologin.8 @@ -2,12 +2,12 @@ .\" Title: nologin .\" Author: Nicolas Fran\(,cois .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Danish .\" -.TH "NOLOGIN" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "NOLOGIN" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/da/man8/vipw.8 b/man/da/man8/vipw.8 index a586d71c..f0629241 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Danish .\" -.TH "VIPW" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "VIPW" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man1/chage.1 b/man/de/man1/chage.1 index 9d88d46e..f285618d 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "CHAGE" "1" "21.06.2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHAGE" "1" "28.06.2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man1/chfn.1 b/man/de/man1/chfn.1 index 458e2e6f..a5e18803 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "CHFN" "1" "21.06.2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHFN" "1" "28.06.2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man1/chsh.1 b/man/de/man1/chsh.1 index e7e73529..4ce25251 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "CHSH" "1" "21.06.2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHSH" "1" "28.06.2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man1/expiry.1 b/man/de/man1/expiry.1 index b51c8365..1081318c 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "EXPIRY" "1" "21.06.2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "EXPIRY" "1" "28.06.2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man1/gpasswd.1 b/man/de/man1/gpasswd.1 index 68f26250..ac45acc2 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "GPASSWD" "1" "21.06.2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "GPASSWD" "1" "28.06.2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man1/groups.1 b/man/de/man1/groups.1 index d06b82e3..af712c24 100644 --- a/man/de/man1/groups.1 +++ b/man/de/man1/groups.1 @@ -2,12 +2,12 @@ .\" Title: groups .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "GROUPS" "1" "21.06.2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "GROUPS" "1" "28.06.2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man1/id.1 b/man/de/man1/id.1 index 26b40b1d..fa7f3bfc 100644 --- a/man/de/man1/id.1 +++ b/man/de/man1/id.1 @@ -2,12 +2,12 @@ .\" Title: id .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "ID" "1" "21.06.2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "ID" "1" "28.06.2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man1/login.1 b/man/de/man1/login.1 index 2262e3ea..284677cd 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "LOGIN" "1" "21.06.2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "LOGIN" "1" "28.06.2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man1/newgrp.1 b/man/de/man1/newgrp.1 index cc4bcffa..25948aa5 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "NEWGRP" "1" "21.06.2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "NEWGRP" "1" "28.06.2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man1/passwd.1 b/man/de/man1/passwd.1 index 0ee0d4f7..35fe9ac3 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "PASSWD" "1" "21.06.2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "PASSWD" "1" "28.06.2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man1/sg.1 b/man/de/man1/sg.1 index edae3273..49b9cc15 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "SG" "1" "21.06.2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "SG" "1" "28.06.2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man1/su.1 b/man/de/man1/su.1 index 598d4cb2..3921b5a7 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "SU" "1" "21.06.2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "SU" "1" "28.06.2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man3/shadow.3 b/man/de/man3/shadow.3 index eb6e81cc..77d34de9 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: Library Calls -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "SHADOW" "3" "21.06.2024" "shadow\-utils 4\&.15\&.2" "Library Calls" +.TH "SHADOW" "3" "28.06.2024" "shadow\-utils 4\&.15\&.3" "Library Calls" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man5/faillog.5 b/man/de/man5/faillog.5 index 65517903..e89654e2 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "FAILLOG" "5" "21.06.2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuratio" +.TH "FAILLOG" "5" "28.06.2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuratio" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man5/gshadow.5 b/man/de/man5/gshadow.5 index 0f182179..05b000ac 100644 --- a/man/de/man5/gshadow.5 +++ b/man/de/man5/gshadow.5 @@ -2,12 +2,12 @@ .\" Title: gshadow .\" Author: Nicolas Fran\(,cois .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "GSHADOW" "5" "21.06.2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "GSHADOW" "5" "28.06.2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man5/limits.5 b/man/de/man5/limits.5 index 29ebc2ce..8e3a1b96 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "LIMITS" "5" "21.06.2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LIMITS" "5" "28.06.2024" "shadow\-utils 4\&.15\&.3" "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 4e3730eb..d9243cc1 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "LOGIN\&.ACCESS" "5" "21.06.2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LOGIN\&.ACCESS" "5" "28.06.2024" "shadow\-utils 4\&.15\&.3" "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 5a3f6ca1..a499578f 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "LOGIN\&.DEFS" "5" "21.06.2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LOGIN\&.DEFS" "5" "28.06.2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man5/passwd.5 b/man/de/man5/passwd.5 index 620a79e7..adbbd5e1 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "PASSWD" "5" "21.06.2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "PASSWD" "5" "28.06.2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man5/porttime.5 b/man/de/man5/porttime.5 index c6aae574..7bb7dcf5 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "PORTTIME" "5" "21.06.2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "PORTTIME" "5" "28.06.2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man5/shadow.5 b/man/de/man5/shadow.5 index aa9ced4a..b88aa1b8 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "SHADOW" "5" "21.06.2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SHADOW" "5" "28.06.2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man5/suauth.5 b/man/de/man5/suauth.5 index 85d03b41..813b8233 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "SUAUTH" "5" "21.06.2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SUAUTH" "5" "28.06.2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/chgpasswd.8 b/man/de/man8/chgpasswd.8 index 6123f2a0..ff84f0e6 100644 --- a/man/de/man8/chgpasswd.8 +++ b/man/de/man8/chgpasswd.8 @@ -2,12 +2,12 @@ .\" Title: chgpasswd .\" Author: Thomas K\(/loczko .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "CHGPASSWD" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "CHGPASSWD" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/chpasswd.8 b/man/de/man8/chpasswd.8 index c524312c..08ec7ebb 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "CHPASSWD" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "CHPASSWD" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/faillog.8 b/man/de/man8/faillog.8 index a04d0de8..7e1ea4cc 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "FAILLOG" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "FAILLOG" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/groupadd.8 b/man/de/man8/groupadd.8 index 3caed39d..73920d77 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "GROUPADD" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPADD" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/groupdel.8 b/man/de/man8/groupdel.8 index 4db2fadf..f2306ed2 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "GROUPDEL" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPDEL" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/groupmems.8 b/man/de/man8/groupmems.8 index f741428b..0237a2b6 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "GROUPMEMS" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPMEMS" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/groupmod.8 b/man/de/man8/groupmod.8 index 4117b744..d67b1dab 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "GROUPMOD" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPMOD" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/grpck.8 b/man/de/man8/grpck.8 index 72f27790..ac5de136 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "GRPCK" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GRPCK" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/lastlog.8 b/man/de/man8/lastlog.8 index dc4c6730..a7126bb0 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "LASTLOG" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LASTLOG" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/logoutd.8 b/man/de/man8/logoutd.8 index e9cad468..109b4ff3 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "LOGOUTD" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LOGOUTD" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/newusers.8 b/man/de/man8/newusers.8 index 0a4b9fcd..13dfb9de 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "NEWUSERS" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "NEWUSERS" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/nologin.8 b/man/de/man8/nologin.8 index 57ece97c..f9d5acc7 100644 --- a/man/de/man8/nologin.8 +++ b/man/de/man8/nologin.8 @@ -2,12 +2,12 @@ .\" Title: nologin .\" Author: Nicolas Fran\(,cois .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "NOLOGIN" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "NOLOGIN" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/pwck.8 b/man/de/man8/pwck.8 index f3cd6541..663c23ba 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "PWCK" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "PWCK" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/pwconv.8 b/man/de/man8/pwconv.8 index 98cd6027..c4cb1e89 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "PWCONV" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "PWCONV" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/sulogin.8 b/man/de/man8/sulogin.8 index 1244de9d..b4166701 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "SULOGIN" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "SULOGIN" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/useradd.8 b/man/de/man8/useradd.8 index 7920dbf9..01d554a1 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "USERADD" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERADD" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/userdel.8 b/man/de/man8/userdel.8 index 752e07fe..fd164655 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "USERDEL" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERDEL" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/usermod.8 b/man/de/man8/usermod.8 index 84a76b6b..49a21055 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "USERMOD" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERMOD" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/de/man8/vipw.8 b/man/de/man8/vipw.8 index 865106c4..c23ea043 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 -.\" Date: 21.06.2024 +.\" Date: 28.06.2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: German .\" -.TH "VIPW" "8" "21.06.2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "VIPW" "8" "28.06.2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man1/chage.1 b/man/fr/man1/chage.1 index 364eb3f3..fdfb42ed 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "CHAGE" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHAGE" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man1/chfn.1 b/man/fr/man1/chfn.1 index 92452c74..343574ee 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "CHFN" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHFN" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man1/chsh.1 b/man/fr/man1/chsh.1 index 18f1b655..78241eb8 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "CHSH" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHSH" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man1/expiry.1 b/man/fr/man1/expiry.1 index 0b237a9e..b50ed71c 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "EXPIRY" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "EXPIRY" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man1/gpasswd.1 b/man/fr/man1/gpasswd.1 index c5042b7b..5bf6d4c6 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "GPASSWD" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "GPASSWD" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man1/groups.1 b/man/fr/man1/groups.1 index 09413e55..71290467 100644 --- a/man/fr/man1/groups.1 +++ b/man/fr/man1/groups.1 @@ -2,12 +2,12 @@ .\" Title: groups .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "GROUPS" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "GROUPS" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man1/id.1 b/man/fr/man1/id.1 index 1f96b2ae..87b218f8 100644 --- a/man/fr/man1/id.1 +++ b/man/fr/man1/id.1 @@ -2,12 +2,12 @@ .\" Title: id .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "ID" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "ID" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man1/login.1 b/man/fr/man1/login.1 index 6d30e44f..dbbe6e0c 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "LOGIN" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "LOGIN" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man1/newgidmap.1 b/man/fr/man1/newgidmap.1 index 28bbee33..e6bef385 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "NEWGIDMAP" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "NEWGIDMAP" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man1/newgrp.1 b/man/fr/man1/newgrp.1 index 797403c1..e81f7bf6 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "NEWGRP" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "NEWGRP" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man1/newuidmap.1 b/man/fr/man1/newuidmap.1 index da9c65d3..8067253a 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "NEWUIDMAP" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "NEWUIDMAP" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man1/passwd.1 b/man/fr/man1/passwd.1 index ae6e0cbf..1814dd3e 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "PASSWD" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "PASSWD" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man1/sg.1 b/man/fr/man1/sg.1 index 967e2d33..fbf59186 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "SG" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "SG" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man1/su.1 b/man/fr/man1/su.1 index 2b586fb7..8b79f892 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "SU" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "SU" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man3/shadow.3 b/man/fr/man3/shadow.3 index 1e9729f6..786d1c4f 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: Library Calls -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "SHADOW" "3" "21/06/2024" "shadow\-utils 4\&.15\&.2" "Library Calls" +.TH "SHADOW" "3" "28/06/2024" "shadow\-utils 4\&.15\&.3" "Library Calls" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man5/faillog.5 b/man/fr/man5/faillog.5 index e729b0be..3aad73f2 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "FAILLOG" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuratio" +.TH "FAILLOG" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuratio" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man5/gshadow.5 b/man/fr/man5/gshadow.5 index 120301de..88febcac 100644 --- a/man/fr/man5/gshadow.5 +++ b/man/fr/man5/gshadow.5 @@ -2,12 +2,12 @@ .\" Title: gshadow .\" Author: Nicolas Fran\(,cois .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "GSHADOW" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "GSHADOW" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man5/limits.5 b/man/fr/man5/limits.5 index 4589e590..f005fbc6 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "LIMITS" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LIMITS" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "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 0d4767d2..72f1f3fe 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "LOGIN\&.ACCESS" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LOGIN\&.ACCESS" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "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 845e10bd..018645f4 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "LOGIN\&.DEFS" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LOGIN\&.DEFS" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man5/passwd.5 b/man/fr/man5/passwd.5 index ea061d6a..6ec778e4 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "PASSWD" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "PASSWD" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man5/porttime.5 b/man/fr/man5/porttime.5 index 7ea4e735..a8aa5e64 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "PORTTIME" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "PORTTIME" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man5/shadow.5 b/man/fr/man5/shadow.5 index 42c8ed29..af570877 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "SHADOW" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SHADOW" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man5/suauth.5 b/man/fr/man5/suauth.5 index 40d7b661..6584a936 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "SUAUTH" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SUAUTH" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man5/subgid.5 b/man/fr/man5/subgid.5 index a035d5fb..09099433 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "SUBGID" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SUBGID" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man5/subuid.5 b/man/fr/man5/subuid.5 index ebe92554..42b830e9 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "SUBUID" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SUBUID" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/chgpasswd.8 b/man/fr/man8/chgpasswd.8 index f8c454e2..c60c5b6b 100644 --- a/man/fr/man8/chgpasswd.8 +++ b/man/fr/man8/chgpasswd.8 @@ -2,12 +2,12 @@ .\" Title: chgpasswd .\" Author: Thomas K\(/loczko .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "CHGPASSWD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "CHGPASSWD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/chpasswd.8 b/man/fr/man8/chpasswd.8 index f5cadc8c..233bac47 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "CHPASSWD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "CHPASSWD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/faillog.8 b/man/fr/man8/faillog.8 index b74b7635..62d597c2 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "FAILLOG" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "FAILLOG" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/groupadd.8 b/man/fr/man8/groupadd.8 index 3e9b5a3d..b9bcbd47 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "GROUPADD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPADD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/groupdel.8 b/man/fr/man8/groupdel.8 index cab97e84..15d6a3e0 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "GROUPDEL" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPDEL" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/groupmems.8 b/man/fr/man8/groupmems.8 index 4fc00092..38fe4918 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "GROUPMEMS" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPMEMS" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/groupmod.8 b/man/fr/man8/groupmod.8 index cd40d5f9..63d40bf2 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "GROUPMOD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPMOD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/grpck.8 b/man/fr/man8/grpck.8 index a5397b98..e75fbd7a 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "GRPCK" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GRPCK" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/lastlog.8 b/man/fr/man8/lastlog.8 index 14bb18b8..ef630c14 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "LASTLOG" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LASTLOG" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/logoutd.8 b/man/fr/man8/logoutd.8 index 43b07eb4..a2c0e095 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "LOGOUTD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LOGOUTD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/newusers.8 b/man/fr/man8/newusers.8 index 4f070018..8ca47072 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "NEWUSERS" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "NEWUSERS" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/nologin.8 b/man/fr/man8/nologin.8 index 6c14f0dd..3af2a609 100644 --- a/man/fr/man8/nologin.8 +++ b/man/fr/man8/nologin.8 @@ -2,12 +2,12 @@ .\" Title: nologin .\" Author: Nicolas Fran\(,cois .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "NOLOGIN" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "NOLOGIN" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/pwck.8 b/man/fr/man8/pwck.8 index 3a6b15df..1759b102 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "PWCK" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "PWCK" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/pwconv.8 b/man/fr/man8/pwconv.8 index bd6d6781..39beadb7 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "PWCONV" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "PWCONV" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/sulogin.8 b/man/fr/man8/sulogin.8 index 82f336c7..55e2a6b4 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "SULOGIN" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "SULOGIN" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/useradd.8 b/man/fr/man8/useradd.8 index 544c14d8..003253d6 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "USERADD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERADD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/userdel.8 b/man/fr/man8/userdel.8 index 99084c02..85460add 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "USERDEL" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERDEL" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/usermod.8 b/man/fr/man8/usermod.8 index 17893ea4..dde990f9 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "USERMOD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERMOD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/fr/man8/vipw.8 b/man/fr/man8/vipw.8 index 323e95b2..da48bf11 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: French .\" -.TH "VIPW" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "VIPW" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man1/chage.1 b/man/it/man1/chage.1 index d5a27425..59e6c5d3 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "CHAGE" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHAGE" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man1/chfn.1 b/man/it/man1/chfn.1 index 06641188..5b62fa58 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "CHFN" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHFN" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man1/chsh.1 b/man/it/man1/chsh.1 index 77e7d3e3..786c11cc 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "CHSH" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHSH" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man1/expiry.1 b/man/it/man1/expiry.1 index 378c08c9..4d97ff3b 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "EXPIRY" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "EXPIRY" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man1/gpasswd.1 b/man/it/man1/gpasswd.1 index 6ef70d07..cefb21ab 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "GPASSWD" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "GPASSWD" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man1/groups.1 b/man/it/man1/groups.1 index ead76d64..50f1ab74 100644 --- a/man/it/man1/groups.1 +++ b/man/it/man1/groups.1 @@ -2,12 +2,12 @@ .\" Title: groups .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "GROUPS" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "GROUPS" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man1/id.1 b/man/it/man1/id.1 index 2197f9bc..5cc504da 100644 --- a/man/it/man1/id.1 +++ b/man/it/man1/id.1 @@ -2,12 +2,12 @@ .\" Title: id .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "ID" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "ID" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man1/login.1 b/man/it/man1/login.1 index d35d2b4c..05bf2bce 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "LOGIN" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "LOGIN" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man1/newgrp.1 b/man/it/man1/newgrp.1 index f661d12d..66608e58 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "NEWGRP" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "NEWGRP" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man1/passwd.1 b/man/it/man1/passwd.1 index 6f32ad21..e98e0840 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "PASSWD" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "PASSWD" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man1/sg.1 b/man/it/man1/sg.1 index a938344b..4e9cff29 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "SG" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "SG" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man1/su.1 b/man/it/man1/su.1 index cfc0d911..f3f0cc3a 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "SU" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "SU" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man3/shadow.3 b/man/it/man3/shadow.3 index 54c3738d..52dedf1b 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: Library Calls -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "SHADOW" "3" "21/06/2024" "shadow\-utils 4\&.15\&.2" "Library Calls" +.TH "SHADOW" "3" "28/06/2024" "shadow\-utils 4\&.15\&.3" "Library Calls" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man5/faillog.5 b/man/it/man5/faillog.5 index c5f659cb..9bde6793 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "FAILLOG" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuratio" +.TH "FAILLOG" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuratio" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man5/gshadow.5 b/man/it/man5/gshadow.5 index 3032d1d2..2b959f72 100644 --- a/man/it/man5/gshadow.5 +++ b/man/it/man5/gshadow.5 @@ -2,12 +2,12 @@ .\" Title: gshadow .\" Author: Nicolas Fran\(,cois .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "GSHADOW" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "GSHADOW" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man5/limits.5 b/man/it/man5/limits.5 index 951285b4..d9865291 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "LIMITS" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LIMITS" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "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 e38d2b70..cd5aba8e 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "LOGIN\&.ACCESS" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LOGIN\&.ACCESS" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "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 3dbd8ec8..16d3d6ac 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "LOGIN\&.DEFS" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LOGIN\&.DEFS" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man5/passwd.5 b/man/it/man5/passwd.5 index 01c241e6..e4de65f4 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "PASSWD" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "PASSWD" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man5/porttime.5 b/man/it/man5/porttime.5 index 50032715..249be861 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "PORTTIME" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "PORTTIME" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man5/shadow.5 b/man/it/man5/shadow.5 index 6f73d44f..4aaa888b 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "SHADOW" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SHADOW" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man5/suauth.5 b/man/it/man5/suauth.5 index 1b00ff17..81edbb84 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "SUAUTH" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SUAUTH" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/chgpasswd.8 b/man/it/man8/chgpasswd.8 index 381d5887..0a69400e 100644 --- a/man/it/man8/chgpasswd.8 +++ b/man/it/man8/chgpasswd.8 @@ -2,12 +2,12 @@ .\" Title: chgpasswd .\" Author: Thomas K\(/loczko .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "CHGPASSWD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "CHGPASSWD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/chpasswd.8 b/man/it/man8/chpasswd.8 index 15b22f55..ecd5ff09 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "CHPASSWD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "CHPASSWD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/faillog.8 b/man/it/man8/faillog.8 index d31a17b1..0d1c67f9 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "FAILLOG" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "FAILLOG" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/groupadd.8 b/man/it/man8/groupadd.8 index b9776091..a3aadeb8 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "GROUPADD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPADD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/groupdel.8 b/man/it/man8/groupdel.8 index 6b4b592a..cdbd2f3a 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "GROUPDEL" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPDEL" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/groupmems.8 b/man/it/man8/groupmems.8 index 9b2c0e22..c34fbcea 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "GROUPMEMS" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPMEMS" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/groupmod.8 b/man/it/man8/groupmod.8 index b7ae6c11..bc5092bc 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "GROUPMOD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPMOD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/grpck.8 b/man/it/man8/grpck.8 index 063f3d19..063f9ac5 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "GRPCK" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GRPCK" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/lastlog.8 b/man/it/man8/lastlog.8 index 8faa9232..f092c5cd 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "LASTLOG" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LASTLOG" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/logoutd.8 b/man/it/man8/logoutd.8 index b60132bf..361b8d36 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "LOGOUTD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LOGOUTD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/newusers.8 b/man/it/man8/newusers.8 index 651dada6..16fdd420 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "NEWUSERS" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "NEWUSERS" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/nologin.8 b/man/it/man8/nologin.8 index 10c276ac..f3cbd45b 100644 --- a/man/it/man8/nologin.8 +++ b/man/it/man8/nologin.8 @@ -2,12 +2,12 @@ .\" Title: nologin .\" Author: Nicolas Fran\(,cois .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "NOLOGIN" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "NOLOGIN" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/pwck.8 b/man/it/man8/pwck.8 index 9c4d3e7b..0036385f 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "PWCK" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "PWCK" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/pwconv.8 b/man/it/man8/pwconv.8 index b1bea599..7ed3a13e 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "PWCONV" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "PWCONV" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/sulogin.8 b/man/it/man8/sulogin.8 index 0feea133..a3e21fb2 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "SULOGIN" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "SULOGIN" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/useradd.8 b/man/it/man8/useradd.8 index 9810e72f..6c7ba40b 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "USERADD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERADD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/userdel.8 b/man/it/man8/userdel.8 index 439567d3..e4780835 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "USERDEL" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERDEL" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/usermod.8 b/man/it/man8/usermod.8 index 45432d14..456bdaa2 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "USERMOD" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERMOD" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/it/man8/vipw.8 b/man/it/man8/vipw.8 index 25c8127f..1dbe393c 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Italian .\" -.TH "VIPW" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "VIPW" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/chage.1 b/man/man1/chage.1 index 0998ae80..85726a2a 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "CHAGE" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHAGE" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/chfn.1 b/man/man1/chfn.1 index 315f32b4..54a769ea 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "CHFN" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHFN" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/chsh.1 b/man/man1/chsh.1 index 597f3ff2..80cf5c1c 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "CHSH" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHSH" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/expiry.1 b/man/man1/expiry.1 index 93dc97d3..b42dcd02 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "EXPIRY" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "EXPIRY" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/getsubids.1 b/man/man1/getsubids.1 index fa026b02..94b7bd22 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "GETSUBIDS" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "GETSUBIDS" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/gpasswd.1 b/man/man1/gpasswd.1 index 68810fc5..b3f9e3a8 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "GPASSWD" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "GPASSWD" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/groups.1 b/man/man1/groups.1 index 473f1ee7..a254efa0 100644 --- a/man/man1/groups.1 +++ b/man/man1/groups.1 @@ -2,12 +2,12 @@ .\" Title: groups .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "GROUPS" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "GROUPS" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/id.1 b/man/man1/id.1 index 34eb3492..4656074c 100644 --- a/man/man1/id.1 +++ b/man/man1/id.1 @@ -2,12 +2,12 @@ .\" Title: id .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "ID" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "ID" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/login.1 b/man/man1/login.1 index 36028e8a..2bf625fb 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "LOGIN" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "LOGIN" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/newgidmap.1 b/man/man1/newgidmap.1 index 7328aef0..9d51fb5c 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "NEWGIDMAP" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "NEWGIDMAP" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/newgrp.1 b/man/man1/newgrp.1 index 04cf7e70..832644b8 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "NEWGRP" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "NEWGRP" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/newuidmap.1 b/man/man1/newuidmap.1 index 71b7226c..2c2c4bed 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "NEWUIDMAP" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "NEWUIDMAP" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/passwd.1 b/man/man1/passwd.1 index 04a48c2f..79e1d59b 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "PASSWD" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "PASSWD" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/sg.1 b/man/man1/sg.1 index 1e104ab1..1f321a69 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "SG" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "SG" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man1/su.1 b/man/man1/su.1 index ebd26293..5c6f52a9 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "SU" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "SU" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man3/shadow.3 b/man/man3/shadow.3 index 8489607c..85dda38d 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: Library Calls -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "SHADOW" "3" "06/21/2024" "shadow\-utils 4\&.15\&.2" "Library Calls" +.TH "SHADOW" "3" "06/28/2024" "shadow\-utils 4\&.15\&.3" "Library Calls" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man5/faillog.5 b/man/man5/faillog.5 index ebf45b99..b7855bcd 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "FAILLOG" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuratio" +.TH "FAILLOG" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuratio" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man5/gshadow.5 b/man/man5/gshadow.5 index c3cdbea4..2a83e662 100644 --- a/man/man5/gshadow.5 +++ b/man/man5/gshadow.5 @@ -2,12 +2,12 @@ .\" Title: gshadow .\" Author: Nicolas François .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "GSHADOW" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "GSHADOW" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man5/limits.5 b/man/man5/limits.5 index e2f16110..71311fe2 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "LIMITS" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LIMITS" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man5/login.access.5 b/man/man5/login.access.5 index f7d5bc7d..52df4e0f 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "LOGIN\&.ACCESS" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LOGIN\&.ACCESS" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man5/login.defs.5 b/man/man5/login.defs.5 index 78522418..7c2c80c2 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "LOGIN\&.DEFS" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LOGIN\&.DEFS" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man5/passwd.5 b/man/man5/passwd.5 index 83c203f2..84c6cb9d 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "PASSWD" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "PASSWD" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man5/porttime.5 b/man/man5/porttime.5 index f59c016c..b090bb15 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "PORTTIME" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "PORTTIME" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man5/shadow.5 b/man/man5/shadow.5 index 706aa2b6..9c532e9b 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "SHADOW" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SHADOW" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man5/suauth.5 b/man/man5/suauth.5 index 533961d5..c4e8e1d3 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "SUAUTH" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SUAUTH" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man5/subgid.5 b/man/man5/subgid.5 index 5471ab78..994eea10 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "SUBGID" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SUBGID" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man5/subuid.5 b/man/man5/subuid.5 index 1e6ba8ac..b1c9fb5a 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "SUBUID" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SUBUID" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/chgpasswd.8 b/man/man8/chgpasswd.8 index b65edaf3..455b7a99 100644 --- a/man/man8/chgpasswd.8 +++ b/man/man8/chgpasswd.8 @@ -2,12 +2,12 @@ .\" Title: chgpasswd .\" Author: Thomas Kłoczko .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "CHGPASSWD" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "CHGPASSWD" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/chpasswd.8 b/man/man8/chpasswd.8 index 107f4aee..29203c3d 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "CHPASSWD" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "CHPASSWD" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/faillog.8 b/man/man8/faillog.8 index b5042c23..7c8e5791 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "FAILLOG" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "FAILLOG" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/groupadd.8 b/man/man8/groupadd.8 index 9ab8fb2a..ed0a2057 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "GROUPADD" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPADD" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/groupdel.8 b/man/man8/groupdel.8 index 8503eba7..c65e66ac 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "GROUPDEL" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPDEL" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/groupmems.8 b/man/man8/groupmems.8 index 3518fc07..4d523d1b 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "GROUPMEMS" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPMEMS" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/groupmod.8 b/man/man8/groupmod.8 index a1e695c5..f64ca2af 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "GROUPMOD" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPMOD" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/grpck.8 b/man/man8/grpck.8 index f4082944..5907eb3a 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "GRPCK" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GRPCK" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/lastlog.8 b/man/man8/lastlog.8 index 1bbda99f..d2613b64 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "LASTLOG" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LASTLOG" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/logoutd.8 b/man/man8/logoutd.8 index 6f7a8de7..d67b07d2 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "LOGOUTD" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LOGOUTD" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/newusers.8 b/man/man8/newusers.8 index 560ca0c9..6c4af56c 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "NEWUSERS" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "NEWUSERS" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/nologin.8 b/man/man8/nologin.8 index 64131b78..aa061d3d 100644 --- a/man/man8/nologin.8 +++ b/man/man8/nologin.8 @@ -2,12 +2,12 @@ .\" Title: nologin .\" Author: Nicolas François .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "NOLOGIN" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "NOLOGIN" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/pwck.8 b/man/man8/pwck.8 index 53fb29e5..5f6fadb7 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "PWCK" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "PWCK" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/pwconv.8 b/man/man8/pwconv.8 index 74a81fc4..b3a888d5 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "PWCONV" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "PWCONV" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/sulogin.8 b/man/man8/sulogin.8 index a1d81967..efae567e 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "SULOGIN" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "SULOGIN" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/useradd.8 b/man/man8/useradd.8 index 3ec476b3..840b7f16 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "USERADD" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERADD" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/userdel.8 b/man/man8/userdel.8 index 6ee18e91..f13fabce 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "USERDEL" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERDEL" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/usermod.8 b/man/man8/usermod.8 index 4b93a189..959f9939 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "USERMOD" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERMOD" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/man8/vipw.8 b/man/man8/vipw.8 index ba1b2e03..a8ca8f90 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: English .\" -.TH "VIPW" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "VIPW" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man1/chage.1 b/man/pl/man1/chage.1 index 7f0513b5..708fb576 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "CHAGE" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHAGE" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man1/chsh.1 b/man/pl/man1/chsh.1 index 58aa47b3..a3b3e99f 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "CHSH" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHSH" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man1/expiry.1 b/man/pl/man1/expiry.1 index 40d4fb9e..7b5c5c60 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "EXPIRY" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "EXPIRY" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man1/groups.1 b/man/pl/man1/groups.1 index 312e6828..59d75cfb 100644 --- a/man/pl/man1/groups.1 +++ b/man/pl/man1/groups.1 @@ -2,12 +2,12 @@ .\" Title: groups .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "GROUPS" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "GROUPS" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man1/id.1 b/man/pl/man1/id.1 index 74523a36..68d8c308 100644 --- a/man/pl/man1/id.1 +++ b/man/pl/man1/id.1 @@ -2,12 +2,12 @@ .\" Title: id .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "ID" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "ID" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man1/newgrp.1 b/man/pl/man1/newgrp.1 index 7604ea00..189a0d92 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "NEWGRP" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "NEWGRP" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man1/sg.1 b/man/pl/man1/sg.1 index 517013fb..5abd4e29 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "SG" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "SG" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man3/shadow.3 b/man/pl/man3/shadow.3 index de813ed4..6a7c497c 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: Library Calls -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "SHADOW" "3" "06/21/2024" "shadow\-utils 4\&.15\&.2" "Library Calls" +.TH "SHADOW" "3" "06/28/2024" "shadow\-utils 4\&.15\&.3" "Library Calls" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man5/faillog.5 b/man/pl/man5/faillog.5 index 66d970d5..44e6c68a 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "FAILLOG" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuratio" +.TH "FAILLOG" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuratio" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man5/porttime.5 b/man/pl/man5/porttime.5 index 62878bfc..cd35c140 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "PORTTIME" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "PORTTIME" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man8/faillog.8 b/man/pl/man8/faillog.8 index 7abd9e1a..91609064 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "FAILLOG" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "FAILLOG" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man8/groupadd.8 b/man/pl/man8/groupadd.8 index 4b0b811a..be25bcfa 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "GROUPADD" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPADD" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man8/groupdel.8 b/man/pl/man8/groupdel.8 index af2e67cb..a9d5e05c 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "GROUPDEL" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPDEL" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man8/groupmems.8 b/man/pl/man8/groupmems.8 index f0c5d4d0..2ecea4cd 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "GROUPMEMS" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPMEMS" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man8/groupmod.8 b/man/pl/man8/groupmod.8 index cfbd44c3..69d4f039 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "GROUPMOD" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPMOD" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man8/grpck.8 b/man/pl/man8/grpck.8 index 72c742f8..08509926 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "GRPCK" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GRPCK" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man8/lastlog.8 b/man/pl/man8/lastlog.8 index f0288ce5..f4a33162 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "LASTLOG" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LASTLOG" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man8/logoutd.8 b/man/pl/man8/logoutd.8 index 3e5665e7..9867953d 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "LOGOUTD" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LOGOUTD" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man8/userdel.8 b/man/pl/man8/userdel.8 index 147dffb1..9aca1719 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "USERDEL" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERDEL" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man8/usermod.8 b/man/pl/man8/usermod.8 index c5b06dba..137e14e6 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "USERMOD" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERMOD" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/pl/man8/vipw.8 b/man/pl/man8/vipw.8 index 2af9cd4c..18efe640 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Polish .\" -.TH "VIPW" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "VIPW" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man1/chage.1 b/man/ru/man1/chage.1 index fd2c3ece..50792b4d 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "chage" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "chage" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man1/chfn.1 b/man/ru/man1/chfn.1 index 6d7039e3..2e532365 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "chfn" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "chfn" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man1/chsh.1 b/man/ru/man1/chsh.1 index 20fcc1a8..9252191a 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "chsh" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "chsh" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man1/expiry.1 b/man/ru/man1/expiry.1 index 84d59b13..9a5cdbaf 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "expiry" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "expiry" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man1/gpasswd.1 b/man/ru/man1/gpasswd.1 index 976a154e..284a71b6 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "gpasswd" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "gpasswd" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man1/groups.1 b/man/ru/man1/groups.1 index 08a849a3..d57922ae 100644 --- a/man/ru/man1/groups.1 +++ b/man/ru/man1/groups.1 @@ -2,12 +2,12 @@ .\" Title: groups .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "groups" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "groups" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man1/id.1 b/man/ru/man1/id.1 index 75561921..8e3572b3 100644 --- a/man/ru/man1/id.1 +++ b/man/ru/man1/id.1 @@ -2,12 +2,12 @@ .\" Title: id .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "id" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "id" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man1/login.1 b/man/ru/man1/login.1 index e3b0720e..8395a906 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "login" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "login" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man1/newgrp.1 b/man/ru/man1/newgrp.1 index 4bf0c076..fe03245c 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "newgrp" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "newgrp" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man1/passwd.1 b/man/ru/man1/passwd.1 index 4fa5ce07..b5574232 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "passwd" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "passwd" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man1/sg.1 b/man/ru/man1/sg.1 index 6f87d74d..8deea4aa 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "sg" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "sg" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man1/su.1 b/man/ru/man1/su.1 index c47ada9e..4c2ef5aa 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "su" "1" "06/21/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "su" "1" "06/28/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man3/shadow.3 b/man/ru/man3/shadow.3 index 68d19f44..d0a03255 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: Library Calls -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "shadow" "3" "06/21/2024" "shadow\-utils 4\&.15\&.2" "Library Calls" +.TH "shadow" "3" "06/28/2024" "shadow\-utils 4\&.15\&.3" "Library Calls" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man5/faillog.5 b/man/ru/man5/faillog.5 index 26c9102d..23b1390d 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "faillog" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuratio" +.TH "faillog" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuratio" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man5/gshadow.5 b/man/ru/man5/gshadow.5 index e0ad132b..72d8bf5c 100644 --- a/man/ru/man5/gshadow.5 +++ b/man/ru/man5/gshadow.5 @@ -2,12 +2,12 @@ .\" Title: gshadow .\" Author: Nicolas Fran\(,cois .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "gshadow" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "gshadow" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man5/limits.5 b/man/ru/man5/limits.5 index da824718..72d002e3 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "limits" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "limits" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "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 4ca9898d..a962da00 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "login\&.access" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "login\&.access" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "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 1f4bc48d..b6d50389 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "login\&.defs" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "login\&.defs" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man5/passwd.5 b/man/ru/man5/passwd.5 index 8a3aeed2..d56b3478 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "passwd" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "passwd" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man5/porttime.5 b/man/ru/man5/porttime.5 index 38065be1..4d99e87a 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "porttime" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "porttime" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man5/shadow.5 b/man/ru/man5/shadow.5 index 3145f93a..84c1a57e 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "shadow" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "shadow" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man5/suauth.5 b/man/ru/man5/suauth.5 index 44fa4e07..663e2123 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "suauth" "5" "06/21/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "suauth" "5" "06/28/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/chgpasswd.8 b/man/ru/man8/chgpasswd.8 index 868d573e..ef94e4ba 100644 --- a/man/ru/man8/chgpasswd.8 +++ b/man/ru/man8/chgpasswd.8 @@ -2,12 +2,12 @@ .\" Title: chgpasswd .\" Author: Thomas K\(/loczko .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "chgpasswd" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "chgpasswd" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/chpasswd.8 b/man/ru/man8/chpasswd.8 index d0ffacb9..bebbaf2b 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "chpasswd" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "chpasswd" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/faillog.8 b/man/ru/man8/faillog.8 index 017e0bb4..de22079a 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "faillog" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "faillog" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/groupadd.8 b/man/ru/man8/groupadd.8 index f0942ef5..20f7b2ac 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "groupadd" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "groupadd" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/groupdel.8 b/man/ru/man8/groupdel.8 index 949d9841..0968366a 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "groupdel" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "groupdel" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/groupmems.8 b/man/ru/man8/groupmems.8 index a3ef2fa6..b1dd8c2f 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "groupmems" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "groupmems" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/groupmod.8 b/man/ru/man8/groupmod.8 index f0e4b262..f669e08a 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "groupmod" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "groupmod" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/grpck.8 b/man/ru/man8/grpck.8 index 39ebad19..5514b2a5 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "grpck" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "grpck" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/lastlog.8 b/man/ru/man8/lastlog.8 index cd96dfb9..93e8ccf2 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "lastlog" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "lastlog" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/logoutd.8 b/man/ru/man8/logoutd.8 index 20b26e74..c5ece1e9 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "logoutd" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "logoutd" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/newusers.8 b/man/ru/man8/newusers.8 index d01897a7..762fde81 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "newusers" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "newusers" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/nologin.8 b/man/ru/man8/nologin.8 index dd071b9e..87d1a050 100644 --- a/man/ru/man8/nologin.8 +++ b/man/ru/man8/nologin.8 @@ -2,12 +2,12 @@ .\" Title: nologin .\" Author: Nicolas Fran\(,cois .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "nologin" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "nologin" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/pwck.8 b/man/ru/man8/pwck.8 index b052af45..33d35b0c 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "pwck" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "pwck" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/pwconv.8 b/man/ru/man8/pwconv.8 index 1dafb35f..19f8a0c3 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "pwconv" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "pwconv" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/sulogin.8 b/man/ru/man8/sulogin.8 index 37e61c99..91e5fd2c 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "sulogin" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "sulogin" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/useradd.8 b/man/ru/man8/useradd.8 index 336ab741..0dd6f5f6 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "useradd" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "useradd" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/userdel.8 b/man/ru/man8/userdel.8 index 7d1c3179..e25d8399 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "userdel" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "userdel" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/usermod.8 b/man/ru/man8/usermod.8 index fd85384e..ff36d8bc 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "usermod" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "usermod" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/ru/man8/vipw.8 b/man/ru/man8/vipw.8 index 82712edd..c80b1eca 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 -.\" Date: 06/21/2024 +.\" Date: 06/28/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Russian .\" -.TH "vipw" "8" "06/21/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "vipw" "8" "06/28/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man1/chage.1 b/man/sv/man1/chage.1 index 5e9c0979..e881b898 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "CHAGE" "1" "21-06-2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHAGE" "1" "28-06-2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man1/chsh.1 b/man/sv/man1/chsh.1 index 1a8f1dbf..4daba49d 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "CHSH" "1" "21-06-2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHSH" "1" "28-06-2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man1/expiry.1 b/man/sv/man1/expiry.1 index f9625cc1..f17a208a 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "EXPIRY" "1" "21-06-2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "EXPIRY" "1" "28-06-2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man1/groups.1 b/man/sv/man1/groups.1 index 886569a3..ef277023 100644 --- a/man/sv/man1/groups.1 +++ b/man/sv/man1/groups.1 @@ -2,12 +2,12 @@ .\" Title: groups .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "GROUPS" "1" "21-06-2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "GROUPS" "1" "28-06-2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man1/id.1 b/man/sv/man1/id.1 index 4ae10de5..a65ec5e8 100644 --- a/man/sv/man1/id.1 +++ b/man/sv/man1/id.1 @@ -2,12 +2,12 @@ .\" Title: id .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "ID" "1" "21-06-2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "ID" "1" "28-06-2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man1/newgrp.1 b/man/sv/man1/newgrp.1 index 3dbce36c..302d43ec 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "NEWGRP" "1" "21-06-2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "NEWGRP" "1" "28-06-2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man1/passwd.1 b/man/sv/man1/passwd.1 index 6259499a..a344f2fa 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "PASSWD" "1" "21-06-2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "PASSWD" "1" "28-06-2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man1/sg.1 b/man/sv/man1/sg.1 index 967f2274..12a9cf81 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "SG" "1" "21-06-2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "SG" "1" "28-06-2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man3/shadow.3 b/man/sv/man3/shadow.3 index a2de94d0..04ab663d 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: Library Calls -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "SHADOW" "3" "21-06-2024" "shadow\-utils 4\&.15\&.2" "Library Calls" +.TH "SHADOW" "3" "28-06-2024" "shadow\-utils 4\&.15\&.3" "Library Calls" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man5/faillog.5 b/man/sv/man5/faillog.5 index f4a5f759..27943085 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "FAILLOG" "5" "21-06-2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuratio" +.TH "FAILLOG" "5" "28-06-2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuratio" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man5/gshadow.5 b/man/sv/man5/gshadow.5 index d90374a5..bfc2dfcc 100644 --- a/man/sv/man5/gshadow.5 +++ b/man/sv/man5/gshadow.5 @@ -2,12 +2,12 @@ .\" Title: gshadow .\" Author: Nicolas Fran\(,cois .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "GSHADOW" "5" "21-06-2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "GSHADOW" "5" "28-06-2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man5/limits.5 b/man/sv/man5/limits.5 index 647d8566..62fc2356 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "LIMITS" "5" "21-06-2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LIMITS" "5" "28-06-2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man5/passwd.5 b/man/sv/man5/passwd.5 index 2d362b8b..d06455e5 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "PASSWD" "5" "21-06-2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "PASSWD" "5" "28-06-2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man5/porttime.5 b/man/sv/man5/porttime.5 index e1da89a7..b7e0a68b 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "PORTTIME" "5" "21-06-2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "PORTTIME" "5" "28-06-2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man5/suauth.5 b/man/sv/man5/suauth.5 index 2caf2d39..db4b50d2 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "SUAUTH" "5" "21-06-2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SUAUTH" "5" "28-06-2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man8/faillog.8 b/man/sv/man8/faillog.8 index 98263bf5..cbe113e0 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "FAILLOG" "8" "21-06-2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "FAILLOG" "8" "28-06-2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man8/groupadd.8 b/man/sv/man8/groupadd.8 index 3bfea6f9..19f66c95 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "GROUPADD" "8" "21-06-2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPADD" "8" "28-06-2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man8/groupdel.8 b/man/sv/man8/groupdel.8 index 8b66eb6f..1e7cb1cb 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "GROUPDEL" "8" "21-06-2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPDEL" "8" "28-06-2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man8/groupmems.8 b/man/sv/man8/groupmems.8 index 4203d4a7..a92e7279 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "GROUPMEMS" "8" "21-06-2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPMEMS" "8" "28-06-2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man8/groupmod.8 b/man/sv/man8/groupmod.8 index d72f8002..f1d02b6c 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "GROUPMOD" "8" "21-06-2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPMOD" "8" "28-06-2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man8/grpck.8 b/man/sv/man8/grpck.8 index 665a4c21..333ee0b5 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "GRPCK" "8" "21-06-2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GRPCK" "8" "28-06-2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man8/lastlog.8 b/man/sv/man8/lastlog.8 index bf36f8dc..fe4ef1ff 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "LASTLOG" "8" "21-06-2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LASTLOG" "8" "28-06-2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man8/logoutd.8 b/man/sv/man8/logoutd.8 index 12677d86..f357c2f0 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "LOGOUTD" "8" "21-06-2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LOGOUTD" "8" "28-06-2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man8/nologin.8 b/man/sv/man8/nologin.8 index b943388d..968ce38f 100644 --- a/man/sv/man8/nologin.8 +++ b/man/sv/man8/nologin.8 @@ -2,12 +2,12 @@ .\" Title: nologin .\" Author: Nicolas Fran\(,cois .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "NOLOGIN" "8" "21-06-2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "NOLOGIN" "8" "28-06-2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man8/pwck.8 b/man/sv/man8/pwck.8 index fff09528..d75fed0c 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "PWCK" "8" "21-06-2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "PWCK" "8" "28-06-2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man8/userdel.8 b/man/sv/man8/userdel.8 index c80ef7f2..839a2111 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "USERDEL" "8" "21-06-2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERDEL" "8" "28-06-2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/sv/man8/vipw.8 b/man/sv/man8/vipw.8 index 4dc34dc2..eef7c9d3 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 -.\" Date: 21-06-2024 +.\" Date: 28-06-2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Swedish .\" -.TH "VIPW" "8" "21-06-2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "VIPW" "8" "28-06-2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man1/chage.1 b/man/uk/man1/chage.1 index 3f51fd37..7da2ef8e 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "chage" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "chage" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man1/chfn.1 b/man/uk/man1/chfn.1 index fbce48e1..896ec708 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "chfn" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "chfn" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man1/chsh.1 b/man/uk/man1/chsh.1 index 50d1566d..63e2f372 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "chsh" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "chsh" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man1/expiry.1 b/man/uk/man1/expiry.1 index fc6211be..cdbd01c1 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "expiry" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "expiry" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man1/gpasswd.1 b/man/uk/man1/gpasswd.1 index 6e872c87..f03d882c 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "gpasswd" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "gpasswd" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man1/groups.1 b/man/uk/man1/groups.1 index 420b9356..de91d567 100644 --- a/man/uk/man1/groups.1 +++ b/man/uk/man1/groups.1 @@ -2,12 +2,12 @@ .\" Title: groups .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "groups" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "groups" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man1/id.1 b/man/uk/man1/id.1 index f37ac67e..5b70e685 100644 --- a/man/uk/man1/id.1 +++ b/man/uk/man1/id.1 @@ -2,12 +2,12 @@ .\" Title: id .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "id" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "id" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man1/login.1 b/man/uk/man1/login.1 index 411f26d0..c63cc43e 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "login" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "login" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man1/newgrp.1 b/man/uk/man1/newgrp.1 index 94f09746..0f5dc388 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "newgrp" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "newgrp" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man1/passwd.1 b/man/uk/man1/passwd.1 index cf6d8096..960fe6ab 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "passwd" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "passwd" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man1/sg.1 b/man/uk/man1/sg.1 index df439f4d..4320dc1d 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "sg" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "sg" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man1/su.1 b/man/uk/man1/su.1 index 722a9ba5..ff2ce4b5 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "su" "1" "21/06/2024" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "su" "1" "28/06/2024" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man3/shadow.3 b/man/uk/man3/shadow.3 index 06391085..2b5df100 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: Library Calls -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "shadow" "3" "21/06/2024" "shadow\-utils 4\&.15\&.2" "Library Calls" +.TH "shadow" "3" "28/06/2024" "shadow\-utils 4\&.15\&.3" "Library Calls" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man5/faillog.5 b/man/uk/man5/faillog.5 index 23632071..c797ea0a 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "faillog" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuratio" +.TH "faillog" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuratio" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man5/gshadow.5 b/man/uk/man5/gshadow.5 index 68fd5efc..573c5271 100644 --- a/man/uk/man5/gshadow.5 +++ b/man/uk/man5/gshadow.5 @@ -2,12 +2,12 @@ .\" Title: gshadow .\" Author: Nicolas Fran\(,cois .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "gshadow" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "gshadow" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man5/login.access.5 b/man/uk/man5/login.access.5 index 9d1669af..db8a8a47 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "login\&.access" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "login\&.access" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "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 d075f740..9b1350f0 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "login\&.defs" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "login\&.defs" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man5/passwd.5 b/man/uk/man5/passwd.5 index 280322d9..e87dd0db 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "passwd" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "passwd" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man5/porttime.5 b/man/uk/man5/porttime.5 index 690a22e6..dcb18158 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "porttime" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "porttime" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man5/shadow.5 b/man/uk/man5/shadow.5 index 9780f750..83678f08 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "shadow" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "shadow" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man5/suauth.5 b/man/uk/man5/suauth.5 index 4f5e91c0..953854d6 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "suauth" "5" "21/06/2024" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "suauth" "5" "28/06/2024" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/chgpasswd.8 b/man/uk/man8/chgpasswd.8 index 7a067ef5..f061c9e0 100644 --- a/man/uk/man8/chgpasswd.8 +++ b/man/uk/man8/chgpasswd.8 @@ -2,12 +2,12 @@ .\" Title: chgpasswd .\" Author: Thomas K\(/loczko .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "chgpasswd" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "chgpasswd" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/chpasswd.8 b/man/uk/man8/chpasswd.8 index 7b7d86b6..780b4ba3 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "chpasswd" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "chpasswd" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/faillog.8 b/man/uk/man8/faillog.8 index f19d424e..58fe903a 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "faillog" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "faillog" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/groupadd.8 b/man/uk/man8/groupadd.8 index 32685412..20367ec5 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "groupadd" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "groupadd" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/groupdel.8 b/man/uk/man8/groupdel.8 index dbbf8e7a..de50b6fa 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "groupdel" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "groupdel" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/groupmems.8 b/man/uk/man8/groupmems.8 index 6270c579..ee5419f9 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "groupmems" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "groupmems" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/groupmod.8 b/man/uk/man8/groupmod.8 index 0e584c15..92fa2eb9 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "groupmod" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "groupmod" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/grpck.8 b/man/uk/man8/grpck.8 index 3e574d99..45280bff 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "grpck" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "grpck" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/lastlog.8 b/man/uk/man8/lastlog.8 index 0fdc9f2a..9add8976 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "lastlog" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "lastlog" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/logoutd.8 b/man/uk/man8/logoutd.8 index f86a741a..440dfcd6 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "logoutd" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "logoutd" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/newusers.8 b/man/uk/man8/newusers.8 index 1bc4f25c..55cb4479 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "newusers" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "newusers" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/nologin.8 b/man/uk/man8/nologin.8 index ae3599b8..8bce57c1 100644 --- a/man/uk/man8/nologin.8 +++ b/man/uk/man8/nologin.8 @@ -2,12 +2,12 @@ .\" Title: nologin .\" Author: Nicolas Fran\(,cois .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "nologin" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "nologin" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/pwck.8 b/man/uk/man8/pwck.8 index bb3c08d7..e7f038b8 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "pwck" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "pwck" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/pwconv.8 b/man/uk/man8/pwconv.8 index 9f2ec23e..e0ae539c 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "pwconv" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "pwconv" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/sulogin.8 b/man/uk/man8/sulogin.8 index 66496cad..ce9d7443 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "sulogin" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "sulogin" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/useradd.8 b/man/uk/man8/useradd.8 index 573e877e..8943af59 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "useradd" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "useradd" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/userdel.8 b/man/uk/man8/userdel.8 index 014809ec..0c8dae2a 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "userdel" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "userdel" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/usermod.8 b/man/uk/man8/usermod.8 index 66e68610..fe151c74 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "usermod" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "usermod" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/uk/man8/vipw.8 b/man/uk/man8/vipw.8 index d0bb175b..f3b13b04 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 -.\" Date: 21/06/2024 +.\" Date: 28/06/2024 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Ukrainian .\" -.TH "vipw" "8" "21/06/2024" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "vipw" "8" "28/06/2024" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/chage.1 b/man/zh_CN/man1/chage.1 index 88d574ac..0ba783ed 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "CHAGE" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHAGE" "1" "2024-06-28" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/chfn.1 b/man/zh_CN/man1/chfn.1 index 17ed9717..7ebe4191 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "CHFN" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHFN" "1" "2024-06-28" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/chsh.1 b/man/zh_CN/man1/chsh.1 index 52c6dee4..d6fce32f 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "CHSH" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "CHSH" "1" "2024-06-28" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/expiry.1 b/man/zh_CN/man1/expiry.1 index e4b528b5..9af44086 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "EXPIRY" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "EXPIRY" "1" "2024-06-28" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/gpasswd.1 b/man/zh_CN/man1/gpasswd.1 index 8648209d..2c7713de 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "GPASSWD" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "GPASSWD" "1" "2024-06-28" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/groups.1 b/man/zh_CN/man1/groups.1 index d7b66f9f..4fc5320a 100644 --- a/man/zh_CN/man1/groups.1 +++ b/man/zh_CN/man1/groups.1 @@ -2,12 +2,12 @@ .\" Title: groups .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "GROUPS" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "GROUPS" "1" "2024-06-28" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/id.1 b/man/zh_CN/man1/id.1 index 30f53a7f..9bb5e4ad 100644 --- a/man/zh_CN/man1/id.1 +++ b/man/zh_CN/man1/id.1 @@ -2,12 +2,12 @@ .\" Title: id .\" Author: Julianne Frances Haugh .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "ID" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "ID" "1" "2024-06-28" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/login.1 b/man/zh_CN/man1/login.1 index 03f92b8b..41962868 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "LOGIN" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "LOGIN" "1" "2024-06-28" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/newgrp.1 b/man/zh_CN/man1/newgrp.1 index f34266c6..81729552 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "NEWGRP" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "NEWGRP" "1" "2024-06-28" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/passwd.1 b/man/zh_CN/man1/passwd.1 index cfc00166..935f5a04 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "PASSWD" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "PASSWD" "1" "2024-06-28" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/sg.1 b/man/zh_CN/man1/sg.1 index 163e0b2c..450fe8a1 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "SG" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "SG" "1" "2024-06-28" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man1/su.1 b/man/zh_CN/man1/su.1 index 51cde5cb..7453b06f 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: User Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "SU" "1" "2024-06-21" "shadow\-utils 4\&.15\&.2" "User Commands" +.TH "SU" "1" "2024-06-28" "shadow\-utils 4\&.15\&.3" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man3/shadow.3 b/man/zh_CN/man3/shadow.3 index 8521b3a7..746169e6 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: Library Calls -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "SHADOW" "3" "2024-06-21" "shadow\-utils 4\&.15\&.2" "Library Calls" +.TH "SHADOW" "3" "2024-06-28" "shadow\-utils 4\&.15\&.3" "Library Calls" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man5/faillog.5 b/man/zh_CN/man5/faillog.5 index 7603c8e5..60db2dec 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "FAILLOG" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuratio" +.TH "FAILLOG" "5" "2024-06-28" "shadow\-utils 4\&.15\&.3" "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 3faeb89e..c3a94970 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 .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "GSHADOW" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "GSHADOW" "5" "2024-06-28" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man5/limits.5 b/man/zh_CN/man5/limits.5 index 18aa71ed..d869fcc2 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "LIMITS" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LIMITS" "5" "2024-06-28" "shadow\-utils 4\&.15\&.3" "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 f4aaabd0..8072f67a 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "LOGIN\&.ACCESS" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LOGIN\&.ACCESS" "5" "2024-06-28" "shadow\-utils 4\&.15\&.3" "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 f53439fe..4aec5db5 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "LOGIN\&.DEFS" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "LOGIN\&.DEFS" "5" "2024-06-28" "shadow\-utils 4\&.15\&.3" "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 eeb6262f..1fb5e2b3 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "PASSWD" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "PASSWD" "5" "2024-06-28" "shadow\-utils 4\&.15\&.3" "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 31991372..d460d85c 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "PORTTIME" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "PORTTIME" "5" "2024-06-28" "shadow\-utils 4\&.15\&.3" "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 7991081b..9c4d7a85 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "SHADOW" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SHADOW" "5" "2024-06-28" "shadow\-utils 4\&.15\&.3" "File Formats and Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man5/suauth.5 b/man/zh_CN/man5/suauth.5 index 176649b1..ddb9b8d5 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: File Formats and Configuration Files -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "SUAUTH" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration" +.TH "SUAUTH" "5" "2024-06-28" "shadow\-utils 4\&.15\&.3" "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 29228e1d..5cef91c1 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 .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "CHGPASSWD" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "CHGPASSWD" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/chpasswd.8 b/man/zh_CN/man8/chpasswd.8 index 3729e51d..6acced21 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "CHPASSWD" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "CHPASSWD" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/faillog.8 b/man/zh_CN/man8/faillog.8 index 0151be41..27b4dac5 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "FAILLOG" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "FAILLOG" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/groupadd.8 b/man/zh_CN/man8/groupadd.8 index 5f846fc5..f31690d5 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "GROUPADD" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPADD" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/groupdel.8 b/man/zh_CN/man8/groupdel.8 index 6cd0f67c..e55a831e 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "GROUPDEL" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPDEL" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/groupmems.8 b/man/zh_CN/man8/groupmems.8 index 85708095..b2c740ab 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "GROUPMEMS" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPMEMS" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/groupmod.8 b/man/zh_CN/man8/groupmod.8 index 79b5648a..487d55dd 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "GROUPMOD" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GROUPMOD" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/grpck.8 b/man/zh_CN/man8/grpck.8 index 38a7a9d8..7a56eda2 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "GRPCK" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "GRPCK" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/lastlog.8 b/man/zh_CN/man8/lastlog.8 index 30ab644e..da2b9a54 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "LASTLOG" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LASTLOG" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/logoutd.8 b/man/zh_CN/man8/logoutd.8 index bded7566..0b30dcad 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "LOGOUTD" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "LOGOUTD" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/newusers.8 b/man/zh_CN/man8/newusers.8 index 7f31ec0a..7d0fc64b 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "NEWUSERS" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "NEWUSERS" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/nologin.8 b/man/zh_CN/man8/nologin.8 index a5cc0d2e..7a9bd47f 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 .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "NOLOGIN" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "NOLOGIN" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/pwck.8 b/man/zh_CN/man8/pwck.8 index b3088a2b..0a0ff7d4 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "PWCK" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "PWCK" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/pwconv.8 b/man/zh_CN/man8/pwconv.8 index cc29defe..314b5a26 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "PWCONV" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "PWCONV" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/sulogin.8 b/man/zh_CN/man8/sulogin.8 index 555b60de..74bdc8f6 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "SULOGIN" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "SULOGIN" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/useradd.8 b/man/zh_CN/man8/useradd.8 index 17391755..3f29c079 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "USERADD" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERADD" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/userdel.8 b/man/zh_CN/man8/userdel.8 index d03dd71f..60cc3e4a 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "USERDEL" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERDEL" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/usermod.8 b/man/zh_CN/man8/usermod.8 index 6bc9f597..3745e6bd 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "USERMOD" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "USERMOD" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/zh_CN/man8/vipw.8 b/man/zh_CN/man8/vipw.8 index c28295d8..15fe21c4 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 -.\" Date: 2024-06-21 +.\" Date: 2024-06-28 .\" Manual: System Management Commands -.\" Source: shadow-utils 4.15.2 +.\" Source: shadow-utils 4.15.3 .\" Language: Chinese Simplified .\" -.TH "VIPW" "8" "2024-06-21" "shadow\-utils 4\&.15\&.2" "System Management Commands" +.TH "VIPW" "8" "2024-06-28" "shadow\-utils 4\&.15\&.3" "System Management Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/po/bs.po b/po/bs.po index e97797c1..d8ff4d6a 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2004-05-09 12:03+0100\n" "Last-Translator: Safir Šećerović \n" "Language-Team: Bosnian \n" diff --git a/po/ca.po b/po/ca.po index 87a8d251..acfcc9bb 100644 --- a/po/ca.po +++ b/po/ca.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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2012-01-22 18:25+0100\n" "Last-Translator: Innocent De Marchi \n" "Language-Team: Catalan \n" diff --git a/po/cs.po b/po/cs.po index b5808596..cb45fea3 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2014-08-24 15:07+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" diff --git a/po/da.po b/po/da.po index cba6dc0b..3eceb6d2 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2012-01-26 23:57+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index fdf8c34e..5c57b78d 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2020-09-22 15:10+0200\n" "Last-Translator: Björn Esser \n" "Language-Team: German \n" diff --git a/po/dz.po b/po/dz.po index 16c7923e..1a5efea9 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2006-06-01 15:28+0530\n" "Last-Translator: Jurmey Rabgay \n" "Language-Team: dzongkha \n" diff --git a/po/el.po b/po/el.po index c1e8ee88..25ad63eb 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2012-01-21 00:22+0200\n" "Last-Translator: Thomas Vasileiou \n" "Language-Team: Greek \n" diff --git a/po/es.po b/po/es.po index b03242f3..e01bf8b8 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2011-11-23 23:56+0100\n" "Last-Translator: Francisco Javier Cuadrado \n" "Language-Team: Debian l10n Spanish \n" diff --git a/po/eu.po b/po/eu.po index 127e09be..1aab0800 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2011-11-26 19:42+0100\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" diff --git a/po/fi.po b/po/fi.po index 2514406d..8b8e226d 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2007-11-24 22:54+0100\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index 528d4079..946e855a 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2023-04-26 20:04+0200\n" "Last-Translator: bubu \n" "Language-Team: French \n" diff --git a/po/gl.po b/po/gl.po index ae9d92e7..99e0e7b2 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2006-07-18 23:27+0200\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" diff --git a/po/he.po b/po/he.po index 4e31a7c9..f008d996 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2004-07-21 23:59+0300\n" "Last-Translator: Lior Kaplan \n" "Language-Team: Hebrew \n" diff --git a/po/hu.po b/po/hu.po index c2a2cda0..e9a27a2b 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2007-11-25 20:56+0100\n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: Hungarian \n" diff --git a/po/id.po b/po/id.po index 5cb0af88..b3c210da 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2007-11-25 20:58+0100\n" "Last-Translator: Parlin Imanuel Toh \n" "Language-Team: Debian Indonesia \n" diff --git a/po/it.po b/po/it.po index 28eaa85a..d05d7f85 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2008-03-27 14:40+0100\n" "Last-Translator: Danilo Piazzalunga \n" "Language-Team: Italian \n" diff --git a/po/ja.po b/po/ja.po index a047a8ad..e69e890d 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2012-05-21 02:52+0900\n" "Last-Translator: NAKANO Takeo \n" "Language-Team: Japanese \n" diff --git a/po/ka.po b/po/ka.po index 3fb19152..609afa0f 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2024-02-08 06:13+0100\n" "Last-Translator: Temuri Doghonadze \n" "Language-Team: Georgian <(nothing)>\n" diff --git a/po/kk.gmo b/po/kk.gmo index ccf7c739..7cd3c694 100644 Binary files a/po/kk.gmo and b/po/kk.gmo differ diff --git a/po/kk.po b/po/kk.po index eb67d72c..50314f60 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2017-02-07 17:09+0500\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" diff --git a/po/km.po b/po/km.po index b62ee8ff..e35987ab 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2006-06-28 10:08+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" diff --git a/po/ko.po b/po/ko.po index 1a9c67a1..c1e786e6 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2009-04-19 21:32+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" diff --git a/po/nb.po b/po/nb.po index c7ef84aa..f2552285 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2018-03-05 12:33+0100\n" "Last-Translator: Åka Sikrom \n" "Language-Team: Norwegian Bokmål \n" diff --git a/po/ne.po b/po/ne.po index 826ef6ce..4fafd66e 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2006-06-16 14:30+0545\n" "Last-Translator: Shiva Pokharel \n" "Language-Team: Nepali \n" diff --git a/po/nl.po b/po/nl.po index 1a48326b..f0d3dd89 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2024-05-09 12:30+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" diff --git a/po/nn.po b/po/nn.po index 01f77341..504d7699 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2004-06-03 21:41+0200\n" "Last-Translator: Håvard Korsvoll \n" "Language-Team: Norwegian (Nynorsk) \n" diff --git a/po/pl.po b/po/pl.po index 35e562ff..1ec774f5 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2007-11-25 20:53+0100\n" "Last-Translator: Tomasz Kłoczko \n" "Language-Team: Polish \n" diff --git a/po/pt.po b/po/pt.po index 84a37dff..33702a21 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2012-01-14 12:41+0000\n" "Last-Translator: Miguel Figueiredo \n" "Language-Team: Portuguese \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 6fcf8526..5995e22c 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2011-11-25 20:20+0100\n" "Last-Translator: Fred Ulisses Maranhão \n" "Language-Team: Debian-BR Project \n" diff --git a/po/ro.po b/po/ro.po index a700cbb2..a4e4a66a 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2007-11-26 18:18+0100\n" "Last-Translator: Sorin Batariuc \n" "Language-Team: Romanian \n" diff --git a/po/ru.po b/po/ru.po index f3f1d0d5..422f3595 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2017-03-05 11:14+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" diff --git a/po/shadow.pot b/po/shadow.pot index bf30c54e..90331784 100644 --- a/po/shadow.pot +++ b/po/shadow.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: shadow 4.15.2\n" +"Project-Id-Version: shadow 4.15.3\n" "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n" -"POT-Creation-Date: 2024-06-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/sk.po b/po/sk.po index 82e046ed..61a7f7b2 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2011-11-26 22:06+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" diff --git a/po/sq.po b/po/sq.po index 0a475b5a..b084c446 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2004-11-20 03:28+0100\n" "Last-Translator: Elian Myftiu \n" "Language-Team: Albanian \n" diff --git a/po/sv.po b/po/sv.po index 4443c441..2e3f3f20 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2011-11-25 22:08+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" diff --git a/po/tl.po b/po/tl.po index 9a04b6c2..0fb37a4c 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2007-11-26 21:34+0100\n" "Last-Translator: Eric Pareja \n" "Language-Team: Tagalog \n" diff --git a/po/tr.po b/po/tr.po index 80c5dc41..76c56b87 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2008-03-29 20:31+0200\n" "Last-Translator: Mehmet Türker \n" "Language-Team: Türkçe \n" diff --git a/po/uk.po b/po/uk.po index eb2407e5..8b3874a7 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2022-05-16 19:32+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" diff --git a/po/vi.po b/po/vi.po index b3f51f7d..87257121 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2016-10-04 07:07+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index d429d782..04ce20f2 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2022-07-27 23:04+0800\n" "Last-Translator: Celeste Liu \n" "Language-Team: Chinese (simplified) \n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 709f5660..403b9d56 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-21 11:23+0200\n" +"POT-Creation-Date: 2024-06-28 23:49+0200\n" "PO-Revision-Date: 2022-07-27 23:04+0800\n" "Last-Translator: Celeste Liu \n" "Language-Team: Chinese \n" 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/bug332198-test.exp b/tests/bug332198-test.exp similarity index 100% rename from tests/tests/bug332198-test.exp rename to tests/bug332198-test.exp 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/cptools/01/data/group b/tests/cptools/01/data/group similarity index 100% rename from tests/tests/cptools/01/data/group rename to tests/cptools/01/data/group diff --git a/tests/tests/cptools/01/data/group.new b/tests/cptools/01/data/group.new similarity index 100% rename from tests/tests/cptools/01/data/group.new rename to tests/cptools/01/data/group.new diff --git a/tests/tests/cptools/01/data/gshadow b/tests/cptools/01/data/gshadow similarity index 100% rename from tests/tests/cptools/01/data/gshadow rename to tests/cptools/01/data/gshadow diff --git a/tests/tests/cptools/01/data/gshadow.new b/tests/cptools/01/data/gshadow.new similarity index 100% rename from tests/tests/cptools/01/data/gshadow.new rename to tests/cptools/01/data/gshadow.new diff --git a/tests/tests/cptools/01/data/passwd b/tests/cptools/01/data/passwd similarity index 100% rename from tests/tests/cptools/01/data/passwd rename to tests/cptools/01/data/passwd diff --git a/tests/tests/cptools/01/data/passwd.new b/tests/cptools/01/data/passwd.new similarity index 100% rename from tests/tests/cptools/01/data/passwd.new rename to tests/cptools/01/data/passwd.new diff --git a/tests/tests/cptools/01/data/shadow b/tests/cptools/01/data/shadow similarity index 100% rename from tests/tests/cptools/01/data/shadow rename to tests/cptools/01/data/shadow diff --git a/tests/tests/cptools/01/data/shadow.new b/tests/cptools/01/data/shadow.new similarity index 100% rename from tests/tests/cptools/01/data/shadow.new rename to tests/cptools/01/data/shadow.new diff --git a/tests/tests/cptools/01/run1 b/tests/cptools/01/run1 similarity index 100% rename from tests/tests/cptools/01/run1 rename to tests/cptools/01/run1 diff --git a/tests/tests/cptools/01/run2 b/tests/cptools/01/run2 similarity index 100% rename from tests/tests/cptools/01/run2 rename to tests/cptools/01/run2 diff --git a/tests/tests/cptools/01/run3 b/tests/cptools/01/run3 similarity index 100% rename from tests/tests/cptools/01/run3 rename to tests/cptools/01/run3 diff --git a/tests/tests/cptools/01/run4 b/tests/cptools/01/run4 similarity index 100% rename from tests/tests/cptools/01/run4 rename to tests/cptools/01/run4 diff --git a/tests/tests/cptools/02_cppw_usage/config.txt b/tests/cptools/02_cppw_usage/config.txt similarity index 100% rename from tests/tests/cptools/02_cppw_usage/config.txt rename to tests/cptools/02_cppw_usage/config.txt diff --git a/tests/tests/cptools/02_cppw_usage/config/etc/group b/tests/cptools/02_cppw_usage/config/etc/group similarity index 100% rename from tests/tests/cptools/02_cppw_usage/config/etc/group rename to tests/cptools/02_cppw_usage/config/etc/group diff --git a/tests/tests/cptools/02_cppw_usage/config/etc/gshadow b/tests/cptools/02_cppw_usage/config/etc/gshadow similarity index 100% rename from tests/tests/cptools/02_cppw_usage/config/etc/gshadow rename to tests/cptools/02_cppw_usage/config/etc/gshadow diff --git a/tests/tests/cptools/02_cppw_usage/config/etc/passwd b/tests/cptools/02_cppw_usage/config/etc/passwd similarity index 100% rename from tests/tests/cptools/02_cppw_usage/config/etc/passwd rename to tests/cptools/02_cppw_usage/config/etc/passwd diff --git a/tests/tests/cptools/02_cppw_usage/config/etc/shadow b/tests/cptools/02_cppw_usage/config/etc/shadow similarity index 100% rename from tests/tests/cptools/02_cppw_usage/config/etc/shadow rename to tests/cptools/02_cppw_usage/config/etc/shadow diff --git a/tests/tests/cptools/02_cppw_usage/cppw.test b/tests/cptools/02_cppw_usage/cppw.test similarity index 100% rename from tests/tests/cptools/02_cppw_usage/cppw.test rename to tests/cptools/02_cppw_usage/cppw.test diff --git a/tests/tests/cptools/02_cppw_usage/data/usage.out b/tests/cptools/02_cppw_usage/data/usage.out similarity index 100% rename from tests/tests/cptools/02_cppw_usage/data/usage.out rename to tests/cptools/02_cppw_usage/data/usage.out diff --git a/tests/tests/cptools/03_cppw_usage_invalid_option/config.txt b/tests/cptools/03_cppw_usage_invalid_option/config.txt similarity index 100% rename from tests/tests/cptools/03_cppw_usage_invalid_option/config.txt rename to tests/cptools/03_cppw_usage_invalid_option/config.txt diff --git a/tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/group b/tests/cptools/03_cppw_usage_invalid_option/config/etc/group similarity index 100% rename from tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/group rename to tests/cptools/03_cppw_usage_invalid_option/config/etc/group diff --git a/tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/gshadow b/tests/cptools/03_cppw_usage_invalid_option/config/etc/gshadow similarity index 100% rename from tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/gshadow rename to tests/cptools/03_cppw_usage_invalid_option/config/etc/gshadow diff --git a/tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/passwd b/tests/cptools/03_cppw_usage_invalid_option/config/etc/passwd similarity index 100% rename from tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/passwd rename to tests/cptools/03_cppw_usage_invalid_option/config/etc/passwd diff --git a/tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/shadow b/tests/cptools/03_cppw_usage_invalid_option/config/etc/shadow similarity index 100% rename from tests/tests/cptools/03_cppw_usage_invalid_option/config/etc/shadow rename to tests/cptools/03_cppw_usage_invalid_option/config/etc/shadow diff --git a/tests/tests/cptools/03_cppw_usage_invalid_option/cppw.test b/tests/cptools/03_cppw_usage_invalid_option/cppw.test similarity index 100% rename from tests/tests/cptools/03_cppw_usage_invalid_option/cppw.test rename to tests/cptools/03_cppw_usage_invalid_option/cppw.test diff --git a/tests/tests/cptools/03_cppw_usage_invalid_option/data/usage.out b/tests/cptools/03_cppw_usage_invalid_option/data/usage.out similarity index 100% rename from tests/tests/cptools/03_cppw_usage_invalid_option/data/usage.out rename to tests/cptools/03_cppw_usage_invalid_option/data/usage.out diff --git a/tests/tests/cptools/04_cppw_no_file_argument/config.txt b/tests/cptools/04_cppw_no_file_argument/config.txt similarity index 100% rename from tests/tests/cptools/04_cppw_no_file_argument/config.txt rename to tests/cptools/04_cppw_no_file_argument/config.txt diff --git a/tests/tests/cptools/04_cppw_no_file_argument/config/etc/group b/tests/cptools/04_cppw_no_file_argument/config/etc/group similarity index 100% rename from tests/tests/cptools/04_cppw_no_file_argument/config/etc/group rename to tests/cptools/04_cppw_no_file_argument/config/etc/group diff --git a/tests/tests/cptools/04_cppw_no_file_argument/config/etc/gshadow b/tests/cptools/04_cppw_no_file_argument/config/etc/gshadow similarity index 100% rename from tests/tests/cptools/04_cppw_no_file_argument/config/etc/gshadow rename to tests/cptools/04_cppw_no_file_argument/config/etc/gshadow diff --git a/tests/tests/cptools/04_cppw_no_file_argument/config/etc/passwd b/tests/cptools/04_cppw_no_file_argument/config/etc/passwd similarity index 100% rename from tests/tests/cptools/04_cppw_no_file_argument/config/etc/passwd rename to tests/cptools/04_cppw_no_file_argument/config/etc/passwd diff --git a/tests/tests/cptools/04_cppw_no_file_argument/config/etc/shadow b/tests/cptools/04_cppw_no_file_argument/config/etc/shadow similarity index 100% rename from tests/tests/cptools/04_cppw_no_file_argument/config/etc/shadow rename to tests/cptools/04_cppw_no_file_argument/config/etc/shadow diff --git a/tests/tests/cptools/04_cppw_no_file_argument/cppw.test b/tests/cptools/04_cppw_no_file_argument/cppw.test similarity index 100% rename from tests/tests/cptools/04_cppw_no_file_argument/cppw.test rename to tests/cptools/04_cppw_no_file_argument/cppw.test diff --git a/tests/tests/cptools/04_cppw_no_file_argument/data/usage.out b/tests/cptools/04_cppw_no_file_argument/data/usage.out similarity index 100% rename from tests/tests/cptools/04_cppw_no_file_argument/data/usage.out rename to tests/cptools/04_cppw_no_file_argument/data/usage.out diff --git a/tests/tests/cptools/05_cppw_2_files/config.txt b/tests/cptools/05_cppw_2_files/config.txt similarity index 100% rename from tests/tests/cptools/05_cppw_2_files/config.txt rename to tests/cptools/05_cppw_2_files/config.txt diff --git a/tests/tests/cptools/05_cppw_2_files/config/etc/group b/tests/cptools/05_cppw_2_files/config/etc/group similarity index 100% rename from tests/tests/cptools/05_cppw_2_files/config/etc/group rename to tests/cptools/05_cppw_2_files/config/etc/group diff --git a/tests/tests/cptools/05_cppw_2_files/config/etc/gshadow b/tests/cptools/05_cppw_2_files/config/etc/gshadow similarity index 100% rename from tests/tests/cptools/05_cppw_2_files/config/etc/gshadow rename to tests/cptools/05_cppw_2_files/config/etc/gshadow diff --git a/tests/tests/cptools/05_cppw_2_files/config/etc/passwd b/tests/cptools/05_cppw_2_files/config/etc/passwd similarity index 100% rename from tests/tests/cptools/05_cppw_2_files/config/etc/passwd rename to tests/cptools/05_cppw_2_files/config/etc/passwd diff --git a/tests/tests/cptools/05_cppw_2_files/config/etc/shadow b/tests/cptools/05_cppw_2_files/config/etc/shadow similarity index 100% rename from tests/tests/cptools/05_cppw_2_files/config/etc/shadow rename to tests/cptools/05_cppw_2_files/config/etc/shadow diff --git a/tests/tests/cptools/05_cppw_2_files/cppw.test b/tests/cptools/05_cppw_2_files/cppw.test similarity index 100% rename from tests/tests/cptools/05_cppw_2_files/cppw.test rename to tests/cptools/05_cppw_2_files/cppw.test diff --git a/tests/tests/cptools/05_cppw_2_files/data/passwd b/tests/cptools/05_cppw_2_files/data/passwd similarity index 100% rename from tests/tests/cptools/05_cppw_2_files/data/passwd rename to tests/cptools/05_cppw_2_files/data/passwd diff --git a/tests/tests/cptools/05_cppw_2_files/data/usage.out b/tests/cptools/05_cppw_2_files/data/usage.out similarity index 100% rename from tests/tests/cptools/05_cppw_2_files/data/usage.out rename to tests/cptools/05_cppw_2_files/data/usage.out diff --git a/tests/tests/cptools/06_cppw_no_file/config.txt b/tests/cptools/06_cppw_no_file/config.txt similarity index 100% rename from tests/tests/cptools/06_cppw_no_file/config.txt rename to tests/cptools/06_cppw_no_file/config.txt diff --git a/tests/tests/cptools/06_cppw_no_file/config/etc/group b/tests/cptools/06_cppw_no_file/config/etc/group similarity index 100% rename from tests/tests/cptools/06_cppw_no_file/config/etc/group rename to tests/cptools/06_cppw_no_file/config/etc/group diff --git a/tests/tests/cptools/06_cppw_no_file/config/etc/gshadow b/tests/cptools/06_cppw_no_file/config/etc/gshadow similarity index 100% rename from tests/tests/cptools/06_cppw_no_file/config/etc/gshadow rename to tests/cptools/06_cppw_no_file/config/etc/gshadow diff --git a/tests/tests/cptools/06_cppw_no_file/config/etc/passwd b/tests/cptools/06_cppw_no_file/config/etc/passwd similarity index 100% rename from tests/tests/cptools/06_cppw_no_file/config/etc/passwd rename to tests/cptools/06_cppw_no_file/config/etc/passwd diff --git a/tests/tests/cptools/06_cppw_no_file/config/etc/shadow b/tests/cptools/06_cppw_no_file/config/etc/shadow similarity index 100% rename from tests/tests/cptools/06_cppw_no_file/config/etc/shadow rename to tests/cptools/06_cppw_no_file/config/etc/shadow diff --git a/tests/tests/cptools/06_cppw_no_file/cppw.test b/tests/cptools/06_cppw_no_file/cppw.test similarity index 100% rename from tests/tests/cptools/06_cppw_no_file/cppw.test rename to tests/cptools/06_cppw_no_file/cppw.test diff --git a/tests/tests/cptools/06_cppw_no_file/data/usage.out b/tests/cptools/06_cppw_no_file/data/usage.out similarity index 100% rename from tests/tests/cptools/06_cppw_no_file/data/usage.out rename to tests/cptools/06_cppw_no_file/data/usage.out diff --git a/tests/tests/cptools/07_cppw_locked_passwd/config.txt b/tests/cptools/07_cppw_locked_passwd/config.txt similarity index 100% rename from tests/tests/cptools/07_cppw_locked_passwd/config.txt rename to tests/cptools/07_cppw_locked_passwd/config.txt diff --git a/tests/tests/cptools/07_cppw_locked_passwd/config/etc/group b/tests/cptools/07_cppw_locked_passwd/config/etc/group similarity index 100% rename from tests/tests/cptools/07_cppw_locked_passwd/config/etc/group rename to tests/cptools/07_cppw_locked_passwd/config/etc/group diff --git a/tests/tests/cptools/07_cppw_locked_passwd/config/etc/gshadow b/tests/cptools/07_cppw_locked_passwd/config/etc/gshadow similarity index 100% rename from tests/tests/cptools/07_cppw_locked_passwd/config/etc/gshadow rename to tests/cptools/07_cppw_locked_passwd/config/etc/gshadow diff --git a/tests/tests/cptools/07_cppw_locked_passwd/config/etc/passwd b/tests/cptools/07_cppw_locked_passwd/config/etc/passwd similarity index 100% rename from tests/tests/cptools/07_cppw_locked_passwd/config/etc/passwd rename to tests/cptools/07_cppw_locked_passwd/config/etc/passwd diff --git a/tests/tests/cptools/07_cppw_locked_passwd/config/etc/shadow b/tests/cptools/07_cppw_locked_passwd/config/etc/shadow similarity index 100% rename from tests/tests/cptools/07_cppw_locked_passwd/config/etc/shadow rename to tests/cptools/07_cppw_locked_passwd/config/etc/shadow diff --git a/tests/tests/cptools/07_cppw_locked_passwd/cppw.test b/tests/cptools/07_cppw_locked_passwd/cppw.test similarity index 100% rename from tests/tests/cptools/07_cppw_locked_passwd/cppw.test rename to tests/cptools/07_cppw_locked_passwd/cppw.test diff --git a/tests/tests/cptools/07_cppw_locked_passwd/data/passwd b/tests/cptools/07_cppw_locked_passwd/data/passwd similarity index 100% rename from tests/tests/cptools/07_cppw_locked_passwd/data/passwd rename to tests/cptools/07_cppw_locked_passwd/data/passwd diff --git a/tests/tests/cptools/07_cppw_locked_passwd/data/usage.out b/tests/cptools/07_cppw_locked_passwd/data/usage.out similarity index 100% rename from tests/tests/cptools/07_cppw_locked_passwd/data/usage.out rename to tests/cptools/07_cppw_locked_passwd/data/usage.out diff --git a/tests/tests/cptools/08_cppw-p/config.txt b/tests/cptools/08_cppw-p/config.txt similarity index 100% rename from tests/tests/cptools/08_cppw-p/config.txt rename to tests/cptools/08_cppw-p/config.txt diff --git a/tests/tests/cptools/08_cppw-p/config/etc/group b/tests/cptools/08_cppw-p/config/etc/group similarity index 100% rename from tests/tests/cptools/08_cppw-p/config/etc/group rename to tests/cptools/08_cppw-p/config/etc/group diff --git a/tests/tests/cptools/08_cppw-p/config/etc/gshadow b/tests/cptools/08_cppw-p/config/etc/gshadow similarity index 100% rename from tests/tests/cptools/08_cppw-p/config/etc/gshadow rename to tests/cptools/08_cppw-p/config/etc/gshadow diff --git a/tests/tests/cptools/08_cppw-p/config/etc/passwd b/tests/cptools/08_cppw-p/config/etc/passwd similarity index 100% rename from tests/tests/cptools/08_cppw-p/config/etc/passwd rename to tests/cptools/08_cppw-p/config/etc/passwd diff --git a/tests/tests/cptools/08_cppw-p/config/etc/shadow b/tests/cptools/08_cppw-p/config/etc/shadow similarity index 100% rename from tests/tests/cptools/08_cppw-p/config/etc/shadow rename to tests/cptools/08_cppw-p/config/etc/shadow diff --git a/tests/tests/cptools/08_cppw-p/cppw.test b/tests/cptools/08_cppw-p/cppw.test similarity index 100% rename from tests/tests/cptools/08_cppw-p/cppw.test rename to tests/cptools/08_cppw-p/cppw.test diff --git a/tests/tests/cptools/08_cppw-p/data/passwd b/tests/cptools/08_cppw-p/data/passwd similarity index 100% rename from tests/tests/cptools/08_cppw-p/data/passwd rename to tests/cptools/08_cppw-p/data/passwd diff --git a/tests/tests/cptools/09_cppw-g/config.txt b/tests/cptools/09_cppw-g/config.txt similarity index 100% rename from tests/tests/cptools/09_cppw-g/config.txt rename to tests/cptools/09_cppw-g/config.txt diff --git a/tests/tests/cptools/09_cppw-g/config/etc/group b/tests/cptools/09_cppw-g/config/etc/group similarity index 100% rename from tests/tests/cptools/09_cppw-g/config/etc/group rename to tests/cptools/09_cppw-g/config/etc/group diff --git a/tests/tests/cptools/09_cppw-g/config/etc/gshadow b/tests/cptools/09_cppw-g/config/etc/gshadow similarity index 100% rename from tests/tests/cptools/09_cppw-g/config/etc/gshadow rename to tests/cptools/09_cppw-g/config/etc/gshadow diff --git a/tests/tests/cptools/09_cppw-g/config/etc/passwd b/tests/cptools/09_cppw-g/config/etc/passwd similarity index 100% rename from tests/tests/cptools/09_cppw-g/config/etc/passwd rename to tests/cptools/09_cppw-g/config/etc/passwd diff --git a/tests/tests/cptools/09_cppw-g/config/etc/shadow b/tests/cptools/09_cppw-g/config/etc/shadow similarity index 100% rename from tests/tests/cptools/09_cppw-g/config/etc/shadow rename to tests/cptools/09_cppw-g/config/etc/shadow diff --git a/tests/tests/cptools/09_cppw-g/cppw.test b/tests/cptools/09_cppw-g/cppw.test similarity index 100% rename from tests/tests/cptools/09_cppw-g/cppw.test rename to tests/cptools/09_cppw-g/cppw.test diff --git a/tests/tests/cptools/09_cppw-g/data/group b/tests/cptools/09_cppw-g/data/group similarity index 100% rename from tests/tests/cptools/09_cppw-g/data/group rename to tests/cptools/09_cppw-g/data/group diff --git a/tests/tests/cptools/10_cppw-g-s/config.txt b/tests/cptools/10_cppw-g-s/config.txt similarity index 100% rename from tests/tests/cptools/10_cppw-g-s/config.txt rename to tests/cptools/10_cppw-g-s/config.txt diff --git a/tests/tests/cptools/10_cppw-g-s/config/etc/group b/tests/cptools/10_cppw-g-s/config/etc/group similarity index 100% rename from tests/tests/cptools/10_cppw-g-s/config/etc/group rename to tests/cptools/10_cppw-g-s/config/etc/group diff --git a/tests/tests/cptools/10_cppw-g-s/config/etc/gshadow b/tests/cptools/10_cppw-g-s/config/etc/gshadow similarity index 100% rename from tests/tests/cptools/10_cppw-g-s/config/etc/gshadow rename to tests/cptools/10_cppw-g-s/config/etc/gshadow diff --git a/tests/tests/cptools/10_cppw-g-s/config/etc/passwd b/tests/cptools/10_cppw-g-s/config/etc/passwd similarity index 100% rename from tests/tests/cptools/10_cppw-g-s/config/etc/passwd rename to tests/cptools/10_cppw-g-s/config/etc/passwd diff --git a/tests/tests/cptools/10_cppw-g-s/config/etc/shadow b/tests/cptools/10_cppw-g-s/config/etc/shadow similarity index 100% rename from tests/tests/cptools/10_cppw-g-s/config/etc/shadow rename to tests/cptools/10_cppw-g-s/config/etc/shadow diff --git a/tests/tests/cptools/10_cppw-g-s/cppw.test b/tests/cptools/10_cppw-g-s/cppw.test similarity index 100% rename from tests/tests/cptools/10_cppw-g-s/cppw.test rename to tests/cptools/10_cppw-g-s/cppw.test diff --git a/tests/tests/cptools/10_cppw-g-s/data/gshadow b/tests/cptools/10_cppw-g-s/data/gshadow similarity index 100% rename from tests/tests/cptools/10_cppw-g-s/data/gshadow rename to tests/cptools/10_cppw-g-s/data/gshadow diff --git a/tests/tests/cptools/11_cppw-p-s/config.txt b/tests/cptools/11_cppw-p-s/config.txt similarity index 100% rename from tests/tests/cptools/11_cppw-p-s/config.txt rename to tests/cptools/11_cppw-p-s/config.txt diff --git a/tests/tests/cptools/11_cppw-p-s/config/etc/group b/tests/cptools/11_cppw-p-s/config/etc/group similarity index 100% rename from tests/tests/cptools/11_cppw-p-s/config/etc/group rename to tests/cptools/11_cppw-p-s/config/etc/group diff --git a/tests/tests/cptools/11_cppw-p-s/config/etc/gshadow b/tests/cptools/11_cppw-p-s/config/etc/gshadow similarity index 100% rename from tests/tests/cptools/11_cppw-p-s/config/etc/gshadow rename to tests/cptools/11_cppw-p-s/config/etc/gshadow diff --git a/tests/tests/cptools/11_cppw-p-s/config/etc/passwd b/tests/cptools/11_cppw-p-s/config/etc/passwd similarity index 100% rename from tests/tests/cptools/11_cppw-p-s/config/etc/passwd rename to tests/cptools/11_cppw-p-s/config/etc/passwd diff --git a/tests/tests/cptools/11_cppw-p-s/config/etc/shadow b/tests/cptools/11_cppw-p-s/config/etc/shadow similarity index 100% rename from tests/tests/cptools/11_cppw-p-s/config/etc/shadow rename to tests/cptools/11_cppw-p-s/config/etc/shadow diff --git a/tests/tests/cptools/11_cppw-p-s/cppw.test b/tests/cptools/11_cppw-p-s/cppw.test similarity index 100% rename from tests/tests/cptools/11_cppw-p-s/cppw.test rename to tests/cptools/11_cppw-p-s/cppw.test diff --git a/tests/tests/cptools/11_cppw-p-s/data/shadow b/tests/cptools/11_cppw-p-s/data/shadow similarity index 100% rename from tests/tests/cptools/11_cppw-p-s/data/shadow rename to tests/cptools/11_cppw-p-s/data/shadow diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/config.txt b/tests/cptools/12_cppw-s_no_shadow_file/config.txt similarity index 100% rename from tests/tests/cptools/12_cppw-s_no_shadow_file/config.txt rename to tests/cptools/12_cppw-s_no_shadow_file/config.txt diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/group b/tests/cptools/12_cppw-s_no_shadow_file/config/etc/group similarity index 100% rename from tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/group rename to tests/cptools/12_cppw-s_no_shadow_file/config/etc/group diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/gshadow b/tests/cptools/12_cppw-s_no_shadow_file/config/etc/gshadow similarity index 100% rename from tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/gshadow rename to tests/cptools/12_cppw-s_no_shadow_file/config/etc/gshadow diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/passwd b/tests/cptools/12_cppw-s_no_shadow_file/config/etc/passwd similarity index 100% rename from tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/passwd rename to tests/cptools/12_cppw-s_no_shadow_file/config/etc/passwd diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/shadow b/tests/cptools/12_cppw-s_no_shadow_file/config/etc/shadow similarity index 100% rename from tests/tests/cptools/12_cppw-s_no_shadow_file/config/etc/shadow rename to tests/cptools/12_cppw-s_no_shadow_file/config/etc/shadow diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/cppw.test b/tests/cptools/12_cppw-s_no_shadow_file/cppw.test similarity index 100% rename from tests/tests/cptools/12_cppw-s_no_shadow_file/cppw.test rename to tests/cptools/12_cppw-s_no_shadow_file/cppw.test diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/data/cppw.err b/tests/cptools/12_cppw-s_no_shadow_file/data/cppw.err similarity index 100% rename from tests/tests/cptools/12_cppw-s_no_shadow_file/data/cppw.err rename to tests/cptools/12_cppw-s_no_shadow_file/data/cppw.err diff --git a/tests/tests/cptools/12_cppw-s_no_shadow_file/data/shadow b/tests/cptools/12_cppw-s_no_shadow_file/data/shadow similarity index 100% rename from tests/tests/cptools/12_cppw-s_no_shadow_file/data/shadow rename to tests/cptools/12_cppw-s_no_shadow_file/data/shadow 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/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/group b/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/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/01_chpasswd/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/01_chpasswd/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/01_chpasswd/gshadow diff --git a/tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/passwd b/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/01_chpasswd/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/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/config/etc/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/config/etc/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/config/etc/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/config/etc/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/config/etc/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/config/etc/passwd rename to tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/passwd diff --git a/tests/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/shadow b/tests/crypt/login.defs_DES-MD5_CRYPT_ENAB/config/etc/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-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/01_chpasswd/group b/tests/crypt/login.defs_DES/01_chpasswd/group similarity index 100% rename from tests/tests/crypt/login.defs_DES/01_chpasswd/group rename to tests/crypt/login.defs_DES/01_chpasswd/group diff --git a/tests/tests/crypt/login.defs_DES/01_chpasswd/gshadow b/tests/crypt/login.defs_DES/01_chpasswd/gshadow similarity index 100% rename from tests/tests/crypt/login.defs_DES/01_chpasswd/gshadow rename to tests/crypt/login.defs_DES/01_chpasswd/gshadow diff --git a/tests/tests/crypt/login.defs_DES/01_chpasswd/passwd b/tests/crypt/login.defs_DES/01_chpasswd/passwd similarity index 100% rename from tests/tests/crypt/login.defs_DES/01_chpasswd/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/02_chpasswd--crypt-method-MD5/group b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/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/02_chpasswd--crypt-method-MD5/group diff --git a/tests/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/gshadow b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/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/02_chpasswd--crypt-method-MD5/gshadow diff --git a/tests/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/passwd b/tests/crypt/login.defs_DES/02_chpasswd--crypt-method-MD5/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/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/03_chpasswd--crypt-method-DES/group b/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/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/03_chpasswd--crypt-method-DES/group diff --git a/tests/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/gshadow b/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/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/03_chpasswd--crypt-method-DES/gshadow diff --git a/tests/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/passwd b/tests/crypt/login.defs_DES/03_chpasswd--crypt-method-DES/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/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/04_chpasswd--crypt-method-NONE/group b/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/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/04_chpasswd--crypt-method-NONE/group diff --git a/tests/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/gshadow b/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/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/04_chpasswd--crypt-method-NONE/gshadow diff --git a/tests/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/passwd b/tests/crypt/login.defs_DES/04_chpasswd--crypt-method-NONE/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/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/05_chpasswd-e/group b/tests/crypt/login.defs_DES/05_chpasswd-e/group similarity index 100% rename from tests/tests/crypt/login.defs_DES/05_chpasswd-e/group rename to tests/crypt/login.defs_DES/05_chpasswd-e/group diff --git a/tests/tests/crypt/login.defs_DES/05_chpasswd-e/gshadow b/tests/crypt/login.defs_DES/05_chpasswd-e/gshadow similarity index 100% rename from tests/tests/crypt/login.defs_DES/05_chpasswd-e/gshadow rename to tests/crypt/login.defs_DES/05_chpasswd-e/gshadow diff --git a/tests/tests/crypt/login.defs_DES/05_chpasswd-e/passwd b/tests/crypt/login.defs_DES/05_chpasswd-e/passwd similarity index 100% rename from tests/tests/crypt/login.defs_DES/05_chpasswd-e/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/06_chpasswd-m/group b/tests/crypt/login.defs_DES/06_chpasswd-m/group similarity index 100% rename from tests/tests/crypt/login.defs_DES/06_chpasswd-m/group rename to tests/crypt/login.defs_DES/06_chpasswd-m/group diff --git a/tests/tests/crypt/login.defs_DES/06_chpasswd-m/gshadow b/tests/crypt/login.defs_DES/06_chpasswd-m/gshadow similarity index 100% rename from tests/tests/crypt/login.defs_DES/06_chpasswd-m/gshadow rename to tests/crypt/login.defs_DES/06_chpasswd-m/gshadow diff --git a/tests/tests/crypt/login.defs_DES/06_chpasswd-m/passwd b/tests/crypt/login.defs_DES/06_chpasswd-m/passwd similarity index 100% rename from tests/tests/crypt/login.defs_DES/06_chpasswd-m/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/07_chgpasswd/group b/tests/crypt/login.defs_DES/07_chgpasswd/group similarity index 100% rename from tests/tests/crypt/login.defs_DES/07_chgpasswd/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/07_chgpasswd/passwd b/tests/crypt/login.defs_DES/07_chgpasswd/passwd similarity index 100% rename from tests/tests/crypt/login.defs_DES/07_chgpasswd/passwd rename to tests/crypt/login.defs_DES/07_chgpasswd/passwd diff --git a/tests/tests/crypt/login.defs_DES/07_chgpasswd/shadow b/tests/crypt/login.defs_DES/07_chgpasswd/shadow similarity index 100% rename from tests/tests/crypt/login.defs_DES/07_chgpasswd/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/08_chgpasswd--crypt-method-MD5/group b/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/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/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/08_chgpasswd--crypt-method-MD5/passwd b/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/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/08_chgpasswd--crypt-method-MD5/passwd diff --git a/tests/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/shadow b/tests/crypt/login.defs_DES/08_chgpasswd--crypt-method-MD5/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/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/09_chgpasswd--crypt-method-DES/group b/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/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/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/09_chgpasswd--crypt-method-DES/passwd b/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/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/09_chgpasswd--crypt-method-DES/passwd diff --git a/tests/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/shadow b/tests/crypt/login.defs_DES/09_chgpasswd--crypt-method-DES/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/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/10_chgpasswd--crypt-method-NONE/group b/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/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/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/10_chgpasswd--crypt-method-NONE/passwd b/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/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/10_chgpasswd--crypt-method-NONE/passwd diff --git a/tests/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/shadow b/tests/crypt/login.defs_DES/10_chgpasswd--crypt-method-NONE/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/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/11_chgpasswd-e/group b/tests/crypt/login.defs_DES/11_chgpasswd-e/group similarity index 100% rename from tests/tests/crypt/login.defs_DES/11_chgpasswd-e/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/11_chgpasswd-e/passwd b/tests/crypt/login.defs_DES/11_chgpasswd-e/passwd similarity index 100% rename from tests/tests/crypt/login.defs_DES/11_chgpasswd-e/passwd rename to tests/crypt/login.defs_DES/11_chgpasswd-e/passwd diff --git a/tests/tests/crypt/login.defs_DES/11_chgpasswd-e/shadow b/tests/crypt/login.defs_DES/11_chgpasswd-e/shadow similarity index 100% rename from tests/tests/crypt/login.defs_DES/11_chgpasswd-e/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/12_chgpasswd-m/group b/tests/crypt/login.defs_DES/12_chgpasswd-m/group similarity index 100% rename from tests/tests/crypt/login.defs_DES/12_chgpasswd-m/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/12_chgpasswd-m/passwd b/tests/crypt/login.defs_DES/12_chgpasswd-m/passwd similarity index 100% rename from tests/tests/crypt/login.defs_DES/12_chgpasswd-m/passwd rename to tests/crypt/login.defs_DES/12_chgpasswd-m/passwd diff --git a/tests/tests/crypt/login.defs_DES/12_chgpasswd-m/shadow b/tests/crypt/login.defs_DES/12_chgpasswd-m/shadow similarity index 100% rename from tests/tests/crypt/login.defs_DES/12_chgpasswd-m/shadow rename to tests/crypt/login.defs_DES/12_chgpasswd-m/shadow diff --git a/tests/tests/crypt/login.defs_DES/config/etc/group b/tests/crypt/login.defs_DES/config/etc/group similarity index 100% rename from tests/tests/crypt/login.defs_DES/config/etc/group rename to tests/crypt/login.defs_DES/config/etc/group diff --git a/tests/tests/crypt/login.defs_DES/config/etc/gshadow b/tests/crypt/login.defs_DES/config/etc/gshadow similarity index 100% rename from tests/tests/crypt/login.defs_DES/config/etc/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/config/etc/passwd b/tests/crypt/login.defs_DES/config/etc/passwd similarity index 100% rename from tests/tests/crypt/login.defs_DES/config/etc/passwd rename to tests/crypt/login.defs_DES/config/etc/passwd diff --git a/tests/tests/crypt/login.defs_DES/config/etc/shadow b/tests/crypt/login.defs_DES/config/etc/shadow similarity index 100% rename from tests/tests/crypt/login.defs_DES/config/etc/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_MD5/01_chpasswd/group b/tests/crypt/login.defs_MD5/01_chpasswd/group similarity index 100% rename from tests/tests/crypt/login.defs_MD5/01_chpasswd/group rename to tests/crypt/login.defs_MD5/01_chpasswd/group diff --git a/tests/tests/crypt/login.defs_MD5/01_chpasswd/gshadow b/tests/crypt/login.defs_MD5/01_chpasswd/gshadow similarity index 100% rename from tests/tests/crypt/login.defs_MD5/01_chpasswd/gshadow rename to tests/crypt/login.defs_MD5/01_chpasswd/gshadow diff --git a/tests/tests/crypt/login.defs_MD5/01_chpasswd/passwd b/tests/crypt/login.defs_MD5/01_chpasswd/passwd similarity index 100% rename from tests/tests/crypt/login.defs_MD5/01_chpasswd/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/02_chgpasswd/group b/tests/crypt/login.defs_MD5/02_chgpasswd/group similarity index 100% rename from tests/tests/crypt/login.defs_MD5/02_chgpasswd/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/02_chgpasswd/passwd b/tests/crypt/login.defs_MD5/02_chgpasswd/passwd similarity index 100% rename from tests/tests/crypt/login.defs_MD5/02_chgpasswd/passwd rename to tests/crypt/login.defs_MD5/02_chgpasswd/passwd diff --git a/tests/tests/crypt/login.defs_MD5/02_chgpasswd/shadow b/tests/crypt/login.defs_MD5/02_chgpasswd/shadow similarity index 100% rename from tests/tests/crypt/login.defs_MD5/02_chgpasswd/shadow rename to tests/crypt/login.defs_MD5/02_chgpasswd/shadow diff --git a/tests/tests/crypt/login.defs_MD5/config/etc/group b/tests/crypt/login.defs_MD5/config/etc/group similarity index 100% rename from tests/tests/crypt/login.defs_MD5/config/etc/group rename to tests/crypt/login.defs_MD5/config/etc/group diff --git a/tests/tests/crypt/login.defs_MD5/config/etc/gshadow b/tests/crypt/login.defs_MD5/config/etc/gshadow similarity index 100% rename from tests/tests/crypt/login.defs_MD5/config/etc/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/config/etc/passwd b/tests/crypt/login.defs_MD5/config/etc/passwd similarity index 100% rename from tests/tests/crypt/login.defs_MD5/config/etc/passwd rename to tests/crypt/login.defs_MD5/config/etc/passwd diff --git a/tests/tests/crypt/login.defs_MD5/config/etc/shadow b/tests/crypt/login.defs_MD5/config/etc/shadow similarity index 100% rename from tests/tests/crypt/login.defs_MD5/config/etc/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_CRYPT_ENAB/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_CRYPT_ENAB/config/etc/group rename to tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/group diff --git a/tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/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_CRYPT_ENAB/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_CRYPT_ENAB/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_CRYPT_ENAB/config/etc/passwd rename to tests/crypt/login.defs_MD5_CRYPT_ENAB/config/etc/passwd diff --git a/tests/tests/crypt/login.defs_MD5_CRYPT_ENAB/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_CRYPT_ENAB/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_SHA256-round-max/config/etc/group b/tests/crypt/login.defs_SHA256-round-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-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-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-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_SHA256-round-max/config/etc/passwd b/tests/crypt/login.defs_SHA256-round-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-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-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-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-min-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-min-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-min-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-min-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-min-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-min-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-min-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-min-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/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/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/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/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/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/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/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/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/config/etc/group b/tests/crypt/login.defs_SHA256/config/etc/group similarity index 100% rename from tests/tests/crypt/login.defs_SHA256/config/etc/group rename to tests/crypt/login.defs_SHA256/config/etc/group diff --git a/tests/tests/crypt/login.defs_SHA256/config/etc/gshadow b/tests/crypt/login.defs_SHA256/config/etc/gshadow similarity index 100% rename from tests/tests/crypt/login.defs_SHA256/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/config/etc/passwd b/tests/crypt/login.defs_SHA256/config/etc/passwd similarity index 100% rename from tests/tests/crypt/login.defs_SHA256/config/etc/passwd rename to tests/crypt/login.defs_SHA256/config/etc/passwd diff --git a/tests/tests/crypt/login.defs_SHA256/config/etc/shadow b/tests/crypt/login.defs_SHA256/config/etc/shadow similarity index 100% rename from tests/tests/crypt/login.defs_SHA256/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_SHA512/config/etc/group b/tests/crypt/login.defs_SHA512/config/etc/group similarity index 100% rename from tests/tests/crypt/login.defs_SHA512/config/etc/group rename to tests/crypt/login.defs_SHA512/config/etc/group diff --git a/tests/tests/crypt/login.defs_SHA512/config/etc/gshadow b/tests/crypt/login.defs_SHA512/config/etc/gshadow similarity index 100% rename from tests/tests/crypt/login.defs_SHA512/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_SHA512/config/etc/passwd b/tests/crypt/login.defs_SHA512/config/etc/passwd similarity index 100% rename from tests/tests/crypt/login.defs_SHA512/config/etc/passwd rename to tests/crypt/login.defs_SHA512/config/etc/passwd diff --git a/tests/tests/crypt/login.defs_SHA512/config/etc/shadow b/tests/crypt/login.defs_SHA512/config/etc/shadow similarity index 100% rename from tests/tests/crypt/login.defs_SHA512/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_none/config/etc/group b/tests/crypt/login.defs_none/config/etc/group similarity index 100% rename from tests/tests/crypt/login.defs_none/config/etc/group rename to tests/crypt/login.defs_none/config/etc/group diff --git a/tests/tests/crypt/login.defs_none/config/etc/gshadow b/tests/crypt/login.defs_none/config/etc/gshadow similarity index 100% rename from tests/tests/crypt/login.defs_none/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_none/config/etc/passwd b/tests/crypt/login.defs_none/config/etc/passwd similarity index 100% rename from tests/tests/crypt/login.defs_none/config/etc/passwd rename to tests/crypt/login.defs_none/config/etc/passwd diff --git a/tests/tests/crypt/login.defs_none/config/etc/shadow b/tests/crypt/login.defs_none/config/etc/shadow similarity index 100% rename from tests/tests/crypt/login.defs_none/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 100% rename from tests/tests/debian/01/data/passwd_files rename to tests/debian/01/data/passwd_files 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/expiry/01_expiry_-c_no_expiry/config/etc/shadow b/tests/expiry/01_expiry_-c_no_expiry/config/etc/shadow similarity index 100% rename from tests/tests/expiry/01_expiry_-c_no_expiry/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/expiry/05_expiry_-c_no_shadow_file/config/etc/shadow b/tests/expiry/05_expiry_-c_no_shadow_file/config/etc/shadow similarity index 100% rename from tests/tests/expiry/05_expiry_-c_no_shadow_file/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/failures/chage/01_chage_openRW_passwd_failure/config/etc/shadow b/tests/failures/chage/01_chage_openRW_passwd_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/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/failures/chage/02_chage_openRO_passwd_failure/config/etc/shadow b/tests/failures/chage/02_chage_openRO_passwd_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/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/failures/chage/03_chage_openRW_shadow_failure/config/etc/shadow b/tests/failures/chage/03_chage_openRW_shadow_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/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/04_chage_openRO_shadow_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/04_chage_openRO_shadow_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/05_chage_rename_shadow_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/05_chage_rename_shadow_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/chgpasswd/01_chgpasswd-e_open_group_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/chgpasswd/01_chgpasswd-e_open_group_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/chgpasswd/02_chgpasswd-e_open_gshadow_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/chgpasswd/02_chgpasswd-e_open_gshadow_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/chpasswd-PAM/01_chpasswd-e_open_passwd_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/chpasswd-PAM/01_chpasswd-e_open_passwd_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/chpasswd-PAM/02_chpasswd-e_open_shadow_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/chpasswd-PAM/02_chpasswd-e_open_shadow_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/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/group b/tests/failures/chpasswd-PAM/05_chpasswd-e_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/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/group diff --git a/tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/gshadow b/tests/failures/chpasswd-PAM/05_chpasswd-e_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/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/gshadow diff --git a/tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/passwd b/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/passwd similarity index 100% rename from tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/passwd rename to tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/passwd diff --git a/tests/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/config/etc/shadow b/tests/failures/chpasswd-PAM/05_chpasswd-e_time_0/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/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/chsh/01_chsh_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/chsh/01_chsh_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/chsh/02_chsh_rename_passwd_failure/config/etc/shadow b/tests/failures/chsh/02_chsh_rename_passwd_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/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/cppw/01_cppw_open_passwd_in_failure/config.txt similarity index 100% rename from tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config.txt rename to tests/failures/cppw/01_cppw_open_passwd_in_failure/config.txt diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/group b/tests/failures/cppw/01_cppw_open_passwd_in_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/cppw/01_cppw_open_passwd_in_failure/config/etc/group diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/gshadow b/tests/failures/cppw/01_cppw_open_passwd_in_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/cppw/01_cppw_open_passwd_in_failure/config/etc/gshadow diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/login.defs b/tests/failures/cppw/01_cppw_open_passwd_in_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/cppw/01_cppw_open_passwd_in_failure/config/etc/login.defs diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/passwd b/tests/failures/cppw/01_cppw_open_passwd_in_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/cppw/01_cppw_open_passwd_in_failure/config/etc/passwd diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/config/etc/shadow b/tests/failures/cppw/01_cppw_open_passwd_in_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/cppw/01_cppw_open_passwd_in_failure/config/etc/shadow diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/cppw.test b/tests/failures/cppw/01_cppw_open_passwd_in_failure/cppw.test similarity index 100% rename from tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/cppw.test rename to tests/failures/cppw/01_cppw_open_passwd_in_failure/cppw.test diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/data/cppw.err b/tests/failures/cppw/01_cppw_open_passwd_in_failure/data/cppw.err similarity index 100% rename from tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/data/cppw.err rename to tests/failures/cppw/01_cppw_open_passwd_in_failure/data/cppw.err diff --git a/tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/data/passwd b/tests/failures/cppw/01_cppw_open_passwd_in_failure/data/passwd similarity index 100% rename from tests/tests/failures/cppw/01_cppw_open_passwd_in_failure/data/passwd rename to tests/failures/cppw/01_cppw_open_passwd_in_failure/data/passwd diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config.txt b/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config.txt similarity index 100% rename from tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config.txt rename to tests/failures/cppw/02_cppw_open_passwd_backup_failure/config.txt diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/group b/tests/failures/cppw/02_cppw_open_passwd_backup_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/cppw/02_cppw_open_passwd_backup_failure/config/etc/group diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/gshadow b/tests/failures/cppw/02_cppw_open_passwd_backup_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/cppw/02_cppw_open_passwd_backup_failure/config/etc/gshadow diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/login.defs b/tests/failures/cppw/02_cppw_open_passwd_backup_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/cppw/02_cppw_open_passwd_backup_failure/config/etc/login.defs diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/passwd b/tests/failures/cppw/02_cppw_open_passwd_backup_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/cppw/02_cppw_open_passwd_backup_failure/config/etc/passwd diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/config/etc/shadow b/tests/failures/cppw/02_cppw_open_passwd_backup_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/cppw/02_cppw_open_passwd_backup_failure/config/etc/shadow diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/cppw.test b/tests/failures/cppw/02_cppw_open_passwd_backup_failure/cppw.test similarity index 100% rename from tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/cppw.test rename to tests/failures/cppw/02_cppw_open_passwd_backup_failure/cppw.test diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/data/cppw.err b/tests/failures/cppw/02_cppw_open_passwd_backup_failure/data/cppw.err similarity index 100% rename from tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/data/cppw.err rename to tests/failures/cppw/02_cppw_open_passwd_backup_failure/data/cppw.err diff --git a/tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/data/passwd b/tests/failures/cppw/02_cppw_open_passwd_backup_failure/data/passwd similarity index 100% rename from tests/tests/failures/cppw/02_cppw_open_passwd_backup_failure/data/passwd rename to tests/failures/cppw/02_cppw_open_passwd_backup_failure/data/passwd diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config.txt b/tests/failures/cppw/03_cppw_rename_passwd_failure/config.txt similarity index 100% rename from tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config.txt rename to tests/failures/cppw/03_cppw_rename_passwd_failure/config.txt diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/group b/tests/failures/cppw/03_cppw_rename_passwd_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/cppw/03_cppw_rename_passwd_failure/config/etc/group diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/gshadow b/tests/failures/cppw/03_cppw_rename_passwd_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/cppw/03_cppw_rename_passwd_failure/config/etc/gshadow diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/login.defs b/tests/failures/cppw/03_cppw_rename_passwd_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/cppw/03_cppw_rename_passwd_failure/config/etc/login.defs diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/passwd b/tests/failures/cppw/03_cppw_rename_passwd_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/cppw/03_cppw_rename_passwd_failure/config/etc/passwd diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/config/etc/shadow b/tests/failures/cppw/03_cppw_rename_passwd_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/cppw/03_cppw_rename_passwd_failure/config/etc/shadow diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/cppw.test b/tests/failures/cppw/03_cppw_rename_passwd_failure/cppw.test similarity index 100% rename from tests/tests/failures/cppw/03_cppw_rename_passwd_failure/cppw.test rename to tests/failures/cppw/03_cppw_rename_passwd_failure/cppw.test diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/data/cppw.err b/tests/failures/cppw/03_cppw_rename_passwd_failure/data/cppw.err similarity index 100% rename from tests/tests/failures/cppw/03_cppw_rename_passwd_failure/data/cppw.err rename to tests/failures/cppw/03_cppw_rename_passwd_failure/data/cppw.err diff --git a/tests/tests/failures/cppw/03_cppw_rename_passwd_failure/data/passwd b/tests/failures/cppw/03_cppw_rename_passwd_failure/data/passwd similarity index 100% rename from tests/tests/failures/cppw/03_cppw_rename_passwd_failure/data/passwd rename to tests/failures/cppw/03_cppw_rename_passwd_failure/data/passwd diff --git a/tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config.txt b/tests/failures/gpasswd/01_gpasswd_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/01_gpasswd_group_open_failure/config.txt diff --git a/tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/group b/tests/failures/gpasswd/01_gpasswd_group_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/01_gpasswd_group_open_failure/config/etc/group diff --git a/tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/gshadow b/tests/failures/gpasswd/01_gpasswd_group_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/01_gpasswd_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/01_gpasswd_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/01_gpasswd_group_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/01_gpasswd_group_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/01_gpasswd_group_open_failure/config/etc/passwd diff --git a/tests/tests/failures/gpasswd/01_gpasswd_group_open_failure/config/etc/shadow b/tests/failures/gpasswd/01_gpasswd_group_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/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/gpasswd/02_gpasswd_gshadow_open_failure/config.txt b/tests/failures/gpasswd/02_gpasswd_gshadow_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/02_gpasswd_gshadow_open_failure/config.txt diff --git a/tests/tests/failures/gpasswd/02_gpasswd_gshadow_open_failure/config/etc/group b/tests/failures/gpasswd/02_gpasswd_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/02_gpasswd_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/02_gpasswd_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/02_gpasswd_gshadow_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/02_gpasswd_gshadow_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/02_gpasswd_gshadow_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/02_gpasswd_gshadow_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/02_gpasswd_gshadow_open_failure/config/etc/passwd diff --git a/tests/tests/failures/gpasswd/02_gpasswd_gshadow_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/02_gpasswd_gshadow_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/gpasswd/03_gpasswd-a_group_open_failure/config.txt b/tests/failures/gpasswd/03_gpasswd-a_group_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/03_gpasswd-a_group_open_failure/config.txt diff --git a/tests/tests/failures/gpasswd/03_gpasswd-a_group_open_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/gpasswd/03_gpasswd-a_group_open_failure/config/etc/group rename to tests/failures/gpasswd/03_gpasswd-a_group_open_failure/config/etc/group diff --git a/tests/tests/failures/gpasswd/03_gpasswd-a_group_open_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/gpasswd/03_gpasswd-a_group_open_failure/config/etc/gshadow rename to tests/failures/gpasswd/03_gpasswd-a_group_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/03_gpasswd-a_group_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/03_gpasswd-a_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/03_gpasswd-a_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/03_gpasswd-a_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/03_gpasswd-a_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/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/04_gpasswd-d_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/04_gpasswd-d_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/04_gpasswd-d_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/04_gpasswd-d_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/04_gpasswd-d_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/04_gpasswd-d_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/04_gpasswd-d_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/04_gpasswd-d_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/05_gpasswd-r_group_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/05_gpasswd-r_group_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/05_gpasswd-r_group_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/05_gpasswd-r_group_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/05_gpasswd-r_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/05_gpasswd-r_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/05_gpasswd-r_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/05_gpasswd-r_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/06_gpasswd-R_gshadow_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/06_gpasswd-R_gshadow_open_failure/config.txt rename to tests/failures/gpasswd/06_gpasswd-R_gshadow_open_failure/config.txt diff --git a/tests/tests/failures/gpasswd/06_gpasswd-R_gshadow_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/06_gpasswd-R_gshadow_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/06_gpasswd-R_gshadow_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/06_gpasswd-R_gshadow_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/06_gpasswd-R_gshadow_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/06_gpasswd-R_gshadow_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/06_gpasswd-R_gshadow_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/06_gpasswd-R_gshadow_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/06_gpasswd-R_gshadow_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/06_gpasswd-R_gshadow_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/07_gpasswd-A_gshadow_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/07_gpasswd-A_gshadow_open_failure/config.txt rename to tests/failures/gpasswd/07_gpasswd-A_gshadow_open_failure/config.txt diff --git a/tests/tests/failures/gpasswd/07_gpasswd-A_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/07_gpasswd-A_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/07_gpasswd-A_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/07_gpasswd-A_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/07_gpasswd-A_gshadow_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/07_gpasswd-A_gshadow_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/07_gpasswd-A_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/07_gpasswd-A_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/07_gpasswd-A_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/07_gpasswd-A_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/08_gpasswd_group_openRO_failure/config.txt b/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config.txt similarity index 100% rename from tests/tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config.txt rename to tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config.txt diff --git a/tests/tests/failures/gpasswd/08_gpasswd_group_openRO_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/08_gpasswd_group_openRO_failure/config/etc/group rename to tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/group diff --git a/tests/tests/failures/gpasswd/08_gpasswd_group_openRO_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/08_gpasswd_group_openRO_failure/config/etc/gshadow rename to tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/gshadow diff --git a/tests/tests/failures/gpasswd/08_gpasswd_group_openRO_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/08_gpasswd_group_openRO_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/08_gpasswd_group_openRO_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/08_gpasswd_group_openRO_failure/config/etc/passwd rename to tests/failures/gpasswd/08_gpasswd_group_openRO_failure/config/etc/passwd diff --git a/tests/tests/failures/gpasswd/08_gpasswd_group_openRO_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/08_gpasswd_group_openRO_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/09_gpasswd_gshadow_openRO_failure/config.txt b/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config.txt similarity index 100% rename from tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config.txt rename to tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config.txt diff --git a/tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_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/09_gpasswd_gshadow_openRO_failure/config/etc/group rename to tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/group diff --git a/tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_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/09_gpasswd_gshadow_openRO_failure/config/etc/gshadow rename to tests/failures/gpasswd/09_gpasswd_gshadow_openRO_failure/config/etc/gshadow diff --git a/tests/tests/failures/gpasswd/09_gpasswd_gshadow_openRO_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/09_gpasswd_gshadow_openRO_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/09_gpasswd_gshadow_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/09_gpasswd_gshadow_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/09_gpasswd_gshadow_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/09_gpasswd_gshadow_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/10_gpasswd_group_rename_failure/config.txt b/tests/failures/gpasswd/10_gpasswd_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/gpasswd/10_gpasswd_group_rename_failure/config.txt diff --git a/tests/tests/failures/gpasswd/10_gpasswd_group_rename_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/10_gpasswd_group_rename_failure/config/etc/group rename to tests/failures/gpasswd/10_gpasswd_group_rename_failure/config/etc/group diff --git a/tests/tests/failures/gpasswd/10_gpasswd_group_rename_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/10_gpasswd_group_rename_failure/config/etc/gshadow rename to tests/failures/gpasswd/10_gpasswd_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/gpasswd/10_gpasswd_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/gpasswd/10_gpasswd_group_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/10_gpasswd_group_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/10_gpasswd_group_rename_failure/config/etc/passwd diff --git a/tests/tests/failures/gpasswd/10_gpasswd_group_rename_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/10_gpasswd_group_rename_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/11_gpasswd_gshadow_rename_failure/config.txt b/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config.txt similarity index 100% rename from tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config.txt rename to tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config.txt diff --git a/tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_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/11_gpasswd_gshadow_rename_failure/config/etc/group rename to tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/group diff --git a/tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_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/11_gpasswd_gshadow_rename_failure/config/etc/gshadow rename to tests/failures/gpasswd/11_gpasswd_gshadow_rename_failure/config/etc/gshadow diff --git a/tests/tests/failures/gpasswd/11_gpasswd_gshadow_rename_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/11_gpasswd_gshadow_rename_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/11_gpasswd_gshadow_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/11_gpasswd_gshadow_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/11_gpasswd_gshadow_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/11_gpasswd_gshadow_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/groupadd/01_groupadd_gshadow_rename_failure/config.txt b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config.txt similarity index 100% rename from tests/tests/failures/groupadd/01_groupadd_gshadow_rename_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/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/group b/tests/failures/groupadd/01_groupadd_gshadow_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/01_groupadd_gshadow_rename_failure/config/etc/group diff --git a/tests/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/config/etc/gshadow b/tests/failures/groupadd/01_groupadd_gshadow_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/01_groupadd_gshadow_rename_failure/config/etc/gshadow diff --git a/tests/tests/failures/groupadd/01_groupadd_gshadow_rename_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/groupadd/01_groupadd_gshadow_rename_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/groupadd/01_groupadd_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/groupadd/01_groupadd_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/groupadd/01_groupadd_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/groupadd/01_groupadd_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/groupadd/02_groupadd_group_rename_failure/config.txt b/tests/failures/groupadd/02_groupadd_group_rename_failure/config.txt similarity index 100% rename from tests/tests/failures/groupadd/02_groupadd_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/02_groupadd_group_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/02_groupadd_group_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/02_groupadd_group_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/02_groupadd_group_rename_failure/config/etc/gshadow rename to tests/failures/groupadd/02_groupadd_group_rename_failure/config/etc/gshadow diff --git a/tests/tests/failures/groupadd/02_groupadd_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/groupadd/02_groupadd_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/02_groupadd_group_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/02_groupadd_group_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/02_groupadd_group_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/02_groupadd_group_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/groupadd/03_groupadd_gshadow_open_failure/config.txt b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/config.txt similarity index 100% rename from tests/tests/failures/groupadd/03_groupadd_gshadow_open_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/03_groupadd_gshadow_open_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/03_groupadd_gshadow_open_failure/config/etc/group rename to tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/group diff --git a/tests/tests/failures/groupadd/03_groupadd_gshadow_open_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/03_groupadd_gshadow_open_failure/config/etc/gshadow rename to tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/gshadow diff --git a/tests/tests/failures/groupadd/03_groupadd_gshadow_open_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/groupadd/03_groupadd_gshadow_open_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/03_groupadd_gshadow_open_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/03_groupadd_gshadow_open_failure/config/etc/passwd rename to tests/failures/groupadd/03_groupadd_gshadow_open_failure/config/etc/passwd diff --git a/tests/tests/failures/groupadd/03_groupadd_gshadow_open_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/03_groupadd_gshadow_open_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/04_groupadd_group_open_failure/config.txt b/tests/failures/groupadd/04_groupadd_group_open_failure/config.txt similarity index 100% rename from tests/tests/failures/groupadd/04_groupadd_group_open_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/04_groupadd_group_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/04_groupadd_group_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/04_groupadd_group_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/04_groupadd_group_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/04_groupadd_group_open_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/04_groupadd_group_open_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/04_groupadd_group_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/04_groupadd_group_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/04_groupadd_group_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/04_groupadd_group_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/groupdel/01_groupdel_gshadow_rename_failure/config.txt b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config.txt similarity index 100% rename from tests/tests/failures/groupdel/01_groupdel_gshadow_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/groupdel/01_groupdel_gshadow_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/groupdel/01_groupdel_gshadow_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/groupdel/01_groupdel_gshadow_rename_failure/config/etc/passwd b/tests/failures/groupdel/01_groupdel_gshadow_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/01_groupdel_gshadow_rename_failure/config/etc/passwd diff --git a/tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/config/etc/shadow b/tests/failures/groupdel/01_groupdel_gshadow_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/01_groupdel_gshadow_rename_failure/config/etc/shadow diff --git a/tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/group b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/group similarity index 100% rename from tests/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/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/groupdel/02_groupdel_group_rename_failure/config.txt b/tests/failures/groupdel/02_groupdel_group_rename_failure/config.txt similarity index 100% rename from tests/tests/failures/groupdel/02_groupdel_group_rename_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/groupdel/02_groupdel_group_rename_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/groupdel/02_groupdel_group_rename_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/02_groupdel_group_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/02_groupdel_group_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/02_groupdel_group_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/02_groupdel_group_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/groupdel/03_groupdel_gshadow_open_failure/config.txt b/tests/failures/groupdel/03_groupdel_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/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/groupdel/03_groupdel_gshadow_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/groupdel/03_groupdel_gshadow_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/03_groupdel_gshadow_open_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/03_groupdel_gshadow_open_failure/config/etc/passwd rename to tests/failures/groupdel/03_groupdel_gshadow_open_failure/config/etc/passwd diff --git a/tests/tests/failures/groupdel/03_groupdel_gshadow_open_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/03_groupdel_gshadow_open_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/04_groupdel_group_open_failure/config.txt b/tests/failures/groupdel/04_groupdel_group_open_failure/config.txt similarity index 100% rename from tests/tests/failures/groupdel/04_groupdel_group_open_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/04_groupdel_group_open_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/04_groupdel_group_open_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/04_groupdel_group_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/04_groupdel_group_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/04_groupdel_group_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/04_groupdel_group_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/groupmems/01_groupmems_group_open_failure/config.txt b/tests/failures/groupmems/01_groupmems_group_open_failure/config.txt similarity index 100% rename from tests/tests/failures/groupmems/01_groupmems_group_open_failure/config.txt rename to tests/failures/groupmems/01_groupmems_group_open_failure/config.txt diff --git a/tests/tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/group b/tests/failures/groupmems/01_groupmems_group_open_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/groupmems/01_groupmems_group_open_failure/config/etc/group diff --git a/tests/tests/failures/groupmems/01_groupmems_group_open_failure/config/etc/gshadow b/tests/failures/groupmems/01_groupmems_group_open_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/groupmems/01_groupmems_group_open_failure/config/etc/gshadow diff --git a/tests/tests/failures/groupmems/01_groupmems_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/groupmems/01_groupmems_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/groupmems/01_groupmems_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/groupmems/01_groupmems_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/groupmems/02_groupmems_gshadow_open_failure/config.txt b/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config.txt similarity index 100% rename from tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config.txt rename to tests/failures/groupmems/02_groupmems_gshadow_open_failure/config.txt diff --git a/tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/group b/tests/failures/groupmems/02_groupmems_gshadow_open_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/groupmems/02_groupmems_gshadow_open_failure/config/etc/group diff --git a/tests/tests/failures/groupmems/02_groupmems_gshadow_open_failure/config/etc/gshadow b/tests/failures/groupmems/02_groupmems_gshadow_open_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/groupmems/02_groupmems_gshadow_open_failure/config/etc/gshadow diff --git a/tests/tests/failures/groupmems/02_groupmems_gshadow_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/02_groupmems_gshadow_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/02_groupmems_gshadow_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/02_groupmems_gshadow_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/groupmod/01_groupmod_change_group_name_gshadow_rename_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/groupmod/01_groupmod_change_group_name_gshadow_rename_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/groupmod/01_groupmod_change_group_name_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/groupmod/01_groupmod_change_group_name_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/groupmod/01_groupmod_change_group_name_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/groupmod/01_groupmod_change_group_name_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/groupmod/01_groupmod_change_group_name_gshadow_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/groupmod/01_groupmod_change_group_name_gshadow_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/groupmod/01_groupmod_change_group_name_gshadow_rename_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/groupmod/01_groupmod_change_group_name_gshadow_rename_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/groupmod/01_groupmod_change_group_name_gshadow_rename_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/groupmod/01_groupmod_change_group_name_gshadow_rename_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/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_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/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_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/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_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/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_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/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_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/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_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/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_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/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_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/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/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/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/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/groupmod/03_groupmod_change_group_name_group_rename_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/groupmod/03_groupmod_change_group_name_group_rename_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/groupmod/03_groupmod_change_group_name_group_rename_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/groupmod/03_groupmod_change_group_name_group_rename_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/groupmod/03_groupmod_change_group_name_group_rename_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/groupmod/03_groupmod_change_group_name_group_rename_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/groupmod/03_groupmod_change_group_name_group_rename_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/groupmod/03_groupmod_change_group_name_group_rename_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/03_groupmod_change_group_name_group_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/03_groupmod_change_group_name_group_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/03_groupmod_change_group_name_group_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/03_groupmod_change_group_name_group_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/04_groupmod_group_open_failure/config.txt b/tests/failures/groupmod/04_groupmod_group_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/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/04_groupmod_group_open_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/04_groupmod_group_open_failure/config/etc/group rename to tests/failures/groupmod/04_groupmod_group_open_failure/config/etc/group diff --git a/tests/tests/failures/groupmod/04_groupmod_group_open_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/04_groupmod_group_open_failure/config/etc/gshadow rename to tests/failures/groupmod/04_groupmod_group_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/04_groupmod_group_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/04_groupmod_group_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/04_groupmod_group_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/04_groupmod_group_open_failure/config/etc/passwd diff --git a/tests/tests/failures/groupmod/04_groupmod_group_open_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/04_groupmod_group_open_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/05_groupmod_gshadow_open_failure/config.txt b/tests/failures/groupmod/05_groupmod_gshadow_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/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/05_groupmod_gshadow_open_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/05_groupmod_gshadow_open_failure/config/etc/group rename to tests/failures/groupmod/05_groupmod_gshadow_open_failure/config/etc/group diff --git a/tests/tests/failures/groupmod/05_groupmod_gshadow_open_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/05_groupmod_gshadow_open_failure/config/etc/gshadow rename to tests/failures/groupmod/05_groupmod_gshadow_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/05_groupmod_gshadow_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/05_groupmod_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/05_groupmod_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/05_groupmod_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/05_groupmod_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/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/06_groupmod_-g_no_gshadow_open_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/06_groupmod_-g_no_gshadow_open_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/06_groupmod_-g_no_gshadow_open_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/06_groupmod_-g_no_gshadow_open_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/06_groupmod_-g_no_gshadow_open_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/06_groupmod_-g_no_gshadow_open_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/06_groupmod_-g_no_gshadow_open_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/06_groupmod_-g_no_gshadow_open_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/06_groupmod_-g_no_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/06_groupmod_-g_no_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/06_groupmod_-g_no_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/06_groupmod_-g_no_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/07_groupmod_passwd_open_failure/config.txt b/tests/failures/groupmod/07_groupmod_passwd_open_failure/config.txt similarity index 100% rename from tests/tests/failures/groupmod/07_groupmod_passwd_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/07_groupmod_passwd_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/07_groupmod_passwd_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/07_groupmod_passwd_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/07_groupmod_passwd_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/07_groupmod_passwd_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/07_groupmod_passwd_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/08_groupmod_-g_same_gid_no_passwd_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/08_groupmod_-g_same_gid_no_passwd_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/08_groupmod_-g_same_gid_no_passwd_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/08_groupmod_-g_same_gid_no_passwd_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/08_groupmod_-g_same_gid_no_passwd_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/08_groupmod_-g_same_gid_no_passwd_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/08_groupmod_-g_same_gid_no_passwd_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/08_groupmod_-g_same_gid_no_passwd_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/09_groupmod_-n_no_passwd_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/09_groupmod_-n_no_passwd_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/09_groupmod_-n_no_passwd_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/09_groupmod_-n_no_passwd_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/09_groupmod_-n_no_passwd_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/09_groupmod_-n_no_passwd_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/09_groupmod_-n_no_passwd_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/09_groupmod_-n_no_passwd_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/grpck/01_grpck_system_group_open_failure/config.txt b/tests/failures/grpck/01_grpck_system_group_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/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/grpck/01_grpck_system_group_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/grpck/01_grpck_system_group_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/grpck/01_grpck_system_group_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/grpck/01_grpck_system_group_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/grpck/01_grpck_system_group_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/grpck/01_grpck_system_group_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/grpck/01_grpck_system_group_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/grpck/01_grpck_system_group_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/grpck/01_grpck_system_group_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/grpck/01_grpck_system_group_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/grpck/02_grpck_group_open_failure/config.txt b/tests/failures/grpck/02_grpck_group_open_failure/config.txt similarity index 100% rename from tests/tests/failures/grpck/02_grpck_group_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/grpck/02_grpck_group_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/grpck/02_grpck_group_open_failure/config/etc/group rename to tests/failures/grpck/02_grpck_group_open_failure/config/etc/group diff --git a/tests/tests/failures/grpck/02_grpck_group_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/grpck/02_grpck_group_open_failure/config/etc/gshadow rename to tests/failures/grpck/02_grpck_group_open_failure/config/etc/gshadow diff --git a/tests/tests/failures/grpck/02_grpck_group_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/grpck/02_grpck_group_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/02_grpck_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/02_grpck_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/02_grpck_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/02_grpck_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/grpck/03_grpck_system_gshadow_open_failure/config.txt b/tests/failures/grpck/03_grpck_system_gshadow_open_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/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/grpck/03_grpck_system_gshadow_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/grpck/03_grpck_system_gshadow_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/grpck/03_grpck_system_gshadow_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/grpck/03_grpck_system_gshadow_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/grpck/03_grpck_system_gshadow_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/grpck/03_grpck_system_gshadow_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/03_grpck_system_gshadow_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/03_grpck_system_gshadow_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/03_grpck_system_gshadow_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/03_grpck_system_gshadow_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/04_grpck_gshadow_open_failure/config.txt b/tests/failures/grpck/04_grpck_gshadow_open_failure/config.txt similarity index 100% rename from tests/tests/failures/grpck/04_grpck_gshadow_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/04_grpck_gshadow_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/04_grpck_gshadow_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/04_grpck_gshadow_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/04_grpck_gshadow_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/04_grpck_gshadow_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/04_grpck_gshadow_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/04_grpck_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/04_grpck_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/04_grpck_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/04_grpck_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/04_grpck_gshadow_open_failure/data/group b/tests/failures/grpck/04_grpck_gshadow_open_failure/data/group similarity index 100% rename from tests/tests/failures/grpck/04_grpck_gshadow_open_failure/data/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/04_grpck_gshadow_open_failure/data/gshadow b/tests/failures/grpck/04_grpck_gshadow_open_failure/data/gshadow similarity index 100% rename from tests/tests/failures/grpck/04_grpck_gshadow_open_failure/data/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/05_grpck_sort_group_rename_failure/config.txt b/tests/failures/grpck/05_grpck_sort_group_rename_failure/config.txt similarity index 100% rename from tests/tests/failures/grpck/05_grpck_sort_group_rename_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/05_grpck_sort_group_rename_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/05_grpck_sort_group_rename_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/grpck/05_grpck_sort_group_rename_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/grpck/05_grpck_sort_group_rename_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/06_grpck_sort_gshadow_rename_failure/config.txt b/tests/failures/grpck/06_grpck_sort_gshadow_rename_failure/config.txt similarity index 100% rename from tests/tests/failures/grpck/06_grpck_sort_gshadow_rename_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/06_grpck_sort_gshadow_rename_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/06_grpck_sort_gshadow_rename_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/grpck/06_grpck_sort_gshadow_rename_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/grpck/06_grpck_sort_gshadow_rename_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/grpconv/01_grpconv_open_group_failure/config.txt b/tests/failures/grpconv/01_grpconv_open_group_failure/config.txt similarity index 100% rename from tests/tests/failures/grpconv/01_grpconv_open_group_failure/config.txt rename to tests/failures/grpconv/01_grpconv_open_group_failure/config.txt diff --git a/tests/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/group b/tests/failures/grpconv/01_grpconv_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/grpconv/01_grpconv_open_group_failure/config/etc/group diff --git a/tests/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/gshadow b/tests/failures/grpconv/01_grpconv_open_group_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/01_grpconv_open_group_failure/config/etc/gshadow diff --git a/tests/tests/failures/grpconv/01_grpconv_open_group_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/grpconv/01_grpconv_open_group_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/grpconv/01_grpconv_open_group_failure/config/etc/passwd b/tests/failures/grpconv/01_grpconv_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/grpconv/01_grpconv_open_group_failure/config/etc/passwd diff --git a/tests/tests/failures/grpconv/01_grpconv_open_group_failure/config/etc/shadow b/tests/failures/grpconv/01_grpconv_open_group_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/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/grpconv/02_grpconv_open_gshadow_failure/config.txt b/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config.txt similarity index 100% rename from tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config.txt rename to tests/failures/grpconv/02_grpconv_open_gshadow_failure/config.txt diff --git a/tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/group b/tests/failures/grpconv/02_grpconv_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/grpconv/02_grpconv_open_gshadow_failure/config/etc/group diff --git a/tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/gshadow b/tests/failures/grpconv/02_grpconv_open_gshadow_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/grpconv/02_grpconv_open_gshadow_failure/config/etc/gshadow diff --git a/tests/tests/failures/grpconv/02_grpconv_open_gshadow_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/grpconv/02_grpconv_open_gshadow_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/grpconv/02_grpconv_open_gshadow_failure/config/etc/passwd b/tests/failures/grpconv/02_grpconv_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/grpconv/02_grpconv_open_gshadow_failure/config/etc/passwd diff --git a/tests/tests/failures/grpconv/02_grpconv_open_gshadow_failure/config/etc/shadow b/tests/failures/grpconv/02_grpconv_open_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/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/grpconv/03_grpconv_rename_group_failure/config.txt b/tests/failures/grpconv/03_grpconv_rename_group_failure/config.txt similarity index 100% rename from tests/tests/failures/grpconv/03_grpconv_rename_group_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/grpconv/03_grpconv_rename_group_failure/config/etc/gshadow b/tests/failures/grpconv/03_grpconv_rename_group_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/grpconv/03_grpconv_rename_group_failure/config/etc/gshadow diff --git a/tests/tests/failures/grpconv/03_grpconv_rename_group_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/grpconv/03_grpconv_rename_group_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/grpconv/03_grpconv_rename_group_failure/config/etc/passwd b/tests/failures/grpconv/03_grpconv_rename_group_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/03_grpconv_rename_group_failure/config/etc/passwd diff --git a/tests/tests/failures/grpconv/03_grpconv_rename_group_failure/config/etc/shadow b/tests/failures/grpconv/03_grpconv_rename_group_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/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/04_grpconv_rename_gshadow_failure/config.txt b/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config.txt similarity index 100% rename from tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config.txt rename to tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config.txt diff --git a/tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/group b/tests/failures/grpconv/04_grpconv_rename_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/grpconv/04_grpconv_rename_gshadow_failure/config/etc/group diff --git a/tests/tests/failures/grpconv/04_grpconv_rename_gshadow_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/04_grpconv_rename_gshadow_failure/config/etc/gshadow rename to tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/gshadow diff --git a/tests/tests/failures/grpconv/04_grpconv_rename_gshadow_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/04_grpconv_rename_gshadow_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/04_grpconv_rename_gshadow_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/04_grpconv_rename_gshadow_failure/config/etc/passwd rename to tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/passwd diff --git a/tests/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/shadow b/tests/failures/grpconv/04_grpconv_rename_gshadow_failure/config/etc/shadow similarity index 100% rename from tests/tests/failures/grpconv/04_grpconv_rename_gshadow_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/grpunconv/01_grpunconv_group_rename_failure/config.txt b/tests/failures/grpunconv/01_grpunconv_group_rename_failure/config.txt similarity index 100% rename from tests/tests/failures/grpunconv/01_grpunconv_group_rename_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/grpunconv/01_grpunconv_group_rename_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/grpunconv/01_grpunconv_group_rename_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/grpunconv/01_grpunconv_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/grpunconv/01_grpunconv_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/grpunconv/02_grpunconv_open_group_failure/config.txt b/tests/failures/grpunconv/02_grpunconv_open_group_failure/config.txt similarity index 100% rename from tests/tests/failures/grpunconv/02_grpunconv_open_group_failure/config.txt rename to tests/failures/grpunconv/02_grpunconv_open_group_failure/config.txt diff --git a/tests/tests/failures/grpunconv/02_grpunconv_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/grpunconv/02_grpunconv_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/grpunconv/02_grpunconv_open_group_failure/config/etc/gshadow b/tests/failures/grpunconv/02_grpunconv_open_group_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/grpunconv/02_grpunconv_open_group_failure/config/etc/gshadow diff --git a/tests/tests/failures/grpunconv/02_grpunconv_open_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/grpunconv/02_grpunconv_open_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/grpunconv/02_grpunconv_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/grpunconv/02_grpunconv_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/grpunconv/02_grpunconv_open_group_failure/config/etc/shadow b/tests/failures/grpunconv/02_grpunconv_open_group_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/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/grpunconv/03_grpunconv_open_gshadow_failure/config.txt b/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config.txt similarity index 100% rename from tests/tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config.txt rename to tests/failures/grpunconv/03_grpunconv_open_gshadow_failure/config.txt diff --git a/tests/tests/failures/grpunconv/03_grpunconv_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/grpunconv/03_grpunconv_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/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/gshadow b/tests/failures/grpunconv/03_grpunconv_open_gshadow_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/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/gshadow diff --git a/tests/tests/failures/grpunconv/03_grpunconv_open_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/grpunconv/03_grpunconv_open_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/grpunconv/03_grpunconv_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/grpunconv/03_grpunconv_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/grpunconv/03_grpunconv_open_gshadow_failure/config/etc/shadow b/tests/failures/grpunconv/03_grpunconv_open_gshadow_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/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/04_grpunconv_unlink_gshadow_failure/config.txt b/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config.txt similarity index 100% rename from tests/tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config.txt rename to tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config.txt diff --git a/tests/tests/failures/grpunconv/04_grpunconv_unlink_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/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/group rename to tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/group diff --git a/tests/tests/failures/grpunconv/04_grpunconv_unlink_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/grpunconv/04_grpunconv_unlink_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/04_grpunconv_unlink_gshadow_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/04_grpunconv_unlink_gshadow_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/04_grpunconv_unlink_gshadow_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/04_grpunconv_unlink_gshadow_failure/config/etc/passwd rename to tests/failures/grpunconv/04_grpunconv_unlink_gshadow_failure/config/etc/passwd diff --git a/tests/tests/failures/grpunconv/04_grpunconv_unlink_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/grpunconv/04_grpunconv_unlink_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/newusers/01_newusers_open_passwd_failure/config.txt b/tests/failures/newusers/01_newusers_open_passwd_failure/config.txt similarity index 100% rename from tests/tests/failures/newusers/01_newusers_open_passwd_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/newusers/01_newusers_open_passwd_failure/config/etc/group b/tests/failures/newusers/01_newusers_open_passwd_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/01_newusers_open_passwd_failure/config/etc/group diff --git a/tests/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/gshadow b/tests/failures/newusers/01_newusers_open_passwd_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/01_newusers_open_passwd_failure/config/etc/gshadow diff --git a/tests/tests/failures/newusers/01_newusers_open_passwd_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/newusers/01_newusers_open_passwd_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/newusers/01_newusers_open_passwd_failure/config/etc/passwd b/tests/failures/newusers/01_newusers_open_passwd_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/01_newusers_open_passwd_failure/config/etc/passwd diff --git a/tests/tests/failures/newusers/01_newusers_open_passwd_failure/config/etc/shadow b/tests/failures/newusers/01_newusers_open_passwd_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/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/newusers/02_newusers_open_shadow_failure/config.txt b/tests/failures/newusers/02_newusers_open_shadow_failure/config.txt similarity index 100% rename from tests/tests/failures/newusers/02_newusers_open_shadow_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/02_newusers_open_shadow_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/02_newusers_open_shadow_failure/config/etc/group rename to tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/group diff --git a/tests/tests/failures/newusers/02_newusers_open_shadow_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/02_newusers_open_shadow_failure/config/etc/gshadow rename to tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/gshadow diff --git a/tests/tests/failures/newusers/02_newusers_open_shadow_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/newusers/02_newusers_open_shadow_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/02_newusers_open_shadow_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/02_newusers_open_shadow_failure/config/etc/passwd rename to tests/failures/newusers/02_newusers_open_shadow_failure/config/etc/passwd diff --git a/tests/tests/failures/newusers/02_newusers_open_shadow_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/02_newusers_open_shadow_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/newusers/03_newusers_open_group_failure/config.txt b/tests/failures/newusers/03_newusers_open_group_failure/config.txt similarity index 100% rename from tests/tests/failures/newusers/03_newusers_open_group_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/03_newusers_open_group_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/03_newusers_open_group_failure/config/etc/group rename to tests/failures/newusers/03_newusers_open_group_failure/config/etc/group diff --git a/tests/tests/failures/newusers/03_newusers_open_group_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/03_newusers_open_group_failure/config/etc/gshadow rename to tests/failures/newusers/03_newusers_open_group_failure/config/etc/gshadow diff --git a/tests/tests/failures/newusers/03_newusers_open_group_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/newusers/03_newusers_open_group_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/03_newusers_open_group_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/03_newusers_open_group_failure/config/etc/passwd rename to tests/failures/newusers/03_newusers_open_group_failure/config/etc/passwd diff --git a/tests/tests/failures/newusers/03_newusers_open_group_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/03_newusers_open_group_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/04_newusers_open_gshadow_failure/config.txt b/tests/failures/newusers/04_newusers_open_gshadow_failure/config.txt similarity index 100% rename from tests/tests/failures/newusers/04_newusers_open_gshadow_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/04_newusers_open_gshadow_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/04_newusers_open_gshadow_failure/config/etc/group rename to tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/group diff --git a/tests/tests/failures/newusers/04_newusers_open_gshadow_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/04_newusers_open_gshadow_failure/config/etc/gshadow rename to tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/gshadow diff --git a/tests/tests/failures/newusers/04_newusers_open_gshadow_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/04_newusers_open_gshadow_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/04_newusers_open_gshadow_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/04_newusers_open_gshadow_failure/config/etc/passwd rename to tests/failures/newusers/04_newusers_open_gshadow_failure/config/etc/passwd diff --git a/tests/tests/failures/newusers/04_newusers_open_gshadow_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/04_newusers_open_gshadow_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/05_newusers_rename_passwd_failure/config.txt b/tests/failures/newusers/05_newusers_rename_passwd_failure/config.txt similarity index 100% rename from tests/tests/failures/newusers/05_newusers_rename_passwd_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/newusers/05_newusers_rename_passwd_failure/config/etc/group b/tests/failures/newusers/05_newusers_rename_passwd_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/05_newusers_rename_passwd_failure/config/etc/group diff --git a/tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/gshadow b/tests/failures/newusers/05_newusers_rename_passwd_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/05_newusers_rename_passwd_failure/config/etc/gshadow diff --git a/tests/tests/failures/newusers/05_newusers_rename_passwd_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/05_newusers_rename_passwd_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/newusers/05_newusers_rename_passwd_failure/config/etc/passwd b/tests/failures/newusers/05_newusers_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/newusers/05_newusers_rename_passwd_failure/config/etc/passwd diff --git a/tests/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/shadow b/tests/failures/newusers/05_newusers_rename_passwd_failure/config/etc/shadow similarity index 100% rename from tests/tests/failures/newusers/05_newusers_rename_passwd_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/06_newusers_rename_shadow_failure/config.txt b/tests/failures/newusers/06_newusers_rename_shadow_failure/config.txt similarity index 100% rename from tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config.txt rename to tests/failures/newusers/06_newusers_rename_shadow_failure/config.txt diff --git a/tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/group b/tests/failures/newusers/06_newusers_rename_shadow_failure/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/06_newusers_rename_shadow_failure/config/etc/group diff --git a/tests/tests/failures/newusers/06_newusers_rename_shadow_failure/config/etc/gshadow b/tests/failures/newusers/06_newusers_rename_shadow_failure/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/06_newusers_rename_shadow_failure/config/etc/gshadow diff --git a/tests/tests/failures/newusers/06_newusers_rename_shadow_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/06_newusers_rename_shadow_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/06_newusers_rename_shadow_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/06_newusers_rename_shadow_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/07_newusers_rename_group_failure/config.txt b/tests/failures/newusers/07_newusers_rename_group_failure/config.txt similarity index 100% rename from tests/tests/failures/newusers/07_newusers_rename_group_failure/config.txt rename to tests/failures/newusers/07_newusers_rename_group_failure/config.txt diff --git a/tests/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/group b/tests/failures/newusers/07_newusers_rename_group_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/newusers/07_newusers_rename_group_failure/config/etc/group diff --git a/tests/tests/failures/newusers/07_newusers_rename_group_failure/config/etc/gshadow b/tests/failures/newusers/07_newusers_rename_group_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/newusers/07_newusers_rename_group_failure/config/etc/gshadow diff --git a/tests/tests/failures/newusers/07_newusers_rename_group_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/07_newusers_rename_group_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/07_newusers_rename_group_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/07_newusers_rename_group_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/08_newusers_rename_gshadow_failure/config.txt b/tests/failures/newusers/08_newusers_rename_gshadow_failure/config.txt similarity index 100% rename from tests/tests/failures/newusers/08_newusers_rename_gshadow_failure/config.txt rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/config.txt diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_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/08_newusers_rename_gshadow_failure/config/etc/group rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/group diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_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/08_newusers_rename_gshadow_failure/config/etc/gshadow rename to tests/failures/newusers/08_newusers_rename_gshadow_failure/config/etc/gshadow diff --git a/tests/tests/failures/newusers/08_newusers_rename_gshadow_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/08_newusers_rename_gshadow_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/08_newusers_rename_gshadow_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/08_newusers_rename_gshadow_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/09_newusers_rename_shadow_failure_PAM/config.txt b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config.txt similarity index 100% rename from tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config.txt rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config.txt diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/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/09_newusers_rename_shadow_failure_PAM/config/etc/group rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/group diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/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/09_newusers_rename_shadow_failure_PAM/config/etc/gshadow rename to tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/gshadow diff --git a/tests/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/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/09_newusers_rename_shadow_failure_PAM/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/newusers/09_newusers_rename_shadow_failure_PAM/config/etc/shadow b/tests/failures/newusers/09_newusers_rename_shadow_failure_PAM/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/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/10_newusers_time_0/config/etc/passwd b/tests/failures/newusers/10_newusers_time_0/config/etc/passwd similarity index 100% rename from tests/tests/failures/newusers/10_newusers_time_0/config/etc/passwd rename to tests/failures/newusers/10_newusers_time_0/config/etc/passwd diff --git a/tests/tests/failures/newusers/10_newusers_time_0/config/etc/shadow b/tests/failures/newusers/10_newusers_time_0/config/etc/shadow similarity index 100% rename from tests/tests/failures/newusers/10_newusers_time_0/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/pwck/01_pwck_system_passwd_open_failure/config.txt b/tests/failures/pwck/01_pwck_system_passwd_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/01_pwck_system_passwd_open_failure/config.txt diff --git a/tests/tests/failures/pwck/01_pwck_system_passwd_open_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/pwck/01_pwck_system_passwd_open_failure/config/etc/group rename to tests/failures/pwck/01_pwck_system_passwd_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/01_pwck_system_passwd_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/01_pwck_system_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/01_pwck_system_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/01_pwck_system_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/01_pwck_system_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/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/pwck/02_pwck_passwd_open_failure/config.txt b/tests/failures/pwck/02_pwck_passwd_open_failure/config.txt similarity index 100% rename from tests/tests/failures/pwck/02_pwck_passwd_open_failure/config.txt rename to tests/failures/pwck/02_pwck_passwd_open_failure/config.txt diff --git a/tests/tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/group b/tests/failures/pwck/02_pwck_passwd_open_failure/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/02_pwck_passwd_open_failure/config/etc/group diff --git a/tests/tests/failures/pwck/02_pwck_passwd_open_failure/config/etc/gshadow b/tests/failures/pwck/02_pwck_passwd_open_failure/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/02_pwck_passwd_open_failure/config/etc/gshadow diff --git a/tests/tests/failures/pwck/02_pwck_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/02_pwck_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/02_pwck_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/02_pwck_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/pwck/03_pwck_system_shadow_open_failure/config.txt b/tests/failures/pwck/03_pwck_system_shadow_open_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/03_pwck_system_shadow_open_failure/config.txt diff --git a/tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/group b/tests/failures/pwck/03_pwck_system_shadow_open_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/pwck/03_pwck_system_shadow_open_failure/config/etc/group diff --git a/tests/tests/failures/pwck/03_pwck_system_shadow_open_failure/config/etc/gshadow b/tests/failures/pwck/03_pwck_system_shadow_open_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/pwck/03_pwck_system_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/03_pwck_system_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/03_pwck_system_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/03_pwck_system_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/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/04_pwck_shadow_open_failure/config.txt b/tests/failures/pwck/04_pwck_shadow_open_failure/config.txt similarity index 100% rename from tests/tests/failures/pwck/04_pwck_shadow_open_failure/config.txt rename to tests/failures/pwck/04_pwck_shadow_open_failure/config.txt diff --git a/tests/tests/failures/pwck/04_pwck_shadow_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/04_pwck_shadow_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/04_pwck_shadow_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/04_pwck_shadow_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/04_pwck_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/04_pwck_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/04_pwck_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/04_pwck_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/data/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/data/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/05_pwck_sort_system_passwd_rename_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/05_pwck_sort_system_passwd_rename_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/pwck/05_pwck_sort_system_passwd_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/pwck/05_pwck_sort_system_passwd_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/06_pwck_sort_system_shadow_rename_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/06_pwck_sort_system_shadow_rename_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/pwck/06_pwck_sort_system_shadow_rename_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/pwck/06_pwck_sort_system_shadow_rename_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/07_pwck_sort_passwd_rename_failure/config.txt b/tests/failures/pwck/07_pwck_sort_passwd_rename_failure/config.txt similarity index 100% rename from tests/tests/failures/pwck/07_pwck_sort_passwd_rename_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/pwck/07_pwck_sort_passwd_rename_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/pwck/07_pwck_sort_passwd_rename_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/08_pwck_sort_shadow_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/08_pwck_sort_shadow_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/pwck/08_pwck_sort_shadow_rename_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/pwck/08_pwck_sort_shadow_rename_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/pwck/08_pwck_sort_shadow_rename_failure/data/shadow b/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/shadow similarity index 100% rename from tests/tests/failures/pwck/08_pwck_sort_shadow_rename_failure/data/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/09_pwck_create_shadow_entry_time_0/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/09_pwck_create_shadow_entry_time_0/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/09_pwck_create_shadow_entry_time_0/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/09_pwck_create_shadow_entry_time_0/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/pwconv/01_pwconv_open_passwd_failure/config.txt b/tests/failures/pwconv/01_pwconv_open_passwd_failure/config.txt similarity index 100% rename from tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config.txt rename to tests/failures/pwconv/01_pwconv_open_passwd_failure/config.txt diff --git a/tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/group b/tests/failures/pwconv/01_pwconv_open_passwd_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/01_pwconv_open_passwd_failure/config/etc/group diff --git a/tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/gshadow b/tests/failures/pwconv/01_pwconv_open_passwd_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/01_pwconv_open_passwd_failure/config/etc/gshadow diff --git a/tests/tests/failures/pwconv/01_pwconv_open_passwd_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/pwconv/01_pwconv_open_passwd_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/pwconv/01_pwconv_open_passwd_failure/config/etc/passwd b/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/passwd similarity index 100% rename from tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/passwd rename to tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/passwd diff --git a/tests/tests/failures/pwconv/01_pwconv_open_passwd_failure/config/etc/shadow b/tests/failures/pwconv/01_pwconv_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/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/pwconv/02_pwconv_open_shadow_failure/config.txt b/tests/failures/pwconv/02_pwconv_open_shadow_failure/config.txt similarity index 100% rename from tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config.txt rename to tests/failures/pwconv/02_pwconv_open_shadow_failure/config.txt diff --git a/tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/group b/tests/failures/pwconv/02_pwconv_open_shadow_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/pwconv/02_pwconv_open_shadow_failure/config/etc/group diff --git a/tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/gshadow b/tests/failures/pwconv/02_pwconv_open_shadow_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/pwconv/02_pwconv_open_shadow_failure/config/etc/gshadow diff --git a/tests/tests/failures/pwconv/02_pwconv_open_shadow_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/pwconv/02_pwconv_open_shadow_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/pwconv/02_pwconv_open_shadow_failure/config/etc/passwd b/tests/failures/pwconv/02_pwconv_open_shadow_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/pwconv/02_pwconv_open_shadow_failure/config/etc/passwd diff --git a/tests/tests/failures/pwconv/02_pwconv_open_shadow_failure/config/etc/shadow b/tests/failures/pwconv/02_pwconv_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/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/pwconv/03_pwconv_rename_passwd_failure/config.txt b/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config.txt similarity index 100% rename from tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config.txt rename to tests/failures/pwconv/03_pwconv_rename_passwd_failure/config.txt diff --git a/tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/group b/tests/failures/pwconv/03_pwconv_rename_passwd_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/pwconv/03_pwconv_rename_passwd_failure/config/etc/group diff --git a/tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/gshadow b/tests/failures/pwconv/03_pwconv_rename_passwd_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/pwconv/03_pwconv_rename_passwd_failure/config/etc/gshadow diff --git a/tests/tests/failures/pwconv/03_pwconv_rename_passwd_failure/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/pwconv/03_pwconv_rename_passwd_failure/config/etc/login.defs rename to tests/failures/pwconv/03_pwconv_rename_passwd_failure/config/etc/login.defs diff --git a/tests/tests/failures/pwconv/03_pwconv_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/pwconv/03_pwconv_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/pwconv/03_pwconv_rename_passwd_failure/config/etc/shadow b/tests/failures/pwconv/03_pwconv_rename_passwd_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/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/04_pwconv_rename_shadow_failure/config.txt b/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config.txt similarity index 100% rename from tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config.txt rename to tests/failures/pwconv/04_pwconv_rename_shadow_failure/config.txt diff --git a/tests/tests/failures/pwconv/04_pwconv_rename_shadow_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/04_pwconv_rename_shadow_failure/config/etc/group rename to tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/group diff --git a/tests/tests/failures/pwconv/04_pwconv_rename_shadow_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/04_pwconv_rename_shadow_failure/config/etc/gshadow rename to tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/gshadow diff --git a/tests/tests/failures/pwconv/04_pwconv_rename_shadow_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/04_pwconv_rename_shadow_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/04_pwconv_rename_shadow_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/04_pwconv_rename_shadow_failure/config/etc/passwd rename to tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/passwd diff --git a/tests/tests/failures/pwconv/04_pwconv_rename_shadow_failure/config/etc/shadow b/tests/failures/pwconv/04_pwconv_rename_shadow_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/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/failures/pwconv/05_pwconv_time_0/config/etc/group b/tests/failures/pwconv/05_pwconv_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/pwconv/05_pwconv_time_0/config/etc/group diff --git a/tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/gshadow b/tests/failures/pwconv/05_pwconv_time_0/config/etc/gshadow similarity index 100% rename from tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/gshadow rename to tests/failures/pwconv/05_pwconv_time_0/config/etc/gshadow diff --git a/tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/passwd b/tests/failures/pwconv/05_pwconv_time_0/config/etc/passwd similarity index 100% rename from tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/passwd rename to tests/failures/pwconv/05_pwconv_time_0/config/etc/passwd diff --git a/tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/shadow b/tests/failures/pwconv/05_pwconv_time_0/config/etc/shadow similarity index 100% rename from tests/tests/failures/pwconv/05_pwconv_time_0/config/etc/shadow rename to tests/failures/pwconv/05_pwconv_time_0/config/etc/shadow diff --git a/tests/tests/failures/pwconv/05_pwconv_time_0/data/passwd b/tests/failures/pwconv/05_pwconv_time_0/data/passwd similarity index 100% rename from tests/tests/failures/pwconv/05_pwconv_time_0/data/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/pwunconv/01_pwunconv_passwd_rename_failure/config.txt b/tests/failures/pwunconv/01_pwunconv_passwd_rename_failure/config.txt similarity index 100% rename from tests/tests/failures/pwunconv/01_pwunconv_passwd_rename_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/pwunconv/01_pwunconv_passwd_rename_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/pwunconv/01_pwunconv_passwd_rename_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/pwunconv/01_pwunconv_passwd_rename_failure/config/etc/shadow b/tests/failures/pwunconv/01_pwunconv_passwd_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/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/pwunconv/02_pwunconv_open_passwd_failure/config.txt b/tests/failures/pwunconv/02_pwunconv_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/pwunconv/02_pwunconv_open_passwd_failure/config.txt diff --git a/tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/group b/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/group similarity index 100% rename from tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/group rename to tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/group diff --git a/tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/gshadow b/tests/failures/pwunconv/02_pwunconv_open_passwd_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/pwunconv/02_pwunconv_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/pwunconv/02_pwunconv_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/pwunconv/02_pwunconv_open_passwd_failure/config/etc/login.defs diff --git a/tests/tests/failures/pwunconv/02_pwunconv_open_passwd_failure/config/etc/passwd b/tests/failures/pwunconv/02_pwunconv_open_passwd_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/02_pwunconv_open_passwd_failure/config/etc/passwd diff --git a/tests/tests/failures/pwunconv/02_pwunconv_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/pwunconv/02_pwunconv_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/pwunconv/03_pwunconv_open_shadow_failure/config.txt b/tests/failures/pwunconv/03_pwunconv_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/pwunconv/03_pwunconv_open_shadow_failure/config.txt diff --git a/tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/group b/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/group similarity index 100% rename from tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/group rename to tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/group diff --git a/tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/gshadow b/tests/failures/pwunconv/03_pwunconv_open_shadow_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/pwunconv/03_pwunconv_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/pwunconv/03_pwunconv_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/pwunconv/03_pwunconv_open_shadow_failure/config/etc/login.defs diff --git a/tests/tests/failures/pwunconv/03_pwunconv_open_shadow_failure/config/etc/passwd b/tests/failures/pwunconv/03_pwunconv_open_shadow_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/pwunconv/03_pwunconv_open_shadow_failure/config/etc/passwd diff --git a/tests/tests/failures/pwunconv/03_pwunconv_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/pwunconv/03_pwunconv_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/04_pwunconv_unlink_shadow_failure/config.txt b/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config.txt similarity index 100% rename from tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config.txt rename to tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config.txt diff --git a/tests/tests/failures/pwunconv/04_pwunconv_unlink_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/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/group rename to tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/group diff --git a/tests/tests/failures/pwunconv/04_pwunconv_unlink_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/pwunconv/04_pwunconv_unlink_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/04_pwunconv_unlink_shadow_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/04_pwunconv_unlink_shadow_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/04_pwunconv_unlink_shadow_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/04_pwunconv_unlink_shadow_failure/config/etc/passwd rename to tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/passwd diff --git a/tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/shadow b/tests/failures/pwunconv/04_pwunconv_unlink_shadow_failure/config/etc/shadow similarity index 100% rename from tests/tests/failures/pwunconv/04_pwunconv_unlink_shadow_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/useradd/01_useradd_open_passwd_failure/config.txt b/tests/failures/useradd/01_useradd_open_passwd_failure/config.txt similarity index 100% rename from tests/tests/failures/useradd/01_useradd_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/useradd/01_useradd_open_passwd_failure/config/etc/group b/tests/failures/useradd/01_useradd_open_passwd_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/01_useradd_open_passwd_failure/config/etc/group diff --git a/tests/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/gshadow b/tests/failures/useradd/01_useradd_open_passwd_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/01_useradd_open_passwd_failure/config/etc/gshadow diff --git a/tests/tests/failures/useradd/01_useradd_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/useradd/01_useradd_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/useradd/01_useradd_open_passwd_failure/config/etc/passwd b/tests/failures/useradd/01_useradd_open_passwd_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/01_useradd_open_passwd_failure/config/etc/passwd diff --git a/tests/tests/failures/useradd/01_useradd_open_passwd_failure/config/etc/shadow b/tests/failures/useradd/01_useradd_open_passwd_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/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/useradd/02_useradd_open_shadow_failure/config.txt b/tests/failures/useradd/02_useradd_open_shadow_failure/config.txt similarity index 100% rename from tests/tests/failures/useradd/02_useradd_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/02_useradd_open_shadow_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/02_useradd_open_shadow_failure/config/etc/group rename to tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/group diff --git a/tests/tests/failures/useradd/02_useradd_open_shadow_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/02_useradd_open_shadow_failure/config/etc/gshadow rename to tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/gshadow diff --git a/tests/tests/failures/useradd/02_useradd_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/useradd/02_useradd_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/02_useradd_open_shadow_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/02_useradd_open_shadow_failure/config/etc/passwd rename to tests/failures/useradd/02_useradd_open_shadow_failure/config/etc/passwd diff --git a/tests/tests/failures/useradd/02_useradd_open_shadow_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/02_useradd_open_shadow_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/useradd/03_useradd_open_group_failure/config.txt b/tests/failures/useradd/03_useradd_open_group_failure/config.txt similarity index 100% rename from tests/tests/failures/useradd/03_useradd_open_group_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/03_useradd_open_group_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/03_useradd_open_group_failure/config/etc/group rename to tests/failures/useradd/03_useradd_open_group_failure/config/etc/group diff --git a/tests/tests/failures/useradd/03_useradd_open_group_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/03_useradd_open_group_failure/config/etc/gshadow rename to tests/failures/useradd/03_useradd_open_group_failure/config/etc/gshadow diff --git a/tests/tests/failures/useradd/03_useradd_open_group_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/useradd/03_useradd_open_group_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/03_useradd_open_group_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/03_useradd_open_group_failure/config/etc/passwd rename to tests/failures/useradd/03_useradd_open_group_failure/config/etc/passwd diff --git a/tests/tests/failures/useradd/03_useradd_open_group_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/03_useradd_open_group_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/04_useradd_open_gshadow_failure/config.txt b/tests/failures/useradd/04_useradd_open_gshadow_failure/config.txt similarity index 100% rename from tests/tests/failures/useradd/04_useradd_open_gshadow_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/04_useradd_open_gshadow_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/04_useradd_open_gshadow_failure/config/etc/group rename to tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/group diff --git a/tests/tests/failures/useradd/04_useradd_open_gshadow_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/04_useradd_open_gshadow_failure/config/etc/gshadow rename to tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/gshadow diff --git a/tests/tests/failures/useradd/04_useradd_open_gshadow_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/04_useradd_open_gshadow_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/04_useradd_open_gshadow_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/04_useradd_open_gshadow_failure/config/etc/passwd rename to tests/failures/useradd/04_useradd_open_gshadow_failure/config/etc/passwd diff --git a/tests/tests/failures/useradd/04_useradd_open_gshadow_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/04_useradd_open_gshadow_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/05_useradd_rename_passwd_failure/config.txt b/tests/failures/useradd/05_useradd_rename_passwd_failure/config.txt similarity index 100% rename from tests/tests/failures/useradd/05_useradd_rename_passwd_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/05_useradd_rename_passwd_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/05_useradd_rename_passwd_failure/config/etc/group rename to tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/group diff --git a/tests/tests/failures/useradd/05_useradd_rename_passwd_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/05_useradd_rename_passwd_failure/config/etc/gshadow rename to tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/gshadow diff --git a/tests/tests/failures/useradd/05_useradd_rename_passwd_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/05_useradd_rename_passwd_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/05_useradd_rename_passwd_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/05_useradd_rename_passwd_failure/config/etc/passwd rename to tests/failures/useradd/05_useradd_rename_passwd_failure/config/etc/passwd diff --git a/tests/tests/failures/useradd/05_useradd_rename_passwd_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/05_useradd_rename_passwd_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/06_useradd_rename_shadow_failure/config.txt b/tests/failures/useradd/06_useradd_rename_shadow_failure/config.txt similarity index 100% rename from tests/tests/failures/useradd/06_useradd_rename_shadow_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/06_useradd_rename_shadow_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/06_useradd_rename_shadow_failure/config/etc/group rename to tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/group diff --git a/tests/tests/failures/useradd/06_useradd_rename_shadow_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/06_useradd_rename_shadow_failure/config/etc/gshadow rename to tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/gshadow diff --git a/tests/tests/failures/useradd/06_useradd_rename_shadow_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/06_useradd_rename_shadow_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/06_useradd_rename_shadow_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/06_useradd_rename_shadow_failure/config/etc/passwd rename to tests/failures/useradd/06_useradd_rename_shadow_failure/config/etc/passwd diff --git a/tests/tests/failures/useradd/06_useradd_rename_shadow_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/06_useradd_rename_shadow_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/07_useradd_rename_group_failure/config.txt b/tests/failures/useradd/07_useradd_rename_group_failure/config.txt similarity index 100% rename from tests/tests/failures/useradd/07_useradd_rename_group_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/07_useradd_rename_group_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/07_useradd_rename_group_failure/config/etc/group rename to tests/failures/useradd/07_useradd_rename_group_failure/config/etc/group diff --git a/tests/tests/failures/useradd/07_useradd_rename_group_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/07_useradd_rename_group_failure/config/etc/gshadow rename to tests/failures/useradd/07_useradd_rename_group_failure/config/etc/gshadow diff --git a/tests/tests/failures/useradd/07_useradd_rename_group_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/07_useradd_rename_group_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/07_useradd_rename_group_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/07_useradd_rename_group_failure/config/etc/passwd rename to tests/failures/useradd/07_useradd_rename_group_failure/config/etc/passwd diff --git a/tests/tests/failures/useradd/07_useradd_rename_group_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/07_useradd_rename_group_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/08_useradd_rename_gshadow_failure/config.txt b/tests/failures/useradd/08_useradd_rename_gshadow_failure/config.txt similarity index 100% rename from tests/tests/failures/useradd/08_useradd_rename_gshadow_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/08_useradd_rename_gshadow_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/08_useradd_rename_gshadow_failure/config/etc/group rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/group diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_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/08_useradd_rename_gshadow_failure/config/etc/gshadow rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/gshadow diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_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/08_useradd_rename_gshadow_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/08_useradd_rename_gshadow_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/08_useradd_rename_gshadow_failure/config/etc/passwd rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/passwd diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_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/08_useradd_rename_gshadow_failure/config/etc/shadow rename to tests/failures/useradd/08_useradd_rename_gshadow_failure/config/etc/shadow diff --git a/tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/group b/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/group similarity index 100% rename from tests/tests/failures/useradd/08_useradd_rename_gshadow_failure/data/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/09_useradd_rename_defaults_failure/config.txt b/tests/failures/useradd/09_useradd_rename_defaults_failure/config.txt similarity index 100% rename from tests/tests/failures/useradd/09_useradd_rename_defaults_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/09_useradd_rename_defaults_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/09_useradd_rename_defaults_failure/config/etc/group rename to tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/group diff --git a/tests/tests/failures/useradd/09_useradd_rename_defaults_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/09_useradd_rename_defaults_failure/config/etc/gshadow rename to tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/gshadow diff --git a/tests/tests/failures/useradd/09_useradd_rename_defaults_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/09_useradd_rename_defaults_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/09_useradd_rename_defaults_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/09_useradd_rename_defaults_failure/config/etc/passwd rename to tests/failures/useradd/09_useradd_rename_defaults_failure/config/etc/passwd diff --git a/tests/tests/failures/useradd/09_useradd_rename_defaults_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/09_useradd_rename_defaults_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/10_useradd_rename_defaults_backup_failure/config.txt b/tests/failures/useradd/10_useradd_rename_defaults_backup_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/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/10_useradd_rename_defaults_backup_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/10_useradd_rename_defaults_backup_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/10_useradd_rename_defaults_backup_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/10_useradd_rename_defaults_backup_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/10_useradd_rename_defaults_backup_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/10_useradd_rename_defaults_backup_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/10_useradd_rename_defaults_backup_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/10_useradd_rename_defaults_backup_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/10_useradd_rename_defaults_backup_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/10_useradd_rename_defaults_backup_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/11_useradd_time_0/config/etc/passwd b/tests/failures/useradd/11_useradd_time_0/config/etc/passwd similarity index 100% rename from tests/tests/failures/useradd/11_useradd_time_0/config/etc/passwd rename to tests/failures/useradd/11_useradd_time_0/config/etc/passwd diff --git a/tests/tests/failures/useradd/11_useradd_time_0/config/etc/shadow b/tests/failures/useradd/11_useradd_time_0/config/etc/shadow similarity index 100% rename from tests/tests/failures/useradd/11_useradd_time_0/config/etc/shadow rename to tests/failures/useradd/11_useradd_time_0/config/etc/shadow diff --git a/tests/tests/failures/useradd/11_useradd_time_0/data/group b/tests/failures/useradd/11_useradd_time_0/data/group similarity index 100% rename from tests/tests/failures/useradd/11_useradd_time_0/data/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/12_useradd_open_subuid_failure/config.txt b/tests/failures/useradd/12_useradd_open_subuid_failure/config.txt similarity index 100% rename from tests/tests/failures/useradd/12_useradd_open_subuid_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/12_useradd_open_subuid_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/12_useradd_open_subuid_failure/config/etc/group rename to tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/group diff --git a/tests/tests/failures/useradd/12_useradd_open_subuid_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/12_useradd_open_subuid_failure/config/etc/gshadow rename to tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/gshadow diff --git a/tests/tests/failures/useradd/12_useradd_open_subuid_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/12_useradd_open_subuid_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/12_useradd_open_subuid_failure/config/etc/passwd b/tests/failures/useradd/12_useradd_open_subuid_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/12_useradd_open_subuid_failure/config/etc/passwd diff --git a/tests/tests/failures/useradd/12_useradd_open_subuid_failure/config/etc/shadow b/tests/failures/useradd/12_useradd_open_subuid_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/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/13_useradd_open_subgid_failure/config.txt b/tests/failures/useradd/13_useradd_open_subgid_failure/config.txt similarity index 100% rename from tests/tests/failures/useradd/13_useradd_open_subgid_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/13_useradd_open_subgid_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/13_useradd_open_subgid_failure/config/etc/group rename to tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/group diff --git a/tests/tests/failures/useradd/13_useradd_open_subgid_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/13_useradd_open_subgid_failure/config/etc/gshadow rename to tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/gshadow diff --git a/tests/tests/failures/useradd/13_useradd_open_subgid_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/13_useradd_open_subgid_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/13_useradd_open_subgid_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/13_useradd_open_subgid_failure/config/etc/passwd rename to tests/failures/useradd/13_useradd_open_subgid_failure/config/etc/passwd diff --git a/tests/tests/failures/useradd/13_useradd_open_subgid_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/13_useradd_open_subgid_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/14_username_rename_subuid_failure/config.txt b/tests/failures/useradd/14_username_rename_subuid_failure/config.txt similarity index 100% rename from tests/tests/failures/useradd/14_username_rename_subuid_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/14_username_rename_subuid_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/14_username_rename_subuid_failure/config/etc/group rename to tests/failures/useradd/14_username_rename_subuid_failure/config/etc/group diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_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/14_username_rename_subuid_failure/config/etc/gshadow rename to tests/failures/useradd/14_username_rename_subuid_failure/config/etc/gshadow diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_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/14_username_rename_subuid_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/14_username_rename_subuid_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/14_username_rename_subuid_failure/config/etc/passwd rename to tests/failures/useradd/14_username_rename_subuid_failure/config/etc/passwd diff --git a/tests/tests/failures/useradd/14_username_rename_subuid_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/14_username_rename_subuid_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/useradd/14_username_rename_subuid_failure/data/group b/tests/failures/useradd/14_username_rename_subuid_failure/data/group similarity index 100% rename from tests/tests/failures/useradd/14_username_rename_subuid_failure/data/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/15_username_rename_subgid_failure/config.txt b/tests/failures/useradd/15_username_rename_subgid_failure/config.txt similarity index 100% rename from tests/tests/failures/useradd/15_username_rename_subgid_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/15_username_rename_subgid_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/15_username_rename_subgid_failure/config/etc/group rename to tests/failures/useradd/15_username_rename_subgid_failure/config/etc/group diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_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/15_username_rename_subgid_failure/config/etc/gshadow rename to tests/failures/useradd/15_username_rename_subgid_failure/config/etc/gshadow diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_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/15_username_rename_subgid_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/15_username_rename_subgid_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/15_username_rename_subgid_failure/config/etc/passwd rename to tests/failures/useradd/15_username_rename_subgid_failure/config/etc/passwd diff --git a/tests/tests/failures/useradd/15_username_rename_subgid_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/15_username_rename_subgid_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/useradd/15_username_rename_subgid_failure/data/group b/tests/failures/useradd/15_username_rename_subgid_failure/data/group similarity index 100% rename from tests/tests/failures/useradd/15_username_rename_subgid_failure/data/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/userdel/01_userdel_gshadow_rename_failure/config.txt b/tests/failures/userdel/01_userdel_gshadow_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/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/userdel/01_userdel_gshadow_rename_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/userdel/01_userdel_gshadow_rename_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/userdel/01_userdel_gshadow_rename_failure/config/etc/shadow b/tests/failures/userdel/01_userdel_gshadow_rename_failure/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/01_userdel_gshadow_rename_failure/config/etc/shadow diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group b/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group similarity index 100% rename from tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group rename to tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/passwd b/tests/failures/userdel/01_userdel_gshadow_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/01_userdel_gshadow_rename_failure/data/passwd diff --git a/tests/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/shadow b/tests/failures/userdel/01_userdel_gshadow_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/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/userdel/02_userdel_group_rename_failure/config.txt b/tests/failures/userdel/02_userdel_group_rename_failure/config.txt similarity index 100% rename from tests/tests/failures/userdel/02_userdel_group_rename_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/userdel/02_userdel_group_rename_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/userdel/02_userdel_group_rename_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/userdel/02_userdel_group_rename_failure/config/etc/shadow b/tests/failures/userdel/02_userdel_group_rename_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/02_userdel_group_rename_failure/config/etc/shadow diff --git a/tests/tests/failures/userdel/02_userdel_group_rename_failure/data/passwd b/tests/failures/userdel/02_userdel_group_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/02_userdel_group_rename_failure/data/passwd diff --git a/tests/tests/failures/userdel/02_userdel_group_rename_failure/data/shadow b/tests/failures/userdel/02_userdel_group_rename_failure/data/shadow similarity index 100% rename from tests/tests/failures/userdel/02_userdel_group_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/userdel/03_userdel_shadow_rename_failure/config.txt b/tests/failures/userdel/03_userdel_shadow_rename_failure/config.txt similarity index 100% rename from tests/tests/failures/userdel/03_userdel_shadow_rename_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/userdel/03_userdel_shadow_rename_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/userdel/03_userdel_shadow_rename_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/userdel/03_userdel_shadow_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/userdel/03_userdel_shadow_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/03_userdel_shadow_rename_failure/data/passwd b/tests/failures/userdel/03_userdel_shadow_rename_failure/data/passwd similarity index 100% rename from tests/tests/failures/userdel/03_userdel_shadow_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/04_userdel_passwd_rename_failure/config.txt b/tests/failures/userdel/04_userdel_passwd_rename_failure/config.txt similarity index 100% rename from tests/tests/failures/userdel/04_userdel_passwd_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/04_userdel_passwd_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/04_userdel_passwd_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/userdel/04_userdel_passwd_rename_failure/config/etc/shadow b/tests/failures/userdel/04_userdel_passwd_rename_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/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/05_userdel_failure_remove_mailbox/config.txt b/tests/failures/userdel/05_userdel_failure_remove_mailbox/config.txt similarity index 100% rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/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/05_userdel_failure_remove_mailbox/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/05_userdel_failure_remove_mailbox/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/userdel/05_userdel_failure_remove_mailbox/config/etc/shadow b/tests/failures/userdel/05_userdel_failure_remove_mailbox/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/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/05_userdel_failure_remove_mailbox/data/group b/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/group similarity index 100% rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/group rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/data/group diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/gshadow b/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/gshadow similarity index 100% rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/gshadow rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/data/gshadow diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/passwd b/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/passwd similarity index 100% rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/passwd rename to tests/failures/userdel/05_userdel_failure_remove_mailbox/data/passwd diff --git a/tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/shadow b/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/shadow similarity index 100% rename from tests/tests/failures/userdel/05_userdel_failure_remove_mailbox/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/06_userdel_failure_remove_file_homedir/config.txt b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/config.txt similarity index 100% rename from tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/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/06_userdel_failure_remove_file_homedir/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/06_userdel_failure_remove_file_homedir/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/userdel/06_userdel_failure_remove_file_homedir/config/etc/shadow b/tests/failures/userdel/06_userdel_failure_remove_file_homedir/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/06_userdel_failure_remove_file_homedir/config/etc/shadow diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/group b/tests/failures/userdel/06_userdel_failure_remove_file_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/06_userdel_failure_remove_file_homedir/data/group diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/gshadow b/tests/failures/userdel/06_userdel_failure_remove_file_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/06_userdel_failure_remove_file_homedir/data/gshadow diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/passwd b/tests/failures/userdel/06_userdel_failure_remove_file_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/06_userdel_failure_remove_file_homedir/data/passwd diff --git a/tests/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/shadow b/tests/failures/userdel/06_userdel_failure_remove_file_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/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/07_userdel_failure_remove_homedir/config.txt b/tests/failures/userdel/07_userdel_failure_remove_homedir/config.txt similarity index 100% rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/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/07_userdel_failure_remove_homedir/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/07_userdel_failure_remove_homedir/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/07_userdel_failure_remove_homedir/config/etc/shadow b/tests/failures/userdel/07_userdel_failure_remove_homedir/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/07_userdel_failure_remove_homedir/config/etc/shadow diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/group b/tests/failures/userdel/07_userdel_failure_remove_homedir/data/group similarity index 100% rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/group rename to tests/failures/userdel/07_userdel_failure_remove_homedir/data/group diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/gshadow b/tests/failures/userdel/07_userdel_failure_remove_homedir/data/gshadow similarity index 100% rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/gshadow rename to tests/failures/userdel/07_userdel_failure_remove_homedir/data/gshadow diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/passwd b/tests/failures/userdel/07_userdel_failure_remove_homedir/data/passwd similarity index 100% rename from tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/passwd rename to tests/failures/userdel/07_userdel_failure_remove_homedir/data/passwd diff --git a/tests/tests/failures/userdel/07_userdel_failure_remove_homedir/data/shadow b/tests/failures/userdel/07_userdel_failure_remove_homedir/data/shadow similarity index 100% rename from tests/tests/failures/userdel/07_userdel_failure_remove_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/08_userdel_open_passwd_failure/config.txt b/tests/failures/userdel/08_userdel_open_passwd_failure/config.txt similarity index 100% rename from tests/tests/failures/userdel/08_userdel_open_passwd_failure/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/userdel/08_userdel_open_passwd_failure/config/etc/group b/tests/failures/userdel/08_userdel_open_passwd_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/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/08_userdel_open_passwd_failure/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/08_userdel_open_passwd_failure/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/08_userdel_open_passwd_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/08_userdel_open_passwd_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/09_userdel_open_shadow_failure/config.txt b/tests/failures/userdel/09_userdel_open_shadow_failure/config.txt similarity index 100% rename from tests/tests/failures/userdel/09_userdel_open_shadow_failure/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/userdel/09_userdel_open_shadow_failure/config/etc/group b/tests/failures/userdel/09_userdel_open_shadow_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/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/09_userdel_open_shadow_failure/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/09_userdel_open_shadow_failure/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/09_userdel_open_shadow_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/09_userdel_open_shadow_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/10_userdel_open_group_failure/config.txt b/tests/failures/userdel/10_userdel_open_group_failure/config.txt similarity index 100% rename from tests/tests/failures/userdel/10_userdel_open_group_failure/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/userdel/10_userdel_open_group_failure/config/etc/group b/tests/failures/userdel/10_userdel_open_group_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/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/10_userdel_open_group_failure/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/10_userdel_open_group_failure/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/10_userdel_open_group_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/10_userdel_open_group_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/11_userdel_open_gshadow_failure/config.txt b/tests/failures/userdel/11_userdel_open_gshadow_failure/config.txt similarity index 100% rename from tests/tests/failures/userdel/11_userdel_open_gshadow_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/11_userdel_open_gshadow_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/11_userdel_open_gshadow_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/11_userdel_open_gshadow_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/11_userdel_open_gshadow_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/11_userdel_open_gshadow_failure/config/etc/shadow b/tests/failures/userdel/11_userdel_open_gshadow_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/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/12_userdel_open_subuid_failure/config.txt b/tests/failures/userdel/12_userdel_open_subuid_failure/config.txt similarity index 100% rename from tests/tests/failures/userdel/12_userdel_open_subuid_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/12_userdel_open_subuid_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/12_userdel_open_subuid_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/12_userdel_open_subuid_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/12_userdel_open_subuid_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/12_userdel_open_subuid_failure/config/etc/shadow b/tests/failures/userdel/12_userdel_open_subuid_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/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/13_userdel_open_subgid_failure/config.txt b/tests/failures/userdel/13_userdel_open_subgid_failure/config.txt similarity index 100% rename from tests/tests/failures/userdel/13_userdel_open_subgid_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/13_userdel_open_subgid_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/13_userdel_open_subgid_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/13_userdel_open_subgid_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/13_userdel_open_subgid_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/13_userdel_open_subgid_failure/config/etc/shadow b/tests/failures/userdel/13_userdel_open_subgid_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/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/14_userdel_rename_subuid_failure/config.txt b/tests/failures/userdel/14_userdel_rename_subuid_failure/config.txt similarity index 100% rename from tests/tests/failures/userdel/14_userdel_rename_subuid_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/14_userdel_rename_subuid_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/14_userdel_rename_subuid_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/14_userdel_rename_subuid_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/14_userdel_rename_subuid_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/14_userdel_rename_subuid_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/14_userdel_rename_subuid_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/14_userdel_rename_subuid_failure/data/group b/tests/failures/userdel/14_userdel_rename_subuid_failure/data/group similarity index 100% rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/group rename to tests/failures/userdel/14_userdel_rename_subuid_failure/data/group diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/gshadow b/tests/failures/userdel/14_userdel_rename_subuid_failure/data/gshadow similarity index 100% rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/gshadow rename to tests/failures/userdel/14_userdel_rename_subuid_failure/data/gshadow diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/passwd b/tests/failures/userdel/14_userdel_rename_subuid_failure/data/passwd similarity index 100% rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/passwd rename to tests/failures/userdel/14_userdel_rename_subuid_failure/data/passwd diff --git a/tests/tests/failures/userdel/14_userdel_rename_subuid_failure/data/shadow b/tests/failures/userdel/14_userdel_rename_subuid_failure/data/shadow similarity index 100% rename from tests/tests/failures/userdel/14_userdel_rename_subuid_failure/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/15_userdel_rename_subgid_failure/config.txt b/tests/failures/userdel/15_userdel_rename_subgid_failure/config.txt similarity index 100% rename from tests/tests/failures/userdel/15_userdel_rename_subgid_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/15_userdel_rename_subgid_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/15_userdel_rename_subgid_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/15_userdel_rename_subgid_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/15_userdel_rename_subgid_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/15_userdel_rename_subgid_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/15_userdel_rename_subgid_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/15_userdel_rename_subgid_failure/data/group b/tests/failures/userdel/15_userdel_rename_subgid_failure/data/group similarity index 100% rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/group rename to tests/failures/userdel/15_userdel_rename_subgid_failure/data/group diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/gshadow b/tests/failures/userdel/15_userdel_rename_subgid_failure/data/gshadow similarity index 100% rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/gshadow rename to tests/failures/userdel/15_userdel_rename_subgid_failure/data/gshadow diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/passwd b/tests/failures/userdel/15_userdel_rename_subgid_failure/data/passwd similarity index 100% rename from tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/passwd rename to tests/failures/userdel/15_userdel_rename_subgid_failure/data/passwd diff --git a/tests/tests/failures/userdel/15_userdel_rename_subgid_failure/data/shadow b/tests/failures/userdel/15_userdel_rename_subgid_failure/data/shadow similarity index 100% rename from tests/tests/failures/userdel/15_userdel_rename_subgid_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/usermod/01_usermod_change_user_name_gshadow_rename_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/usermod/01_usermod_change_user_name_gshadow_rename_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/usermod/01_usermod_change_user_name_gshadow_rename_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/usermod/01_usermod_change_user_name_gshadow_rename_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/usermod/01_usermod_change_user_name_gshadow_rename_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/usermod/01_usermod_change_user_name_gshadow_rename_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/usermod/02_usermod_change_uid_passwd_rename_failure/config.txt b/tests/failures/usermod/02_usermod_change_uid_passwd_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/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/usermod/02_usermod_change_uid_passwd_rename_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/usermod/02_usermod_change_uid_passwd_rename_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/usermod/02_usermod_change_uid_passwd_rename_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/usermod/02_usermod_change_uid_passwd_rename_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/usermod/02_usermod_change_uid_passwd_rename_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/usermod/02_usermod_change_uid_passwd_rename_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/usermod/02_usermod_change_uid_passwd_rename_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/usermod/02_usermod_change_uid_passwd_rename_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/usermod/03_usermod_change_user_name_group_rename_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/usermod/03_usermod_change_user_name_group_rename_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/usermod/03_usermod_change_user_name_group_rename_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/usermod/03_usermod_change_user_name_group_rename_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/usermod/03_usermod_change_user_name_group_rename_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/usermod/03_usermod_change_user_name_group_rename_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/04_usermod_change_user_name_gshadow_rename_no_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/04_usermod_change_user_name_gshadow_rename_no_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/usermod/04_usermod_change_user_name_gshadow_rename_no_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/usermod/04_usermod_change_user_name_gshadow_rename_no_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/usermod/04_usermod_change_user_name_gshadow_rename_no_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/usermod/04_usermod_change_user_name_gshadow_rename_no_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/04_usermod_change_user_name_gshadow_rename_no_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/04_usermod_change_user_name_gshadow_rename_no_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/usermod/04_usermod_change_user_name_gshadow_rename_no_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/usermod/04_usermod_change_user_name_gshadow_rename_no_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/05_usermod_change_uid_shadow_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/05_usermod_change_uid_shadow_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/05_usermod_change_uid_shadow_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/05_usermod_change_uid_shadow_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/usermod/05_usermod_change_uid_shadow_rename_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/usermod/05_usermod_change_uid_shadow_rename_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/06_usermod_change_user_name_open_passwd_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/06_usermod_change_user_name_open_passwd_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/usermod/06_usermod_change_user_name_open_passwd_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/usermod/06_usermod_change_user_name_open_passwd_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/usermod/06_usermod_change_user_name_open_passwd_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/usermod/06_usermod_change_user_name_open_passwd_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/06_usermod_change_user_name_open_passwd_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/06_usermod_change_user_name_open_passwd_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/usermod/06_usermod_change_user_name_open_passwd_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/usermod/06_usermod_change_user_name_open_passwd_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/usermod/06_usermod_change_user_name_open_passwd_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/usermod/06_usermod_change_user_name_open_passwd_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/07_usermod_change_user_name_open_shadow_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/07_usermod_change_user_name_open_shadow_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/07_usermod_change_user_name_open_shadow_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/07_usermod_change_user_name_open_shadow_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/07_usermod_change_user_name_open_shadow_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/07_usermod_change_user_name_open_shadow_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/07_usermod_change_user_name_open_shadow_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/07_usermod_change_user_name_open_shadow_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/usermod/07_usermod_change_user_name_open_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/usermod/07_usermod_change_user_name_open_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/07_usermod_change_user_name_open_shadow_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/07_usermod_change_user_name_open_shadow_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/08_usermod_change_user_name_open_group_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/08_usermod_change_user_name_open_group_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/08_usermod_change_user_name_open_group_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/08_usermod_change_user_name_open_group_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/08_usermod_change_user_name_open_group_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/08_usermod_change_user_name_open_group_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/08_usermod_change_user_name_open_group_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/08_usermod_change_user_name_open_group_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/08_usermod_change_user_name_open_group_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/08_usermod_change_user_name_open_group_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/08_usermod_change_user_name_open_group_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/08_usermod_change_user_name_open_group_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/09_usermod_change_user_name_open_gshadow_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/09_usermod_change_user_name_open_gshadow_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/09_usermod_change_user_name_open_gshadow_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/09_usermod_change_user_name_open_gshadow_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/09_usermod_change_user_name_open_gshadow_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/09_usermod_change_user_name_open_gshadow_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/09_usermod_change_user_name_open_gshadow_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/09_usermod_change_user_name_open_gshadow_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/09_usermod_change_user_name_open_gshadow_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/09_usermod_change_user_name_open_gshadow_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/09_usermod_change_user_name_open_gshadow_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/09_usermod_change_user_name_open_gshadow_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/usermod/10_usermod_-p_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/usermod/10_usermod_-p_time_0/config/etc/group rename to tests/failures/usermod/10_usermod_-p_time_0/config/etc/group diff --git a/tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/gshadow b/tests/failures/usermod/10_usermod_-p_time_0/config/etc/gshadow similarity index 100% rename from tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/gshadow rename to tests/failures/usermod/10_usermod_-p_time_0/config/etc/gshadow diff --git a/tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/passwd b/tests/failures/usermod/10_usermod_-p_time_0/config/etc/passwd similarity index 100% rename from tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/passwd rename to tests/failures/usermod/10_usermod_-p_time_0/config/etc/passwd diff --git a/tests/tests/failures/usermod/10_usermod_-p_time_0/config/etc/shadow b/tests/failures/usermod/10_usermod_-p_time_0/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/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/usermod/11_usermod-f_no_shadow_entry_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/usermod/11_usermod-f_no_shadow_entry_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/usermod/11_usermod-f_no_shadow_entry_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/usermod/11_usermod-f_no_shadow_entry_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/failures/usermod/11_usermod-f_no_shadow_entry_time_0/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/failures/usermod/11_usermod-f_no_shadow_entry_time_0/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/usermod/11_usermod-f_no_shadow_entry_time_0/config/etc/shadow b/tests/failures/usermod/11_usermod-f_no_shadow_entry_time_0/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/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/12_usermod_change_uid_passwd_unlock_passwd_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/12_usermod_change_uid_passwd_unlock_passwd_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/12_usermod_change_uid_passwd_unlock_passwd_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/12_usermod_change_uid_passwd_unlock_passwd_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/12_usermod_change_uid_passwd_unlock_passwd_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/12_usermod_change_uid_passwd_unlock_passwd_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/12_usermod_change_uid_passwd_unlock_passwd_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/12_usermod_change_uid_passwd_unlock_passwd_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/12_usermod_change_uid_passwd_unlock_passwd_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/12_usermod_change_uid_passwd_unlock_passwd_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/13_usermod_-v_open_subuid_failure/config.txt b/tests/failures/usermod/13_usermod_-v_open_subuid_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/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/13_usermod_-v_open_subuid_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/13_usermod_-v_open_subuid_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/13_usermod_-v_open_subuid_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/13_usermod_-v_open_subuid_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/13_usermod_-v_open_subuid_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/13_usermod_-v_open_subuid_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/14_usermod_-V_open_subuid_failure/config.txt b/tests/failures/usermod/14_usermod_-V_open_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/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/14_usermod_-V_open_subuid_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/14_usermod_-V_open_subuid_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/14_usermod_-V_open_subuid_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/14_usermod_-V_open_subuid_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/14_usermod_-V_open_subuid_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/14_usermod_-V_open_subuid_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/15_usermod_-w_open_subgid_failure/config.txt b/tests/failures/usermod/15_usermod_-w_open_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/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/15_usermod_-w_open_subgid_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/15_usermod_-w_open_subgid_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/15_usermod_-w_open_subgid_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/15_usermod_-w_open_subgid_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/15_usermod_-w_open_subgid_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/15_usermod_-w_open_subgid_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/16_usermod_-W_open_subgid_failure/config.txt b/tests/failures/usermod/16_usermod_-W_open_subgid_failure/config.txt similarity index 100% rename from tests/tests/failures/usermod/16_usermod_-W_open_subgid_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/16_usermod_-W_open_subgid_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/16_usermod_-W_open_subgid_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/16_usermod_-W_open_subgid_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/16_usermod_-W_open_subgid_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/16_usermod_-W_open_subgid_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/16_usermod_-W_open_subgid_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/17_usermod_-v_rename_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/17_usermod_-v_rename_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/17_usermod_-v_rename_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/17_usermod_-v_rename_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/17_usermod_-v_rename_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/17_usermod_-v_rename_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/17_usermod_-v_rename_subuid_failure/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/17_usermod_-v_rename_subuid_failure/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/18_usermod_-w_rename_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/18_usermod_-w_rename_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/18_usermod_-w_rename_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/18_usermod_-w_rename_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/18_usermod_-w_rename_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/18_usermod_-w_rename_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/18_usermod_-w_rename_subgid_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/18_usermod_-w_rename_subgid_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/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/group b/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/group similarity index 100% rename from tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/group rename to tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/gshadow b/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/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/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/passwd b/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/passwd rename to tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/shadow b/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/01_chgpasswd_invalid_group/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/02_chgpasswd_multiple_groups/config/etc/group b/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/group similarity index 100% rename from tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/group rename to tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/gshadow b/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/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/02_chgpasswd_multiple_groups/config/etc/passwd b/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/passwd rename to tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/shadow b/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/02_chgpasswd_multiple_groups/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/03_chgpasswd_no_gshadow_file/config/etc/group b/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/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/03_chgpasswd_no_gshadow_file/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/gshadow b/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/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/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/03_chgpasswd_no_gshadow_file/config/etc/passwd b/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/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/03_chgpasswd_no_gshadow_file/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/config/etc/shadow b/tests/grouptools/chgpasswd/03_chgpasswd_no_gshadow_file/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/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/04_chgpasswd_no_gshadow_entry/config/etc/group b/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/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/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/04_chgpasswd_no_gshadow_entry/config/etc/passwd b/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/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/04_chgpasswd_no_gshadow_entry/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/config/etc/shadow b/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/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/04_chgpasswd_no_gshadow_entry/config/etc/shadow diff --git a/tests/tests/grouptools/chgpasswd/04_chgpasswd_no_gshadow_entry/data/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/data/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/05_chgpasswd_error_no_password/config/etc/group b/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/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/05_chgpasswd_error_no_password/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/gshadow b/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/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/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/05_chgpasswd_error_no_password/config/etc/passwd b/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/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/05_chgpasswd_error_no_password/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/config/etc/shadow b/tests/grouptools/chgpasswd/05_chgpasswd_error_no_password/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/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/06_chgpasswd_usage/config/etc/group b/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/group similarity index 100% rename from tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/group rename to tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/gshadow b/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/gshadow rename to tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/passwd b/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/passwd rename to tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/shadow b/tests/grouptools/chgpasswd/06_chgpasswd_usage/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/06_chgpasswd_usage/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/07_chgpasswd_usage_bad_option/config/etc/group b/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/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/07_chgpasswd_usage_bad_option/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/gshadow b/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/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/07_chgpasswd_usage_bad_option/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/passwd b/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/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/07_chgpasswd_usage_bad_option/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/config/etc/shadow b/tests/grouptools/chgpasswd/07_chgpasswd_usage_bad_option/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/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/08_chgpasswd_usage-e-m_exclusive/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/08_chgpasswd_usage-e-m_exclusive/config/etc/group rename to tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/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/08_chgpasswd_usage-e-m_exclusive/config/etc/gshadow rename to tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/config/etc/passwd b/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_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/08_chgpasswd_usage-e-m_exclusive/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/08_chgpasswd_usage-e-m_exclusive/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/08_chgpasswd_usage-e-m_exclusive/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/09_chgpasswd_usage-e-c_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/09_chgpasswd_usage-e-c_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/09_chgpasswd_usage-e-c_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/09_chgpasswd_usage-e-c_exclusive/config/etc/gshadow rename to tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/config/etc/passwd b/tests/grouptools/chgpasswd/09_chgpasswd_usage-e-c_exclusive/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/09_chgpasswd_usage-e-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/09_chgpasswd_usage-e-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/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/10_chgpasswd_usage-m-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/10_chgpasswd_usage-m-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/10_chgpasswd_usage-m-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/10_chgpasswd_usage-m-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/10_chgpasswd_usage-m-c_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/10_chgpasswd_usage-m-c_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/10_chgpasswd_usage-m-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/10_chgpasswd_usage-m-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/11_chgpasswd_usage-s_without-c/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/11_chgpasswd_usage-s_without-c/config/etc/group rename to tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/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/11_chgpasswd_usage-s_without-c/config/etc/gshadow rename to tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/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/11_chgpasswd_usage-s_without-c/config/etc/passwd rename to tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/11_chgpasswd_usage-s_without-c/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/11_chgpasswd_usage-s_without-c/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/12_chgpasswd_usage-s_invalid/config/etc/group b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_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/12_chgpasswd_usage-s_invalid/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/gshadow b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_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/12_chgpasswd_usage-s_invalid/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/passwd b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/passwd rename to tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_invalid/config/etc/shadow b/tests/grouptools/chgpasswd/12_chgpasswd_usage-s_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/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/13_chgpasswd_usage-c_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/13_chgpasswd_usage-c_invalid/config/etc/group rename to tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_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/13_chgpasswd_usage-c_invalid/config/etc/gshadow rename to tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/passwd b/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/passwd rename to tests/grouptools/chgpasswd/13_chgpasswd_usage-c_invalid/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/13_chgpasswd_usage-c_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/13_chgpasswd_usage-c_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/14_chgpasswd_password_encrypted/config/etc/group b/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/group similarity index 100% rename from tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/group rename to tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/gshadow b/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/gshadow rename to tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/passwd b/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/passwd rename to tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/shadow b/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/14_chgpasswd_password_encrypted/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/15_chgpasswd_password_md5/config/etc/group b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/group similarity index 100% rename from tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/group rename to tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/gshadow b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/gshadow rename to tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/passwd b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/passwd rename to tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/shadow b/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/15_chgpasswd_password_md5/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/16_chgpasswd_password_NONE/config/etc/group b/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/group similarity index 100% rename from tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/group rename to tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/gshadow b/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/gshadow rename to tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/passwd b/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/passwd rename to tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/shadow b/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/16_chgpasswd_password_NONE/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/17_chgpasswd_password_MD5/config/etc/group b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/group similarity index 100% rename from tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/group rename to tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/gshadow b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/gshadow rename to tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/passwd b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/passwd rename to tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/shadow b/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/17_chgpasswd_password_MD5/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/18_chgpasswd_password_DES/config/etc/group b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/group similarity index 100% rename from tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/group rename to tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/gshadow b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/gshadow rename to tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/passwd b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/passwd rename to tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/shadow b/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/18_chgpasswd_password_DES/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/19_chgpasswd_password_SHA256/config/etc/group b/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/group similarity index 100% rename from tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/group rename to tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/gshadow b/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/gshadow rename to tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/passwd b/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/passwd rename to tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/shadow b/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/19_chgpasswd_password_SHA256/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/20_chgpasswd_password_SHA256_rounds_900/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/20_chgpasswd_password_SHA256_rounds_900/config/etc/group rename to tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/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/20_chgpasswd_password_SHA256_rounds_900/config/etc/gshadow rename to tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/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/20_chgpasswd_password_SHA256_rounds_900/config/etc/passwd rename to tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/20_chgpasswd_password_SHA256_rounds_900/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/20_chgpasswd_password_SHA256_rounds_900/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/21_chgpasswd_password_SHA256_rounds_9000/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/21_chgpasswd_password_SHA256_rounds_9000/config/etc/group rename to tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/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/21_chgpasswd_password_SHA256_rounds_9000/config/etc/gshadow rename to tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/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/21_chgpasswd_password_SHA256_rounds_9000/config/etc/passwd rename to tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/21_chgpasswd_password_SHA256_rounds_9000/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/21_chgpasswd_password_SHA256_rounds_9000/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/22_chgpasswd_password_SHA512/config/etc/group b/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/group similarity index 100% rename from tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/group rename to tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/gshadow b/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/gshadow rename to tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/passwd b/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/passwd rename to tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/shadow b/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/22_chgpasswd_password_SHA512/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/23_chgpasswd_password_SHA512_rounds_900/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/23_chgpasswd_password_SHA512_rounds_900/config/etc/group rename to tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/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/23_chgpasswd_password_SHA512_rounds_900/config/etc/gshadow rename to tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/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/23_chgpasswd_password_SHA512_rounds_900/config/etc/passwd rename to tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/23_chgpasswd_password_SHA512_rounds_900/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/23_chgpasswd_password_SHA512_rounds_900/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/24_chgpasswd_password_SHA512_rounds_9000/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/24_chgpasswd_password_SHA512_rounds_9000/config/etc/group rename to tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/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/24_chgpasswd_password_SHA512_rounds_9000/config/etc/gshadow rename to tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/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/24_chgpasswd_password_SHA512_rounds_9000/config/etc/passwd rename to tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/24_chgpasswd_password_SHA512_rounds_9000/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/24_chgpasswd_password_SHA512_rounds_9000/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/25_chgpasswd-e_no_gshadow_file/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/25_chgpasswd-e_no_gshadow_file/config/etc/gshadow rename to tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/gshadow diff --git a/tests/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/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/25_chgpasswd-e_no_gshadow_file/config/etc/passwd rename to tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/config/etc/passwd diff --git a/tests/tests/grouptools/chgpasswd/25_chgpasswd-e_no_gshadow_file/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/25_chgpasswd-e_no_gshadow_file/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/26_chgpasswd_no_gshadow_file_invalid_group/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/26_chgpasswd_no_gshadow_file_invalid_group/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/26_chgpasswd_no_gshadow_file_invalid_group/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/26_chgpasswd_no_gshadow_file_invalid_group/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/26_chgpasswd_no_gshadow_file_invalid_group/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/26_chgpasswd_no_gshadow_file_invalid_group/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/26_chgpasswd_no_gshadow_file_invalid_group/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/26_chgpasswd_no_gshadow_file_invalid_group/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/29_chgpasswd-e_no_gshadow_entry/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/29_chgpasswd-e_no_gshadow_entry/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/29_chgpasswd-e_no_gshadow_entry/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/29_chgpasswd-e_no_gshadow_entry/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/data/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/data/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/grouptools/chgpasswd/30_chgpasswd_locked_group/config.txt b/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config.txt similarity index 100% rename from tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/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/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/group b/tests/grouptools/chgpasswd/30_chgpasswd_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/chgpasswd/30_chgpasswd_locked_group/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/gshadow b/tests/grouptools/chgpasswd/30_chgpasswd_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/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/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/shadow b/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/30_chgpasswd_locked_group/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/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config.txt b/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config.txt similarity index 100% rename from tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/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/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/group b/tests/grouptools/chgpasswd/31_chgpasswd_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/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/gshadow b/tests/grouptools/chgpasswd/31_chgpasswd_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/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/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/shadow b/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/31_chgpasswd_locked_gshadow/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/grouptools/chgpasswd/32_chgpasswd_invalid_group/config.txt b/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config.txt similarity index 100% rename from tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/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/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/group b/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/group similarity index 100% rename from tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/group rename to tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/group diff --git a/tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/gshadow b/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/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/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/shadow b/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/chgpasswd/32_chgpasswd_invalid_group/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/grouptools/gpasswd/01_gpasswd_change_member_list/config/etc/shadow b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/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/01_gpasswd_change_member_list/config/etc/shadow diff --git a/tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/group b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/group similarity index 100% rename from tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/group rename to tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/group diff --git a/tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/gshadow b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/gshadow similarity index 100% rename from tests/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/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/grouptools/gpasswd/02_gpasswd_change_member_list/config/etc/shadow b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/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/02_gpasswd_change_member_list/config/etc/shadow diff --git a/tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/group b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/group similarity index 100% rename from tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/group rename to tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/group diff --git a/tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/gshadow b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/gshadow similarity index 100% rename from tests/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/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/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/group b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/group similarity index 100% rename from tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/group rename to tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/group diff --git a/tests/tests/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/gshadow b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/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/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/grouptools/gpasswd/03_gpasswd_change_member_list/config/etc/shadow b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/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/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/gpasswd/04_gpasswd_change_member_list/config/etc/shadow b/tests/grouptools/gpasswd/04_gpasswd_change_member_list/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/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/gpasswd/05_gpasswd_change_member_list/config/etc/shadow b/tests/grouptools/gpasswd/05_gpasswd_change_member_list/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/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/gpasswd/06_gpasswd_change_member_list/config/etc/shadow b/tests/grouptools/gpasswd/06_gpasswd_change_member_list/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/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/07_gpasswd_change_member_list-no_shadow_group/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/07_gpasswd_change_member_list-no_shadow_group/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/07_gpasswd_change_member_list-no_shadow_group/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/07_gpasswd_change_member_list-no_shadow_group/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/08_gpasswd_change_member_list-no_shadow_group/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/08_gpasswd_change_member_list-no_shadow_group/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/08_gpasswd_change_member_list-no_shadow_group/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/08_gpasswd_change_member_list-no_shadow_group/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/09_gpasswd_change_member_list-no_shadow_group/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/09_gpasswd_change_member_list-no_shadow_group/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/10_gpasswd_change_member_list-no_shadow_group/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/10_gpasswd_change_member_list-no_shadow_group/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/11_gpasswd_change_member_list-no_shadow_group/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/11_gpasswd_change_member_list-no_shadow_group/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/12_gpasswd_change_member_list-no_shadow_group/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/12_gpasswd_change_member_list-no_shadow_group/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/13_gpasswd_change_member_list-no_gshadow_file/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/13_gpasswd_change_member_list-no_gshadow_file/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/13_gpasswd_change_member_list-no_gshadow_file/data/group b/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/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/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/14_gpasswd_change_member_list-no_gshadow_file/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/14_gpasswd_change_member_list-no_gshadow_file/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/14_gpasswd_change_member_list-no_gshadow_file/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/14_gpasswd_change_member_list-no_gshadow_file/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/15_gpasswd_change_member_list-no_gshadow_file/config/etc/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/15_gpasswd_change_member_list-no_gshadow_file/config/etc/group rename to tests/grouptools/gpasswd/15_gpasswd_change_member_list-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/15_gpasswd_change_member_list-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/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/15_gpasswd_change_member_list-no_gshadow_file/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/15_gpasswd_change_member_list-no_gshadow_file/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/16_gpasswd_change_member_list-no_gshadow_file/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/16_gpasswd_change_member_list-no_gshadow_file/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/17_gpasswd_change_member_list-no_gshadow_file/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/17_gpasswd_change_member_list-no_gshadow_file/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/18_gpasswd_change_member_list-no_gshadow_file/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/18_gpasswd_change_member_list-no_gshadow_file/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/19_gpasswd_change_passwd-root/config/etc/group b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/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/19_gpasswd_change_passwd-root/config/etc/group diff --git a/tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/gshadow b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/config/etc/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/19_gpasswd_change_passwd-root/config/etc/shadow b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/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/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/20_gpasswd_change_passwd-root-no_shadow_group/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/20_gpasswd_change_passwd-root-no_shadow_group/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/21_gpasswd_change_passwd-root-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/21_gpasswd_change_passwd-root-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/22_gpasswd_change_passwd-myuser/config/etc/group b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/group similarity index 100% rename from tests/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/config/etc/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/23_gpasswd_change_passwd-myuser-denied/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/23_gpasswd_change_passwd-myuser-denied/config/etc/group rename to tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/config/etc/group diff --git a/tests/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/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/23_gpasswd_change_passwd-myuser-denied/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/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/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/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/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/24_gpasswd_change_passwd-myuser-denied-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/24_gpasswd_change_passwd-myuser-denied-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/25_gpasswd_remove_password/config/etc/shadow b/tests/grouptools/gpasswd/25_gpasswd_remove_password/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/gpasswd/25_gpasswd_remove_password/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/26_gpasswd_remove_password-no_shadow_group/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/26_gpasswd_remove_password-no_shadow_group/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/27_gpasswd_remove_password-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/27_gpasswd_remove_password-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/28_gpasswd_lock_password/config/etc/shadow b/tests/grouptools/gpasswd/28_gpasswd_lock_password/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/gpasswd/28_gpasswd_lock_password/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/29_gpasswd_lock_password-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/29_gpasswd_lock_password-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/30_gpasswd_lock_password-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/30_gpasswd_lock_password-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/31_gpasswd_add_user_to_group/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/31_gpasswd_add_user_to_group/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/32_gpasswd_add_user_to_group-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/32_gpasswd_add_user_to_group-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/33_gpasswd_add_user_to_group-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/33_gpasswd_add_user_to_group-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/34_gpasswd_remove_user_from_group/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/34_gpasswd_remove_user_from_group/config/etc/shadow rename to tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/config/etc/shadow diff --git a/tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/group b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/group similarity index 100% rename from tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/group rename to tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/group diff --git a/tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/gshadow b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/gshadow similarity index 100% rename from tests/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/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/35_gpasswd_remove_user_from_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/35_gpasswd_remove_user_from_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/36_gpasswd_remove_user_from_group/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/36_gpasswd_remove_user_from_group/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/37_gpasswd_remove_user_from_group-no_shadow_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/37_gpasswd_remove_user_from_group-no_shadow_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/37_gpasswd_remove_user_from_group-no_shadow_group/data/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/37_gpasswd_remove_user_from_group-no_shadow_group/data/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/38_gpasswd_remove_user_from_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/38_gpasswd_remove_user_from_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/38_gpasswd_remove_user_from_group-no_shadow_group/data/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/38_gpasswd_remove_user_from_group-no_shadow_group/data/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/39_gpasswd_remove_user_from_group-no_shadow_group/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/39_gpasswd_remove_user_from_group-no_shadow_group/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/40_gpasswd_remove_user_from_group-no_gshadow_file/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/40_gpasswd_remove_user_from_group-no_gshadow_file/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/40_gpasswd_remove_user_from_group-no_gshadow_file/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/40_gpasswd_remove_user_from_group-no_gshadow_file/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/41_gpasswd_remove_user_from_group-no_gshadow_file/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/41_gpasswd_remove_user_from_group-no_gshadow_file/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/42_gpasswd_remove_user_from_group-no_gshadow_file/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/42_gpasswd_remove_user_from_group-no_gshadow_file/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/gpasswd/43_gpasswd_-r_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/gpasswd/43_gpasswd_-r_locked_group/config/etc/group rename to tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/config/etc/group diff --git a/tests/tests/grouptools/gpasswd/43_gpasswd_-r_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/gpasswd/43_gpasswd_-r_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/43_gpasswd_-r_locked_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/43_gpasswd_-r_locked_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/gpasswd/44_gpasswd_-r_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/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/group rename to tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/config/etc/group diff --git a/tests/tests/grouptools/gpasswd/44_gpasswd_-r_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/gpasswd/44_gpasswd_-r_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/44_gpasswd_-r_locked_gshadow/config/etc/shadow b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/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/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/gpasswd/45_gpasswd_-r_unknown_group/config/etc/group b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/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/45_gpasswd_-r_unknown_group/config/etc/group diff --git a/tests/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/config/etc/gshadow b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/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/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/45_gpasswd_-r_unknown_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/45_gpasswd_-r_unknown_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/46_gpasswd_-a_unknown_user/config/etc/group b/tests/grouptools/gpasswd/46_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/46_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/46_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/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/46_gpasswd_-a_unknown_user/config/etc/shadow b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/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/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/47_gpasswd_-M_unknown_user/config/etc/group b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/group similarity index 100% rename from tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/group rename to tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/group diff --git a/tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/gshadow b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/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/47_gpasswd_-M_unknown_user/config/etc/shadow b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/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/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/48_gpasswd_change_admin_list/config/etc/shadow b/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/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/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/49_gpasswd_change_admin_list/config/etc/shadow b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/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/49_gpasswd_change_admin_list/config/etc/shadow diff --git a/tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/gshadow b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/gshadow similarity index 100% rename from tests/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/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/50_gpasswd_change_admin_list/config/etc/shadow b/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/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/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/51_gpasswd_change_admin_list/config/etc/shadow b/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/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/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/52_gpasswd_change_admin_list/config/etc/shadow b/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/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/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/53_gpasswd_change_admin_list/config/etc/shadow b/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/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/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/54_gpasswd_change_admin_list-no_shadow_group/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/54_gpasswd_change_admin_list-no_shadow_group/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/55_gpasswd_change_admin_list-no_gshadow_file/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/55_gpasswd_change_admin_list-no_gshadow_file/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/55_gpasswd_change_admin_list-no_gshadow_file/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/55_gpasswd_change_admin_list-no_gshadow_file/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/55_gpasswd_change_admin_list-no_gshadow_file/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/55_gpasswd_change_admin_list-no_gshadow_file/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/56_gpasswd_add_user_to_group/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/56_gpasswd_add_user_to_group/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/57_gpasswd_remove_user_from_group-not_member/config/etc/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/57_gpasswd_remove_user_from_group-not_member/config/etc/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/57_gpasswd_remove_user_from_group-not_member/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/57_gpasswd_remove_user_from_group-not_member/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/58_gpasswd_remove_user_from_group-not_gshadow_member/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/58_gpasswd_remove_user_from_group-not_gshadow_member/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/58_gpasswd_remove_user_from_group-not_gshadow_member/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/58_gpasswd_remove_user_from_group-not_gshadow_member/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/59_gpasswd_remove_user_from_group-not_group_member/config/etc/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/59_gpasswd_remove_user_from_group-not_group_member/config/etc/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/59_gpasswd_remove_user_from_group-not_group_member/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/59_gpasswd_remove_user_from_group-not_group_member/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/59_gpasswd_remove_user_from_group-not_group_member/data/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/59_gpasswd_remove_user_from_group-not_group_member/data/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/gpasswd/61_gpasswd_usage/config/etc/group b/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/group similarity index 100% rename from tests/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/group rename to tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/group diff --git a/tests/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/gshadow b/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/gshadow rename to tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/gshadow diff --git a/tests/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/passwd b/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/passwd rename to tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/passwd diff --git a/tests/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/shadow b/tests/grouptools/gpasswd/61_gpasswd_usage/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/gpasswd/61_gpasswd_usage/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/62_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/62_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/62_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/62_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/62_gpasswd_-A_unknown_user/config/etc/shadow b/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/gpasswd/62_gpasswd_-A_unknown_user/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/63_gpasswd_usage_bad_option/config/etc/group b/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/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/63_gpasswd_usage_bad_option/config/etc/group diff --git a/tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/gshadow b/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/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/63_gpasswd_usage_bad_option/config/etc/gshadow diff --git a/tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/passwd b/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/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/63_gpasswd_usage_bad_option/config/etc/passwd diff --git a/tests/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/config/etc/shadow b/tests/grouptools/gpasswd/63_gpasswd_usage_bad_option/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/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/64_gpasswd_usage-a-d/config/etc/group b/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/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/64_gpasswd_usage-a-d/config/etc/group diff --git a/tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/gshadow b/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/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/64_gpasswd_usage-a-d/config/etc/gshadow diff --git a/tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/passwd b/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/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/64_gpasswd_usage-a-d/config/etc/passwd diff --git a/tests/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/config/etc/shadow b/tests/grouptools/gpasswd/64_gpasswd_usage-a-d/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/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/65_gpasswd_usage_no_groups/config/etc/group b/tests/grouptools/gpasswd/65_gpasswd_usage_no_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/65_gpasswd_usage_no_groups/config/etc/group diff --git a/tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/gshadow b/tests/grouptools/gpasswd/65_gpasswd_usage_no_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/65_gpasswd_usage_no_groups/config/etc/gshadow diff --git a/tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/passwd b/tests/grouptools/gpasswd/65_gpasswd_usage_no_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/65_gpasswd_usage_no_groups/config/etc/passwd diff --git a/tests/tests/grouptools/gpasswd/65_gpasswd_usage_no_groups/config/etc/shadow b/tests/grouptools/gpasswd/65_gpasswd_usage_no_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/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/66_gpasswd_usage_2_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/66_gpasswd_usage_2_groups/config/etc/group rename to tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/group diff --git a/tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_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/66_gpasswd_usage_2_groups/config/etc/gshadow rename to tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/gshadow diff --git a/tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_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/66_gpasswd_usage_2_groups/config/etc/passwd rename to tests/grouptools/gpasswd/66_gpasswd_usage_2_groups/config/etc/passwd diff --git a/tests/tests/grouptools/gpasswd/66_gpasswd_usage_2_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/66_gpasswd_usage_2_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/67_gpasswd-A_myuser/config/etc/group b/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/group similarity index 100% rename from tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/group rename to tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/group diff --git a/tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/gshadow b/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/gpasswd/67_gpasswd-A_myuser/config/etc/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/68_gpasswd-M_myuser/config/etc/group b/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/group similarity index 100% rename from tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/group rename to tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/group diff --git a/tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/gshadow b/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/gpasswd/68_gpasswd-M_myuser/config/etc/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/69_gpasswd_change_passwd_2_tries/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/69_gpasswd_change_passwd_2_tries/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/70_gpasswd_change_passwd_3_tries/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/70_gpasswd_change_passwd_3_tries/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/71_gpasswd_change_passwd_4_tries/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/71_gpasswd_change_passwd_4_tries/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/72_gpasswd-M-A/config/etc/shadow b/tests/grouptools/gpasswd/72_gpasswd-M-A/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/gpasswd/72_gpasswd-M-A/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/groupadd/01_groupadd_add_group/config/etc/group b/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/group rename to tests/grouptools/groupadd/01_groupadd_add_group/config/etc/group diff --git a/tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/gshadow b/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/gshadow rename to tests/grouptools/groupadd/01_groupadd_add_group/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/login.defs b/tests/grouptools/groupadd/01_groupadd_add_group/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/01_groupadd_add_group/config/etc/login.defs diff --git a/tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/passwd b/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/passwd rename to tests/grouptools/groupadd/01_groupadd_add_group/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/shadow b/tests/grouptools/groupadd/01_groupadd_add_group/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupadd/01_groupadd_add_group/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/02_groupadd_add_group_GID_MIN/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/02_groupadd_add_group_GID_MIN/config/etc/group rename to tests/grouptools/groupadd/02_groupadd_add_group_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/02_groupadd_add_group_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/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/02_groupadd_add_group_GID_MIN/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/02_groupadd_add_group_GID_MIN/config/etc/passwd rename to tests/grouptools/groupadd/02_groupadd_add_group_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/02_groupadd_add_group_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/02_groupadd_add_group_GID_MIN/config/etc/shadow diff --git a/tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/group b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/group similarity index 100% rename from tests/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/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/03_groupadd_add_group_-K_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/03_groupadd_add_group_-K_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/03_groupadd_add_group_-K_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/03_groupadd_add_group_-K_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/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/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/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/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/03_groupadd_add_group_-K_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/03_groupadd_add_group_-K_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/03_groupadd_add_group_-K_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/03_groupadd_add_group_-K_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/04_groupadd_set_password/config/etc/group b/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/group rename to tests/grouptools/groupadd/04_groupadd_set_password/config/etc/group diff --git a/tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/gshadow b/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/gshadow rename to tests/grouptools/groupadd/04_groupadd_set_password/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/login.defs b/tests/grouptools/groupadd/04_groupadd_set_password/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/04_groupadd_set_password/config/etc/login.defs diff --git a/tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/passwd b/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/passwd rename to tests/grouptools/groupadd/04_groupadd_set_password/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/shadow b/tests/grouptools/groupadd/04_groupadd_set_password/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupadd/04_groupadd_set_password/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/05_groupadd_set_GID/config/etc/group b/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/group rename to tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/group diff --git a/tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/gshadow b/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/gshadow rename to tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/05_groupadd_set_GID/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/05_groupadd_set_GID/config/etc/login.defs rename to tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/login.defs diff --git a/tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/passwd b/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/passwd rename to tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/shadow b/tests/grouptools/groupadd/05_groupadd_set_GID/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupadd/05_groupadd_set_GID/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/groupadd/06_groupadd_-f_add_existing_group/config/etc/gshadow b/tests/grouptools/groupadd/06_groupadd_-f_add_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/06_groupadd_-f_add_existing_group/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/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/06_groupadd_-f_add_existing_group/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/06_groupadd_-f_add_existing_group/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/06_groupadd_-f_add_existing_group/config/etc/passwd rename to tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/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/06_groupadd_-f_add_existing_group/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/groupadd/07_groupadd_-f_add_existing_GID/config/etc/gshadow b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_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/07_groupadd_-f_add_existing_GID/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/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/07_groupadd_-f_add_existing_GID/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/07_groupadd_-f_add_existing_GID/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/07_groupadd_-f_add_existing_GID/config/etc/passwd rename to tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/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/07_groupadd_-f_add_existing_GID/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/08_groupadd_locked_group/config/etc/group b/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/group rename to tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/group diff --git a/tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/gshadow b/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/gshadow rename to tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/passwd b/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/passwd rename to tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/shadow b/tests/grouptools/groupadd/08_groupadd_locked_group/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupadd/08_groupadd_locked_group/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/09_groupadd_locked_gshadow/config/etc/group b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/group rename to tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/group diff --git a/tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/gshadow b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/gshadow rename to tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/passwd b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/passwd rename to tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/shadow b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupadd/09_groupadd_locked_gshadow/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/groupadd/10_groupadd_-o_add_existing_GID/config/etc/gshadow b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_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/10_groupadd_-o_add_existing_GID/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_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/10_groupadd_-o_add_existing_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/10_groupadd_-o_add_existing_GID/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/10_groupadd_-o_add_existing_GID/config/etc/passwd rename to tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/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/10_groupadd_-o_add_existing_GID/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/11_groupadd_invalid_GID/config/etc/group b/tests/grouptools/groupadd/11_groupadd_invalid_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/11_groupadd_invalid_GID/config/etc/group diff --git a/tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/gshadow b/tests/grouptools/groupadd/11_groupadd_invalid_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/11_groupadd_invalid_GID/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/passwd b/tests/grouptools/groupadd/11_groupadd_invalid_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/11_groupadd_invalid_GID/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/11_groupadd_invalid_GID/config/etc/shadow b/tests/grouptools/groupadd/11_groupadd_invalid_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/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/12_groupadd_negative_GID/config/etc/group b/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/group rename to tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/group diff --git a/tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/gshadow b/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/gshadow rename to tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/passwd b/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/passwd rename to tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/shadow b/tests/grouptools/groupadd/12_groupadd_negative_GID/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupadd/12_groupadd_negative_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/13_groupadd_invalid_name/config/etc/group b/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/group rename to tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/group diff --git a/tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/gshadow b/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/gshadow rename to tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/passwd b/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/passwd rename to tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/shadow b/tests/grouptools/groupadd/13_groupadd_invalid_name/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupadd/13_groupadd_invalid_name/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/14_groupadd_invalid_-K_option/config/etc/group b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/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/14_groupadd_invalid_-K_option/config/etc/group diff --git a/tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/gshadow b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/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/14_groupadd_invalid_-K_option/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/passwd b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/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/14_groupadd_invalid_-K_option/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/config/etc/shadow b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/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/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/15_groupadd_invalid_-K_no_=/config/etc/group b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/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/15_groupadd_invalid_-K_no_=/config/etc/group diff --git a/tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/gshadow b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/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/15_groupadd_invalid_-K_no_=/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/passwd b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/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/15_groupadd_invalid_-K_no_=/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/config/etc/shadow b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/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/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/16_groupadd_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/16_groupadd_existing_group/config/etc/gshadow rename to tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/passwd b/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/passwd rename to tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/shadow b/tests/grouptools/groupadd/16_groupadd_existing_group/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupadd/16_groupadd_existing_group/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/17_groupadd_add_systemgroup/config/etc/group b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/group rename to tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/group diff --git a/tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/gshadow b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/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/17_groupadd_add_systemgroup/config/etc/passwd b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/passwd rename to tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/shadow b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupadd/17_groupadd_add_systemgroup/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/18_groupadd_no_more_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/18_groupadd_no_more_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/18_groupadd_no_more_GID/config/etc/passwd b/tests/grouptools/groupadd/18_groupadd_no_more_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/18_groupadd_no_more_GID/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/18_groupadd_no_more_GID/config/etc/shadow b/tests/grouptools/groupadd/18_groupadd_no_more_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/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/19_groupadd_-r_no_more_system_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/19_groupadd_-r_no_more_system_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/19_groupadd_-r_no_more_system_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/19_groupadd_-r_no_more_system_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/19_groupadd_-r_no_more_system_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/19_groupadd_-r_no_more_system_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/groupadd/20_groupadd_add_existing_GID/config/etc/group b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/group rename to tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/group diff --git a/tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/gshadow b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/gshadow rename to tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/20_groupadd_add_existing_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/20_groupadd_add_existing_GID/config/etc/passwd rename to tests/grouptools/groupadd/20_groupadd_add_existing_GID/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/20_groupadd_add_existing_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/20_groupadd_add_existing_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/21_groupadd_invalid_GID_4294967295/config/etc/group b/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/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/21_groupadd_invalid_GID_4294967295/config/etc/group diff --git a/tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/gshadow b/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/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/21_groupadd_invalid_GID_4294967295/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/passwd b/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/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/21_groupadd_invalid_GID_4294967295/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/config/etc/shadow b/tests/grouptools/groupadd/21_groupadd_invalid_GID_4294967295/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/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/22_groupadd_usage/config/etc/group b/tests/grouptools/groupadd/22_groupadd_usage/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/group rename to tests/grouptools/groupadd/22_groupadd_usage/config/etc/group diff --git a/tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/gshadow b/tests/grouptools/groupadd/22_groupadd_usage/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/gshadow rename to tests/grouptools/groupadd/22_groupadd_usage/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/passwd b/tests/grouptools/groupadd/22_groupadd_usage/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/passwd rename to tests/grouptools/groupadd/22_groupadd_usage/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/22_groupadd_usage/config/etc/shadow b/tests/grouptools/groupadd/22_groupadd_usage/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupadd/22_groupadd_usage/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/23_groupadd_no_groups/config/etc/group b/tests/grouptools/groupadd/23_groupadd_no_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/23_groupadd_no_groups/config/etc/group diff --git a/tests/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/gshadow b/tests/grouptools/groupadd/23_groupadd_no_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/23_groupadd_no_groups/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/passwd b/tests/grouptools/groupadd/23_groupadd_no_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/23_groupadd_no_groups/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/23_groupadd_no_groups/config/etc/shadow b/tests/grouptools/groupadd/23_groupadd_no_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/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/24_groupadd_2_groups/config/etc/group b/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/group rename to tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/group diff --git a/tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/gshadow b/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/gshadow rename to tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/passwd b/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/passwd rename to tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/shadow b/tests/grouptools/groupadd/24_groupadd_2_groups/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupadd/24_groupadd_2_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/25_groupadd_no_gshadow/config/etc/group b/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/group rename to tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/group diff --git a/tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/gshadow b/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/gshadow rename to tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/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/25_groupadd_no_gshadow/config/etc/login.defs rename to tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/login.defs diff --git a/tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/passwd b/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/passwd rename to tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/shadow b/tests/grouptools/groupadd/25_groupadd_no_gshadow/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupadd/25_groupadd_no_gshadow/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/26_groupadd_-o_without_-g/config/etc/group b/tests/grouptools/groupadd/26_groupadd_-o_without_-g/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/26_groupadd_-o_without_-g/config/etc/group diff --git a/tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/gshadow b/tests/grouptools/groupadd/26_groupadd_-o_without_-g/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/26_groupadd_-o_without_-g/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/passwd b/tests/grouptools/groupadd/26_groupadd_-o_without_-g/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/26_groupadd_-o_without_-g/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/26_groupadd_-o_without_-g/config/etc/shadow b/tests/grouptools/groupadd/26_groupadd_-o_without_-g/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/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/27_groupadd_invalid_option/config/etc/group b/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/group rename to tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/group diff --git a/tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/gshadow b/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/gshadow rename to tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/gshadow diff --git a/tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/passwd b/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/passwd rename to tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/passwd diff --git a/tests/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/shadow b/tests/grouptools/groupadd/27_groupadd_invalid_option/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupadd/27_groupadd_invalid_option/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/groupdel/01_groupdel_delete_group/config/etc/group b/tests/grouptools/groupdel/01_groupdel_delete_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/01_groupdel_delete_group/config/etc/group diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/gshadow b/tests/grouptools/groupdel/01_groupdel_delete_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/01_groupdel_delete_group/config/etc/gshadow diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/login.defs b/tests/grouptools/groupdel/01_groupdel_delete_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/01_groupdel_delete_group/config/etc/login.defs diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/passwd b/tests/grouptools/groupdel/01_groupdel_delete_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/01_groupdel_delete_group/config/etc/passwd diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/config/etc/shadow b/tests/grouptools/groupdel/01_groupdel_delete_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/01_groupdel_delete_group/config/etc/shadow diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/data/group b/tests/grouptools/groupdel/01_groupdel_delete_group/data/group similarity index 100% rename from tests/tests/grouptools/groupdel/01_groupdel_delete_group/data/group rename to tests/grouptools/groupdel/01_groupdel_delete_group/data/group diff --git a/tests/tests/grouptools/groupdel/01_groupdel_delete_group/data/gshadow b/tests/grouptools/groupdel/01_groupdel_delete_group/data/gshadow similarity index 100% rename from tests/tests/grouptools/groupdel/01_groupdel_delete_group/data/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/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/group b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_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/02_groupdel_delete_group_no_gshadow_group/config/etc/group diff --git a/tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/config/etc/gshadow b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/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/groupdel/02_groupdel_delete_group_no_gshadow_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/02_groupdel_delete_group_no_gshadow_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/02_groupdel_delete_group_no_gshadow_group/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/02_groupdel_delete_group_no_gshadow_group/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/02_groupdel_delete_group_no_gshadow_group/config/etc/passwd diff --git a/tests/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_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/02_groupdel_delete_group_no_gshadow_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/02_groupdel_delete_group_no_gshadow_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/02_groupdel_delete_group_no_gshadow_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/groupdel/03_groupdel_delete_group_no_gshadow_file/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/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/group rename to tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/group diff --git a/tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/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/groupdel/03_groupdel_delete_group_no_gshadow_file/config/etc/gshadow rename to tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/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/03_groupdel_delete_group_no_gshadow_file/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/03_groupdel_delete_group_no_gshadow_file/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/03_groupdel_delete_group_no_gshadow_file/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/03_groupdel_delete_group_no_gshadow_file/config/etc/passwd diff --git a/tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/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/03_groupdel_delete_group_no_gshadow_file/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/03_groupdel_delete_group_no_gshadow_file/data/group b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/group similarity index 100% rename from tests/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/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/04_groupdel_delete_group_error_busy_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/04_groupdel_delete_group_error_busy_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/groupdel/04_groupdel_delete_group_error_busy_group/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/groupdel/04_groupdel_delete_group_error_busy_group/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/04_groupdel_delete_group_error_busy_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/04_groupdel_delete_group_error_busy_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/05_groupdel_delete_group_error_unknown_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/05_groupdel_delete_group_error_unknown_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/06_groupdel_delete_group_error_locked_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/06_groupdel_delete_group_error_locked_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/06_groupdel_delete_group_error_locked_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/06_groupdel_delete_group_error_locked_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/06_groupdel_delete_group_error_locked_group/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/06_groupdel_delete_group_error_locked_group/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/06_groupdel_delete_group_error_locked_group/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/06_groupdel_delete_group_error_locked_group/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/06_groupdel_delete_group_error_locked_group/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/06_groupdel_delete_group_error_locked_group/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/07_groupdel_delete_group_error_locked_gshadow/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/07_groupdel_delete_group_error_locked_gshadow/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/07_groupdel_delete_group_error_locked_gshadow/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/07_groupdel_delete_group_error_locked_gshadow/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/07_groupdel_delete_group_error_locked_gshadow/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/07_groupdel_delete_group_error_locked_gshadow/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/07_groupdel_delete_group_error_locked_gshadow/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/07_groupdel_delete_group_error_locked_gshadow/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/07_groupdel_delete_group_error_locked_gshadow/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/07_groupdel_delete_group_error_locked_gshadow/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/08_groupdel_delete_group_error_no_group_parameter/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/08_groupdel_delete_group_error_no_group_parameter/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/09_groupdel_delete_group_error_two_group_parameter/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/09_groupdel_delete_group_error_two_group_parameter/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/10_groupdel_usage/config/etc/group b/tests/grouptools/groupdel/10_groupdel_usage/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/group rename to tests/grouptools/groupdel/10_groupdel_usage/config/etc/group diff --git a/tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/gshadow b/tests/grouptools/groupdel/10_groupdel_usage/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/gshadow rename to tests/grouptools/groupdel/10_groupdel_usage/config/etc/gshadow diff --git a/tests/tests/grouptools/groupdel/10_groupdel_usage/config/etc/login.defs b/tests/grouptools/groupdel/10_groupdel_usage/config/etc/login.defs similarity index 100% rename from tests/tests/grouptools/groupdel/10_groupdel_usage/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/11_groupdel_invalid_option/config/etc/group b/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/group rename to tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/group diff --git a/tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/gshadow b/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/gshadow rename to tests/grouptools/groupdel/11_groupdel_invalid_option/config/etc/gshadow diff --git a/tests/tests/grouptools/groupdel/11_groupdel_invalid_option/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/11_groupdel_invalid_option/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/groupmems/53_groupmems_usage/config/etc/group b/tests/grouptools/groupmems/53_groupmems_usage/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupmems/53_groupmems_usage/config/etc/group rename to tests/grouptools/groupmems/53_groupmems_usage/config/etc/group diff --git a/tests/tests/grouptools/groupmems/53_groupmems_usage/config/etc/gshadow b/tests/grouptools/groupmems/53_groupmems_usage/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupmems/53_groupmems_usage/config/etc/gshadow rename to tests/grouptools/groupmems/53_groupmems_usage/config/etc/gshadow diff --git a/tests/tests/grouptools/groupmems/53_groupmems_usage/config/etc/passwd b/tests/grouptools/groupmems/53_groupmems_usage/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupmems/53_groupmems_usage/config/etc/passwd rename to tests/grouptools/groupmems/53_groupmems_usage/config/etc/passwd diff --git a/tests/tests/grouptools/groupmems/53_groupmems_usage/config/etc/shadow b/tests/grouptools/groupmems/53_groupmems_usage/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupmems/53_groupmems_usage/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/grouptools/groupmems/54_groupmems_usage_invalid_option/config.txt b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config.txt similarity index 100% rename from tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config.txt rename to tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config.txt diff --git a/tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/group b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/group rename to tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/group diff --git a/tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/gshadow b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/gshadow rename to tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/gshadow diff --git a/tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/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/groupmems/54_groupmems_usage_invalid_option/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/54_groupmems_usage_invalid_option/config/etc/passwd b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/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/54_groupmems_usage_invalid_option/config/etc/passwd diff --git a/tests/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/config/etc/shadow b/tests/grouptools/groupmems/54_groupmems_usage_invalid_option/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/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/grouptools/groupmems/55_groupmems_usage-a-d/config.txt b/tests/grouptools/groupmems/55_groupmems_usage-a-d/config.txt similarity index 100% rename from tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config.txt rename to tests/grouptools/groupmems/55_groupmems_usage-a-d/config.txt diff --git a/tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/group b/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/group rename to tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/group diff --git a/tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/gshadow b/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/gshadow rename to tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/gshadow diff --git a/tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/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/groupmems/55_groupmems_usage-a-d/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/55_groupmems_usage-a-d/config/etc/passwd b/tests/grouptools/groupmems/55_groupmems_usage-a-d/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/55_groupmems_usage-a-d/config/etc/passwd diff --git a/tests/tests/grouptools/groupmems/55_groupmems_usage-a-d/config/etc/shadow b/tests/grouptools/groupmems/55_groupmems_usage-a-d/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/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/grouptools/groupmems/56_groupmems_usage_extra_arg/config.txt b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config.txt similarity index 100% rename from tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config.txt rename to tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config.txt diff --git a/tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/group b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/group rename to tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/group diff --git a/tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/gshadow b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/gshadow rename to tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/gshadow diff --git a/tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/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/groupmems/56_groupmems_usage_extra_arg/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/56_groupmems_usage_extra_arg/config/etc/passwd b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/passwd rename to tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/passwd diff --git a/tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/shadow b/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupmems/56_groupmems_usage_extra_arg/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/groupmod/01_groupmod_change_gid/config.txt b/tests/grouptools/groupmod/01_groupmod_change_gid/config.txt similarity index 100% rename from tests/tests/grouptools/groupmod/01_groupmod_change_gid/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/groupmod/01_groupmod_change_gid/config/etc/group b/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/group rename to tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/group diff --git a/tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/gshadow b/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/gshadow rename to tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/gshadow diff --git a/tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/login.defs b/tests/grouptools/groupmod/01_groupmod_change_gid/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/01_groupmod_change_gid/config/etc/login.defs diff --git a/tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/passwd b/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/passwd rename to tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/passwd diff --git a/tests/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/shadow b/tests/grouptools/groupmod/01_groupmod_change_gid/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupmod/01_groupmod_change_gid/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/groupmod/02_groupmod_change_gid_change_primary_group/config.txt b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/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/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/groupmod/02_groupmod_change_gid_change_primary_group/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/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/group rename to tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/group diff --git a/tests/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/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/groupmod/02_groupmod_change_gid_change_primary_group/config/etc/gshadow rename to tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/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/02_groupmod_change_gid_change_primary_group/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/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/groupmod/02_groupmod_change_gid_change_primary_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/groupmod/02_groupmod_change_gid_change_primary_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/groupmod/03_groupmod_change_gid_no_gshadow_group/config.txt b/tests/grouptools/groupmod/03_groupmod_change_gid_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/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/groupmod/03_groupmod_change_gid_no_gshadow_group/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/groupmod/03_groupmod_change_gid_no_gshadow_group/config/etc/group rename to tests/grouptools/groupmod/03_groupmod_change_gid_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/03_groupmod_change_gid_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/03_groupmod_change_gid_no_gshadow_group/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/03_groupmod_change_gid_no_gshadow_group/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/03_groupmod_change_gid_no_gshadow_group/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/03_groupmod_change_gid_no_gshadow_group/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/03_groupmod_change_gid_no_gshadow_group/config/etc/passwd diff --git a/tests/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/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/03_groupmod_change_gid_no_gshadow_group/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/04_groupmod_change_gid_no_gshadow_file/config.txt b/tests/grouptools/groupmod/04_groupmod_change_gid_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/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/04_groupmod_change_gid_no_gshadow_file/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/04_groupmod_change_gid_no_gshadow_file/config/etc/group rename to tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/config/etc/group diff --git a/tests/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/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/groupmod/04_groupmod_change_gid_no_gshadow_file/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/04_groupmod_change_gid_no_gshadow_file/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/04_groupmod_change_gid_no_gshadow_file/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/04_groupmod_change_gid_no_gshadow_file/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/04_groupmod_change_gid_no_gshadow_file/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/04_groupmod_change_gid_no_gshadow_file/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/04_groupmod_change_gid_no_gshadow_file/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/05_groupmod_change_gid_-o_override_used_GID/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/05_groupmod_change_gid_-o_override_used_GID/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/05_groupmod_change_gid_-o_override_used_GID/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/05_groupmod_change_gid_-o_override_used_GID/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/05_groupmod_change_gid_-o_override_used_GID/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/05_groupmod_change_gid_-o_override_used_GID/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/06_groupmod_change_group_name/config.txt b/tests/grouptools/groupmod/06_groupmod_change_group_name/config.txt similarity index 100% rename from tests/tests/grouptools/groupmod/06_groupmod_change_group_name/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/06_groupmod_change_group_name/config/etc/group b/tests/grouptools/groupmod/06_groupmod_change_group_name/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/06_groupmod_change_group_name/config/etc/group diff --git a/tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/gshadow b/tests/grouptools/groupmod/06_groupmod_change_group_name/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/06_groupmod_change_group_name/config/etc/gshadow diff --git a/tests/tests/grouptools/groupmod/06_groupmod_change_group_name/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/06_groupmod_change_group_name/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/06_groupmod_change_group_name/config/etc/passwd b/tests/grouptools/groupmod/06_groupmod_change_group_name/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/06_groupmod_change_group_name/config/etc/passwd diff --git a/tests/tests/grouptools/groupmod/06_groupmod_change_group_name/config/etc/shadow b/tests/grouptools/groupmod/06_groupmod_change_group_name/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/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/07_groupmod_change_group_name_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/07_groupmod_change_group_name_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/07_groupmod_change_group_name_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/07_groupmod_change_group_name_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/07_groupmod_change_group_name_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/07_groupmod_change_group_name_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/07_groupmod_change_group_name_no_gshadow_group/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/07_groupmod_change_group_name_no_gshadow_group/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/07_groupmod_change_group_name_no_gshadow_group/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/07_groupmod_change_group_name_no_gshadow_group/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/07_groupmod_change_group_name_no_gshadow_group/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/07_groupmod_change_group_name_no_gshadow_group/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/08_groupmod_change_group_name_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/08_groupmod_change_group_name_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/08_groupmod_change_group_name_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/08_groupmod_change_group_name_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/08_groupmod_change_group_name_no_gshadow_file/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/08_groupmod_change_group_name_no_gshadow_file/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/08_groupmod_change_group_name_no_gshadow_file/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/08_groupmod_change_group_name_no_gshadow_file/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/08_groupmod_change_group_name_no_gshadow_file/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/08_groupmod_change_group_name_no_gshadow_file/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/08_groupmod_change_group_name_no_gshadow_file/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/08_groupmod_change_group_name_no_gshadow_file/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/09_groupmod_set_password/config.txt b/tests/grouptools/groupmod/09_groupmod_set_password/config.txt similarity index 100% rename from tests/tests/grouptools/groupmod/09_groupmod_set_password/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/09_groupmod_set_password/config/etc/group b/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/group rename to tests/grouptools/groupmod/09_groupmod_set_password/config/etc/group diff --git a/tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/gshadow b/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/gshadow rename to tests/grouptools/groupmod/09_groupmod_set_password/config/etc/gshadow diff --git a/tests/tests/grouptools/groupmod/09_groupmod_set_password/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/09_groupmod_set_password/config/etc/login.defs rename to tests/grouptools/groupmod/09_groupmod_set_password/config/etc/login.defs diff --git a/tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/passwd b/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/passwd rename to tests/grouptools/groupmod/09_groupmod_set_password/config/etc/passwd diff --git a/tests/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/shadow b/tests/grouptools/groupmod/09_groupmod_set_password/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupmod/09_groupmod_set_password/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/10_groupmod_set_password_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/10_groupmod_set_password_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/10_groupmod_set_password_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/10_groupmod_set_password_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/10_groupmod_set_password_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/10_groupmod_set_password_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/10_groupmod_set_password_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/10_groupmod_set_password_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/10_groupmod_set_password_no_gshadow_group/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/10_groupmod_set_password_no_gshadow_group/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/10_groupmod_set_password_no_gshadow_group/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/10_groupmod_set_password_no_gshadow_group/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/11_groupmod_set_password_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/11_groupmod_set_password_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/11_groupmod_set_password_no_gshadow_file/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/11_groupmod_set_password_no_gshadow_file/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/11_groupmod_set_password_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/11_groupmod_set_password_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/11_groupmod_set_password_no_gshadow_file/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/11_groupmod_set_password_no_gshadow_file/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/11_groupmod_set_password_no_gshadow_file/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/11_groupmod_set_password_no_gshadow_file/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/12_groupmod_change_gid_error_unknown_group/config.txt b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/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/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/12_groupmod_change_gid_error_unknown_group/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/12_groupmod_change_gid_error_unknown_group/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/12_groupmod_change_gid_error_unknown_group/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/12_groupmod_change_gid_error_unknown_group/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/12_groupmod_change_gid_error_unknown_group/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/12_groupmod_change_gid_error_unknown_group/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/12_groupmod_change_gid_error_unknown_group/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/12_groupmod_change_gid_error_unknown_group/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/12_groupmod_change_gid_error_unknown_group/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/12_groupmod_change_gid_error_unknown_group/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/13_groupmod_change_gid_error_used_GID/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/13_groupmod_change_gid_error_used_GID/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/13_groupmod_change_gid_error_used_GID/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/13_groupmod_change_gid_error_used_GID/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/13_groupmod_change_gid_error_used_GID/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/13_groupmod_change_gid_error_used_GID/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/14_groupmod_change_group_name_error_used_name/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/14_groupmod_change_group_name_error_used_name/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/14_groupmod_change_group_name_error_used_name/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/14_groupmod_change_group_name_error_used_name/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/14_groupmod_change_group_name_error_used_name/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/14_groupmod_change_group_name_error_used_name/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/15_groupmod_change_group_name_error_invalid_name/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/15_groupmod_change_group_name_error_invalid_name/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/15_groupmod_change_group_name_error_invalid_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/15_groupmod_change_group_name_error_invalid_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/15_groupmod_change_group_name_error_invalid_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/15_groupmod_change_group_name_error_invalid_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/16_groupmod_change_group_name_no_changes/config.txt b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/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/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/16_groupmod_change_group_name_no_changes/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/16_groupmod_change_group_name_no_changes/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/16_groupmod_change_group_name_no_changes/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/16_groupmod_change_group_name_no_changes/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/16_groupmod_change_group_name_no_changes/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/16_groupmod_change_group_name_no_changes/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/16_groupmod_change_group_name_no_changes/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/16_groupmod_change_group_name_no_changes/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/16_groupmod_change_group_name_no_changes/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/16_groupmod_change_group_name_no_changes/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/17_groupmod_change_gid_error_locked_group/config.txt b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/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/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/17_groupmod_change_gid_error_locked_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/17_groupmod_change_gid_error_locked_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/17_groupmod_change_gid_error_locked_group/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/17_groupmod_change_gid_error_locked_group/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/17_groupmod_change_gid_error_locked_group/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/17_groupmod_change_gid_error_locked_group/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/17_groupmod_change_gid_error_locked_group/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/17_groupmod_change_gid_error_locked_group/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/17_groupmod_change_gid_error_locked_group/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/17_groupmod_change_gid_error_locked_group/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/18_groupmod_change_gid_no_error_locked_gshadow/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/18_groupmod_change_gid_no_error_locked_gshadow/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/18_groupmod_change_gid_no_error_locked_gshadow/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/18_groupmod_change_gid_no_error_locked_gshadow/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/18_groupmod_change_gid_no_error_locked_gshadow/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/18_groupmod_change_gid_no_error_locked_gshadow/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/18_groupmod_change_gid_no_error_locked_gshadow/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/18_groupmod_change_gid_no_error_locked_gshadow/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/18_groupmod_change_gid_no_error_locked_gshadow/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/18_groupmod_change_gid_no_error_locked_gshadow/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/18_groupmod_change_gid_no_error_locked_gshadow/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/18_groupmod_change_gid_no_error_locked_gshadow/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/19_groupmod_change_gid_error_invalid_GID/config.txt b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/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/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/19_groupmod_change_gid_error_invalid_GID/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/19_groupmod_change_gid_error_invalid_GID/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/19_groupmod_change_gid_error_invalid_GID/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/19_groupmod_change_gid_error_invalid_GID/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/19_groupmod_change_gid_error_invalid_GID/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/19_groupmod_change_gid_error_invalid_GID/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/19_groupmod_change_gid_error_invalid_GID/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/19_groupmod_change_gid_error_invalid_GID/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/19_groupmod_change_gid_error_invalid_GID/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/19_groupmod_change_gid_error_invalid_GID/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/20_groupmod_change_gid_error_negative_GID/config.txt b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negative_GID/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/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/20_groupmod_change_gid_error_negative_GID/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/20_groupmod_change_gid_error_negative_GID/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/20_groupmod_change_gid_error_negative_GID/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/20_groupmod_change_gid_error_negative_GID/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/20_groupmod_change_gid_error_negative_GID/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/20_groupmod_change_gid_error_negative_GID/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/20_groupmod_change_gid_error_negative_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/20_groupmod_change_gid_error_negative_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/20_groupmod_change_gid_error_negative_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/20_groupmod_change_gid_error_negative_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/21_groupmod_change_gid_error_no_group/config.txt b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/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/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/21_groupmod_change_gid_error_no_group/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/21_groupmod_change_gid_error_no_group/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/21_groupmod_change_gid_error_no_group/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/21_groupmod_change_gid_error_no_group/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/21_groupmod_change_gid_error_no_group/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/21_groupmod_change_gid_error_no_group/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/21_groupmod_change_gid_error_no_group/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/21_groupmod_change_gid_error_no_group/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/21_groupmod_change_gid_error_no_group/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/21_groupmod_change_gid_error_no_group/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/22_groupmod_change_gid_and_group_name/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/22_groupmod_change_gid_and_group_name/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/22_groupmod_change_gid_and_group_name/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/22_groupmod_change_gid_and_group_name/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/22_groupmod_change_gid_and_group_name/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/22_groupmod_change_gid_and_group_name/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/22_groupmod_change_gid_and_group_name/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/22_groupmod_change_gid_and_group_name/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/22_groupmod_change_gid_and_group_name/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/22_groupmod_change_gid_and_group_name/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/23_groupmod_change_gid_and_group_name_and_password/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/23_groupmod_change_gid_and_group_name_and_password/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/23_groupmod_change_gid_and_group_name_and_password/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/23_groupmod_change_gid_and_group_name_and_password/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/23_groupmod_change_gid_and_group_name_and_password/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/23_groupmod_change_gid_and_group_name_and_password/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/23_groupmod_change_gid_and_group_name_and_password/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/23_groupmod_change_gid_and_group_name_and_password/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/24_groupmod_change_gid_and_name_error_locked_gshadow/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/24_groupmod_change_gid_and_name_error_locked_gshadow/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/24_groupmod_change_gid_and_name_error_locked_gshadow/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/24_groupmod_change_gid_and_name_error_locked_gshadow/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/24_groupmod_change_gid_and_name_error_locked_gshadow/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/24_groupmod_change_gid_and_name_error_locked_gshadow/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/24_groupmod_change_gid_and_name_error_locked_gshadow/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/24_groupmod_change_gid_and_name_error_locked_gshadow/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/24_groupmod_change_gid_and_name_error_locked_gshadow/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/24_groupmod_change_gid_and_name_error_locked_gshadow/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/25_groupmod_change_gid_change_primary_group_error_locked_passwd/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/25_groupmod_change_gid_change_primary_group_error_locked_passwd/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/25_groupmod_change_gid_change_primary_group_error_locked_passwd/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/25_groupmod_change_gid_change_primary_group_error_locked_passwd/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/25_groupmod_change_gid_change_primary_group_error_locked_passwd/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/25_groupmod_change_gid_change_primary_group_error_locked_passwd/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/25_groupmod_change_gid_change_primary_group_error_locked_passwd/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/25_groupmod_change_gid_change_primary_group_error_locked_passwd/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/25_groupmod_change_gid_change_primary_group_error_locked_passwd/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/25_groupmod_change_gid_change_primary_group_error_locked_passwd/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/26_groupmod_change_group_name_no_error_locked_passwd/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/26_groupmod_change_group_name_no_error_locked_passwd/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/26_groupmod_change_group_name_no_error_locked_passwd/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/26_groupmod_change_group_name_no_error_locked_passwd/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/26_groupmod_change_group_name_no_error_locked_passwd/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/26_groupmod_change_group_name_no_error_locked_passwd/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/26_groupmod_change_group_name_no_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/26_groupmod_change_group_name_no_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/26_groupmod_change_group_name_no_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/26_groupmod_change_group_name_no_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/27_groupmod_change_gid_error_GID_4294967295/config.txt b/tests/grouptools/groupmod/27_groupmod_change_gid_error_GID_4294967295/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/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/27_groupmod_change_gid_error_GID_4294967295/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/27_groupmod_change_gid_error_GID_4294967295/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/27_groupmod_change_gid_error_GID_4294967295/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/27_groupmod_change_gid_error_GID_4294967295/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/27_groupmod_change_gid_error_GID_4294967295/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/27_groupmod_change_gid_error_GID_4294967295/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/27_groupmod_change_gid_error_GID_4294967295/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/27_groupmod_change_gid_error_GID_4294967295/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/27_groupmod_change_gid_error_GID_4294967295/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/27_groupmod_change_gid_error_GID_4294967295/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/groupmod/28_groupmod_usage/config/etc/group b/tests/grouptools/groupmod/28_groupmod_usage/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/group rename to tests/grouptools/groupmod/28_groupmod_usage/config/etc/group diff --git a/tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/gshadow b/tests/grouptools/groupmod/28_groupmod_usage/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/gshadow rename to tests/grouptools/groupmod/28_groupmod_usage/config/etc/gshadow diff --git a/tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/passwd b/tests/grouptools/groupmod/28_groupmod_usage/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/passwd rename to tests/grouptools/groupmod/28_groupmod_usage/config/etc/passwd diff --git a/tests/tests/grouptools/groupmod/28_groupmod_usage/config/etc/shadow b/tests/grouptools/groupmod/28_groupmod_usage/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupmod/28_groupmod_usage/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/29_groupmod_-g_same_gid_new_name/config.txt b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/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/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/29_groupmod_-g_same_gid_new_name/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/29_groupmod_-g_same_gid_new_name/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/29_groupmod_-g_same_gid_new_name/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/29_groupmod_-g_same_gid_new_name/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/29_groupmod_-g_same_gid_new_name/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/29_groupmod_-g_same_gid_new_name/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/29_groupmod_-g_same_gid_new_name/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/29_groupmod_-g_same_gid_new_name/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/29_groupmod_-g_same_gid_new_name/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/29_groupmod_-g_same_gid_new_name/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/30_groupmod_-g_same_gid_same_name/config.txt b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/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/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/30_groupmod_-g_same_gid_same_name/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/30_groupmod_-g_same_gid_same_name/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/30_groupmod_-g_same_gid_same_name/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/30_groupmod_-g_same_gid_same_name/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/30_groupmod_-g_same_gid_same_name/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/30_groupmod_-g_same_gid_same_name/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/30_groupmod_-g_same_gid_same_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/30_groupmod_-g_same_gid_same_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/30_groupmod_-g_same_gid_same_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/30_groupmod_-g_same_gid_same_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/31_groupmod_-g_same_gid/config.txt b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config.txt similarity index 100% rename from tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/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/31_groupmod_-g_same_gid/config/etc/group b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/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/31_groupmod_-g_same_gid/config/etc/group diff --git a/tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/gshadow b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/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/31_groupmod_-g_same_gid/config/etc/gshadow diff --git a/tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/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/31_groupmod_-g_same_gid/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/31_groupmod_-g_same_gid/config/etc/passwd b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/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/31_groupmod_-g_same_gid/config/etc/passwd diff --git a/tests/tests/grouptools/groupmod/31_groupmod_-g_same_gid/config/etc/shadow b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/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/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/32_groupmod_-o_without_-g/config/etc/group b/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/group rename to tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/group diff --git a/tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/gshadow b/tests/grouptools/groupmod/32_groupmod_-o_without_-g/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/32_groupmod_-o_without_-g/config/etc/gshadow diff --git a/tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/passwd b/tests/grouptools/groupmod/32_groupmod_-o_without_-g/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/32_groupmod_-o_without_-g/config/etc/passwd diff --git a/tests/tests/grouptools/groupmod/32_groupmod_-o_without_-g/config/etc/shadow b/tests/grouptools/groupmod/32_groupmod_-o_without_-g/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/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/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/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/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/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/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/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/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/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/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/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/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/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/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/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/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/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/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/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/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/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/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/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/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/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/34_groupmod_set_password_group_without_shadow_pwd/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/34_groupmod_set_password_group_without_shadow_pwd/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/34_groupmod_set_password_group_without_shadow_pwd/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/34_groupmod_set_password_group_without_shadow_pwd/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/34_groupmod_set_password_group_without_shadow_pwd/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/34_groupmod_set_password_group_without_shadow_pwd/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/34_groupmod_set_password_group_without_shadow_pwd/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/34_groupmod_set_password_group_without_shadow_pwd/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/34_groupmod_set_password_group_without_shadow_pwd/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/34_groupmod_set_password_group_without_shadow_pwd/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/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/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/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/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/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/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/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/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/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/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/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/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/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/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/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/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/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/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/35_groupmod_set_password_group_without_shadow_pwd_no_gshadow_group/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/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/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/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/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/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/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/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/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/36_groupmod_set_password_group_with_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/36_groupmod_set_password_group_with_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/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/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/36_groupmod_set_password_group_with_shadow_pwd_no_gshadow_group/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/36_groupmod_set_password_group_with_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/36_groupmod_set_password_group_with_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/36_groupmod_set_password_group_with_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/36_groupmod_set_password_group_with_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/37_groupmod_invalid_option/config.txt b/tests/grouptools/groupmod/37_groupmod_invalid_option/config.txt similarity index 100% rename from tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config.txt rename to tests/grouptools/groupmod/37_groupmod_invalid_option/config.txt diff --git a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/group b/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/group similarity index 100% rename from tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/group rename to tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/group diff --git a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/gshadow b/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/gshadow similarity index 100% rename from tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/gshadow rename to tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/gshadow diff --git a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/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/37_groupmod_invalid_option/config/etc/login.defs rename to tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/login.defs diff --git a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/passwd b/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/passwd similarity index 100% rename from tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/passwd rename to tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/passwd diff --git a/tests/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/shadow b/tests/grouptools/groupmod/37_groupmod_invalid_option/config/etc/shadow similarity index 100% rename from tests/tests/grouptools/groupmod/37_groupmod_invalid_option/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/libsubid/01_list_ranges/config.txt b/tests/libsubid/01_list_ranges/config.txt similarity index 100% rename from tests/tests/libsubid/01_list_ranges/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/libsubid/02_get_subid_owners/config.txt b/tests/libsubid/02_get_subid_owners/config.txt similarity index 100% rename from tests/tests/libsubid/02_get_subid_owners/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/libsubid/03_add_remove/config.txt b/tests/libsubid/03_add_remove/config.txt similarity index 100% rename from tests/tests/libsubid/03_add_remove/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..7d7ae3e6 --- /dev/null +++ b/tests/libsubid/04_nss/Makefile @@ -0,0 +1,15 @@ +all: test_nss libsubid_zzz.so + +BASE_TEST_DIR ?= $(shell git rev-parse --show-toplevel) +basedir := $(BASE_TEST_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 100% rename from tests/tests/libsubid/04_nss/libsubid_zzz.c rename to tests/libsubid/04_nss/libsubid_zzz.c 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/log/faillog/01_faillog_no_faillog/config/etc/group b/tests/log/faillog/01_faillog_no_faillog/config/etc/group similarity index 100% rename from tests/tests/log/faillog/01_faillog_no_faillog/config/etc/group rename to tests/log/faillog/01_faillog_no_faillog/config/etc/group diff --git a/tests/tests/log/faillog/01_faillog_no_faillog/config/etc/gshadow b/tests/log/faillog/01_faillog_no_faillog/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/01_faillog_no_faillog/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/log/faillog/01_faillog_no_faillog/config/etc/shadow b/tests/log/faillog/01_faillog_no_faillog/config/etc/shadow similarity index 100% rename from tests/tests/log/faillog/01_faillog_no_faillog/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/log/faillog/02_faillog_usage/config/etc/group b/tests/log/faillog/02_faillog_usage/config/etc/group similarity index 100% rename from tests/tests/log/faillog/02_faillog_usage/config/etc/group rename to tests/log/faillog/02_faillog_usage/config/etc/group diff --git a/tests/tests/log/faillog/02_faillog_usage/config/etc/gshadow b/tests/log/faillog/02_faillog_usage/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/02_faillog_usage/config/etc/gshadow rename to tests/log/faillog/02_faillog_usage/config/etc/gshadow diff --git a/tests/tests/log/faillog/02_faillog_usage/config/etc/passwd b/tests/log/faillog/02_faillog_usage/config/etc/passwd similarity index 100% rename from tests/tests/log/faillog/02_faillog_usage/config/etc/passwd rename to tests/log/faillog/02_faillog_usage/config/etc/passwd diff --git a/tests/tests/log/faillog/02_faillog_usage/config/etc/shadow b/tests/log/faillog/02_faillog_usage/config/etc/shadow similarity index 100% rename from tests/tests/log/faillog/02_faillog_usage/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/log/faillog/03_faillog_format/config/etc/group b/tests/log/faillog/03_faillog_format/config/etc/group similarity index 100% rename from tests/tests/log/faillog/03_faillog_format/config/etc/group rename to tests/log/faillog/03_faillog_format/config/etc/group diff --git a/tests/tests/log/faillog/03_faillog_format/config/etc/gshadow b/tests/log/faillog/03_faillog_format/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/03_faillog_format/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/log/faillog/04_faillog_multiple/config/etc/group b/tests/log/faillog/04_faillog_multiple/config/etc/group similarity index 100% rename from tests/tests/log/faillog/04_faillog_multiple/config/etc/group rename to tests/log/faillog/04_faillog_multiple/config/etc/group diff --git a/tests/tests/log/faillog/04_faillog_multiple/config/etc/gshadow b/tests/log/faillog/04_faillog_multiple/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/04_faillog_multiple/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/05_faillog-u_ID/config/etc/group b/tests/log/faillog/05_faillog-u_ID/config/etc/group similarity index 100% rename from tests/tests/log/faillog/05_faillog-u_ID/config/etc/group rename to tests/log/faillog/05_faillog-u_ID/config/etc/group diff --git a/tests/tests/log/faillog/05_faillog-u_ID/config/etc/gshadow b/tests/log/faillog/05_faillog-u_ID/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/05_faillog-u_ID/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/06_faillog-u_name/config/etc/group b/tests/log/faillog/06_faillog-u_name/config/etc/group similarity index 100% rename from tests/tests/log/faillog/06_faillog-u_name/config/etc/group rename to tests/log/faillog/06_faillog-u_name/config/etc/group diff --git a/tests/tests/log/faillog/06_faillog-u_name/config/etc/gshadow b/tests/log/faillog/06_faillog-u_name/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/06_faillog-u_name/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/07_faillog-u_ID_invalid/config/etc/group b/tests/log/faillog/07_faillog-u_ID_invalid/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/07_faillog-u_ID_invalid/config/etc/group diff --git a/tests/tests/log/faillog/07_faillog-u_ID_invalid/config/etc/gshadow b/tests/log/faillog/07_faillog-u_ID_invalid/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/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/08_faillog-u_name_invalid/config/etc/group b/tests/log/faillog/08_faillog-u_name_invalid/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/08_faillog-u_name_invalid/config/etc/group diff --git a/tests/tests/log/faillog/08_faillog-u_name_invalid/config/etc/gshadow b/tests/log/faillog/08_faillog-u_name_invalid/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/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/09_faillog-u_range/config/etc/group b/tests/log/faillog/09_faillog-u_range/config/etc/group similarity index 100% rename from tests/tests/log/faillog/09_faillog-u_range/config/etc/group rename to tests/log/faillog/09_faillog-u_range/config/etc/group diff --git a/tests/tests/log/faillog/09_faillog-u_range/config/etc/gshadow b/tests/log/faillog/09_faillog-u_range/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/09_faillog-u_range/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/10_faillog-u_open_range/config/etc/group b/tests/log/faillog/10_faillog-u_open_range/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/10_faillog-u_open_range/config/etc/group diff --git a/tests/tests/log/faillog/10_faillog-u_open_range/config/etc/gshadow b/tests/log/faillog/10_faillog-u_open_range/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/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/11_faillog-u_range_open/config/etc/group b/tests/log/faillog/11_faillog-u_range_open/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/11_faillog-u_range_open/config/etc/group diff --git a/tests/tests/log/faillog/11_faillog-u_range_open/config/etc/gshadow b/tests/log/faillog/11_faillog-u_range_open/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/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/12_faillog-u_range_invalid1/config/etc/group b/tests/log/faillog/12_faillog-u_range_invalid1/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/12_faillog-u_range_invalid1/config/etc/group diff --git a/tests/tests/log/faillog/12_faillog-u_range_invalid1/config/etc/gshadow b/tests/log/faillog/12_faillog-u_range_invalid1/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/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/13_faillog-u_range_invalid2/config/etc/group b/tests/log/faillog/13_faillog-u_range_invalid2/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/13_faillog-u_range_invalid2/config/etc/group diff --git a/tests/tests/log/faillog/13_faillog-u_range_invalid2/config/etc/gshadow b/tests/log/faillog/13_faillog-u_range_invalid2/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/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/14_faillog-u_range_invalid3/config/etc/group b/tests/log/faillog/14_faillog-u_range_invalid3/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/14_faillog-u_range_invalid3/config/etc/group diff --git a/tests/tests/log/faillog/14_faillog-u_range_invalid3/config/etc/gshadow b/tests/log/faillog/14_faillog-u_range_invalid3/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/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/15_faillog_bad_option/config/etc/group b/tests/log/faillog/15_faillog_bad_option/config/etc/group similarity index 100% rename from tests/tests/log/faillog/15_faillog_bad_option/config/etc/group rename to tests/log/faillog/15_faillog_bad_option/config/etc/group diff --git a/tests/tests/log/faillog/15_faillog_bad_option/config/etc/gshadow b/tests/log/faillog/15_faillog_bad_option/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/15_faillog_bad_option/config/etc/gshadow rename to tests/log/faillog/15_faillog_bad_option/config/etc/gshadow diff --git a/tests/tests/log/faillog/15_faillog_bad_option/config/etc/passwd b/tests/log/faillog/15_faillog_bad_option/config/etc/passwd similarity index 100% rename from tests/tests/log/faillog/15_faillog_bad_option/config/etc/passwd rename to tests/log/faillog/15_faillog_bad_option/config/etc/passwd diff --git a/tests/tests/log/faillog/15_faillog_bad_option/config/etc/shadow b/tests/log/faillog/15_faillog_bad_option/config/etc/shadow similarity index 100% rename from tests/tests/log/faillog/15_faillog_bad_option/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/16_faillog_extra_arg/config/etc/group b/tests/log/faillog/16_faillog_extra_arg/config/etc/group similarity index 100% rename from tests/tests/log/faillog/16_faillog_extra_arg/config/etc/group rename to tests/log/faillog/16_faillog_extra_arg/config/etc/group diff --git a/tests/tests/log/faillog/16_faillog_extra_arg/config/etc/gshadow b/tests/log/faillog/16_faillog_extra_arg/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/16_faillog_extra_arg/config/etc/gshadow rename to tests/log/faillog/16_faillog_extra_arg/config/etc/gshadow diff --git a/tests/tests/log/faillog/16_faillog_extra_arg/config/etc/passwd b/tests/log/faillog/16_faillog_extra_arg/config/etc/passwd similarity index 100% rename from tests/tests/log/faillog/16_faillog_extra_arg/config/etc/passwd rename to tests/log/faillog/16_faillog_extra_arg/config/etc/passwd diff --git a/tests/tests/log/faillog/16_faillog_extra_arg/config/etc/shadow b/tests/log/faillog/16_faillog_extra_arg/config/etc/shadow similarity index 100% rename from tests/tests/log/faillog/16_faillog_extra_arg/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/17_faillog-t/config/etc/group b/tests/log/faillog/17_faillog-t/config/etc/group similarity index 100% rename from tests/tests/log/faillog/17_faillog-t/config/etc/group rename to tests/log/faillog/17_faillog-t/config/etc/group diff --git a/tests/tests/log/faillog/17_faillog-t/config/etc/gshadow b/tests/log/faillog/17_faillog-t/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/17_faillog-t/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/18_faillog-t_invalid/config/etc/group b/tests/log/faillog/18_faillog-t_invalid/config/etc/group similarity index 100% rename from tests/tests/log/faillog/18_faillog-t_invalid/config/etc/group rename to tests/log/faillog/18_faillog-t_invalid/config/etc/group diff --git a/tests/tests/log/faillog/18_faillog-t_invalid/config/etc/gshadow b/tests/log/faillog/18_faillog-t_invalid/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/18_faillog-t_invalid/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/19_faillog_multiple_same_user/config/etc/group b/tests/log/faillog/19_faillog_multiple_same_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/19_faillog_multiple_same_user/config/etc/group diff --git a/tests/tests/log/faillog/19_faillog_multiple_same_user/config/etc/gshadow b/tests/log/faillog/19_faillog_multiple_same_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/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/20_faillog-r-u/config/etc/group b/tests/log/faillog/20_faillog-r-u/config/etc/group similarity index 100% rename from tests/tests/log/faillog/20_faillog-r-u/config/etc/group rename to tests/log/faillog/20_faillog-r-u/config/etc/group diff --git a/tests/tests/log/faillog/20_faillog-r-u/config/etc/gshadow b/tests/log/faillog/20_faillog-r-u/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/20_faillog-r-u/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/21_faillog-r-u_range/config/etc/group b/tests/log/faillog/21_faillog-r-u_range/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/21_faillog-r-u_range/config/etc/group diff --git a/tests/tests/log/faillog/21_faillog-r-u_range/config/etc/gshadow b/tests/log/faillog/21_faillog-r-u_range/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/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/22_faillog_removed_user/config/etc/group b/tests/log/faillog/22_faillog_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/22_faillog_removed_user/config/etc/group diff --git a/tests/tests/log/faillog/22_faillog_removed_user/config/etc/gshadow b/tests/log/faillog/22_faillog_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/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/23_faillog-a_removed_user/config/etc/group b/tests/log/faillog/23_faillog-a_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/23_faillog-a_removed_user/config/etc/group diff --git a/tests/tests/log/faillog/23_faillog-a_removed_user/config/etc/gshadow b/tests/log/faillog/23_faillog-a_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/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/24_faillog-u_removed_user/config/etc/group b/tests/log/faillog/24_faillog-u_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/24_faillog-u_removed_user/config/etc/group diff --git a/tests/tests/log/faillog/24_faillog-u_removed_user/config/etc/gshadow b/tests/log/faillog/24_faillog-u_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/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/25_faillog-r-u_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/25_faillog-r-u_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/25_faillog-r-u_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/25_faillog-r-u_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/26_faillog-r-u_range_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/26_faillog-r-u_range_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/26_faillog-r-u_range_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/26_faillog-r-u_range_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/27_faillog-r-a-u_range_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/27_faillog-r-a-u_range_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/27_faillog-r-a-u_range_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/27_faillog-r-a-u_range_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/28_faillog-r-a-u_open_range_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/28_faillog-r-a-u_open_range_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/28_faillog-r-a-u_open_range_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/28_faillog-r-a-u_open_range_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/29_faillog-r-a-u_range_open_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/29_faillog-r-a-u_range_open_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/29_faillog-r-a-u_range_open_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/29_faillog-r-a-u_range_open_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/30_faillog-r/config/etc/group b/tests/log/faillog/30_faillog-r/config/etc/group similarity index 100% rename from tests/tests/log/faillog/30_faillog-r/config/etc/group rename to tests/log/faillog/30_faillog-r/config/etc/group diff --git a/tests/tests/log/faillog/30_faillog-r/config/etc/gshadow b/tests/log/faillog/30_faillog-r/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/30_faillog-r/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/31_faillog-r-u_open_range/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/31_faillog-r-u_open_range/config/etc/group rename to tests/log/faillog/31_faillog-r-u_open_range/config/etc/group diff --git a/tests/tests/log/faillog/31_faillog-r-u_open_range/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/31_faillog-r-u_open_range/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/32_faillog-l/config/etc/group b/tests/log/faillog/32_faillog-l/config/etc/group similarity index 100% rename from tests/tests/log/faillog/32_faillog-l/config/etc/group rename to tests/log/faillog/32_faillog-l/config/etc/group diff --git a/tests/tests/log/faillog/32_faillog-l/config/etc/gshadow b/tests/log/faillog/32_faillog-l/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/32_faillog-l/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/33_faillog-l-u_user/config/etc/group b/tests/log/faillog/33_faillog-l-u_user/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/33_faillog-l-u_user/config/etc/group diff --git a/tests/tests/log/faillog/33_faillog-l-u_user/config/etc/gshadow b/tests/log/faillog/33_faillog-l-u_user/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/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/34_faillog-l-u_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/34_faillog-l-u_range/config/etc/group rename to tests/log/faillog/34_faillog-l-u_range/config/etc/group diff --git a/tests/tests/log/faillog/34_faillog-l-u_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/34_faillog-l-u_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/35_faillog-l-u_open_range/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/35_faillog-l-u_open_range/config/etc/group rename to tests/log/faillog/35_faillog-l-u_open_range/config/etc/group diff --git a/tests/tests/log/faillog/35_faillog-l-u_open_range/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/35_faillog-l-u_open_range/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/36_faillog-l-u_range_open/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/36_faillog-l-u_range_open/config/etc/group rename to tests/log/faillog/36_faillog-l-u_range_open/config/etc/group diff --git a/tests/tests/log/faillog/36_faillog-l-u_range_open/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/36_faillog-l-u_range_open/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/37_faillog-l-a-u_user/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/37_faillog-l-a-u_user/config/etc/group rename to tests/log/faillog/37_faillog-l-a-u_user/config/etc/group diff --git a/tests/tests/log/faillog/37_faillog-l-a-u_user/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/37_faillog-l-a-u_user/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/38_faillog-l-a-u_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/38_faillog-l-a-u_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/38_faillog-l-a-u_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/38_faillog-l-a-u_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/39_faillog-l-a-u_open_range/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/39_faillog-l-a-u_open_range/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/39_faillog-l-a-u_open_range/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/39_faillog-l-a-u_open_range/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/40_faillog-l-a-u_range_open/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/40_faillog-l-a-u_range_open/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/40_faillog-l-a-u_range_open/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/40_faillog-l-a-u_range_open/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/41_faillog-l_invalid/config/etc/group b/tests/log/faillog/41_faillog-l_invalid/config/etc/group similarity index 100% rename from tests/tests/log/faillog/41_faillog-l_invalid/config/etc/group rename to tests/log/faillog/41_faillog-l_invalid/config/etc/group diff --git a/tests/tests/log/faillog/41_faillog-l_invalid/config/etc/gshadow b/tests/log/faillog/41_faillog-l_invalid/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/41_faillog-l_invalid/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/42_faillog-m/config/etc/group b/tests/log/faillog/42_faillog-m/config/etc/group similarity index 100% rename from tests/tests/log/faillog/42_faillog-m/config/etc/group rename to tests/log/faillog/42_faillog-m/config/etc/group diff --git a/tests/tests/log/faillog/42_faillog-m/config/etc/gshadow b/tests/log/faillog/42_faillog-m/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/42_faillog-m/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/43_faillog-m-u_user/config/etc/group b/tests/log/faillog/43_faillog-m-u_user/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/43_faillog-m-u_user/config/etc/group diff --git a/tests/tests/log/faillog/43_faillog-m-u_user/config/etc/gshadow b/tests/log/faillog/43_faillog-m-u_user/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/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/44_faillog-m-u_range/config/etc/group b/tests/log/faillog/44_faillog-m-u_range/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/44_faillog-m-u_range/config/etc/group diff --git a/tests/tests/log/faillog/44_faillog-m-u_range/config/etc/gshadow b/tests/log/faillog/44_faillog-m-u_range/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/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/45_faillog-m-u_open_range/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/45_faillog-m-u_open_range/config/etc/group rename to tests/log/faillog/45_faillog-m-u_open_range/config/etc/group diff --git a/tests/tests/log/faillog/45_faillog-m-u_open_range/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/45_faillog-m-u_open_range/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/46_faillog-m-u_range_open/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/46_faillog-m-u_range_open/config/etc/group rename to tests/log/faillog/46_faillog-m-u_range_open/config/etc/group diff --git a/tests/tests/log/faillog/46_faillog-m-u_range_open/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/46_faillog-m-u_range_open/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/47_faillog-m-a-u_user/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/47_faillog-m-a-u_user/config/etc/group rename to tests/log/faillog/47_faillog-m-a-u_user/config/etc/group diff --git a/tests/tests/log/faillog/47_faillog-m-a-u_user/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/47_faillog-m-a-u_user/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/48_faillog-m-a-u_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/48_faillog-m-a-u_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/48_faillog-m-a-u_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/48_faillog-m-a-u_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/49_faillog-m-a-u_open_range/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/49_faillog-m-a-u_open_range/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/49_faillog-m-a-u_open_range/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/49_faillog-m-a-u_open_range/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/50_faillog-m-a-u_range_open/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/50_faillog-m-a-u_range_open/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/50_faillog-m-a-u_range_open/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/50_faillog-m-a-u_range_open/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/51_faillog-m_invalid/config/etc/group b/tests/log/faillog/51_faillog-m_invalid/config/etc/group similarity index 100% rename from tests/tests/log/faillog/51_faillog-m_invalid/config/etc/group rename to tests/log/faillog/51_faillog-m_invalid/config/etc/group diff --git a/tests/tests/log/faillog/51_faillog-m_invalid/config/etc/gshadow b/tests/log/faillog/51_faillog-m_invalid/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/51_faillog-m_invalid/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/52_faillog-t-l_exclusive/config/etc/group b/tests/log/faillog/52_faillog-t-l_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/52_faillog-t-l_exclusive/config/etc/group diff --git a/tests/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/gshadow b/tests/log/faillog/52_faillog-t-l_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/52_faillog-t-l_exclusive/config/etc/gshadow diff --git a/tests/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/passwd b/tests/log/faillog/52_faillog-t-l_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/52_faillog-t-l_exclusive/config/etc/passwd diff --git a/tests/tests/log/faillog/52_faillog-t-l_exclusive/config/etc/shadow b/tests/log/faillog/52_faillog-t-l_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/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/53_faillog-t-m_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/53_faillog-t-m_exclusive/config/etc/group rename to tests/log/faillog/53_faillog-t-m_exclusive/config/etc/group diff --git a/tests/tests/log/faillog/53_faillog-t-m_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/53_faillog-t-m_exclusive/config/etc/gshadow rename to tests/log/faillog/53_faillog-t-m_exclusive/config/etc/gshadow diff --git a/tests/tests/log/faillog/53_faillog-t-m_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/53_faillog-t-m_exclusive/config/etc/passwd rename to tests/log/faillog/53_faillog-t-m_exclusive/config/etc/passwd diff --git a/tests/tests/log/faillog/53_faillog-t-m_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/53_faillog-t-m_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/54_faillog-t-r_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/54_faillog-t-r_exclusive/config/etc/group rename to tests/log/faillog/54_faillog-t-r_exclusive/config/etc/group diff --git a/tests/tests/log/faillog/54_faillog-t-r_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/54_faillog-t-r_exclusive/config/etc/gshadow rename to tests/log/faillog/54_faillog-t-r_exclusive/config/etc/gshadow diff --git a/tests/tests/log/faillog/54_faillog-t-r_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/54_faillog-t-r_exclusive/config/etc/passwd rename to tests/log/faillog/54_faillog-t-r_exclusive/config/etc/passwd diff --git a/tests/tests/log/faillog/54_faillog-t-r_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/54_faillog-t-r_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/55_faillog_no_changes/config/etc/group b/tests/log/faillog/55_faillog_no_changes/config/etc/group similarity index 100% rename from tests/tests/log/faillog/55_faillog_no_changes/config/etc/group rename to tests/log/faillog/55_faillog_no_changes/config/etc/group diff --git a/tests/tests/log/faillog/55_faillog_no_changes/config/etc/gshadow b/tests/log/faillog/55_faillog_no_changes/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/55_faillog_no_changes/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/56_faillog-l-m_empty_file/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/56_faillog-l-m_empty_file/config/etc/group rename to tests/log/faillog/56_faillog-l-m_empty_file/config/etc/group diff --git a/tests/tests/log/faillog/56_faillog-l-m_empty_file/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/56_faillog-l-m_empty_file/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/57_faillog-r_empty_file/config/etc/group b/tests/log/faillog/57_faillog-r_empty_file/config/etc/group similarity index 100% rename from tests/tests/log/faillog/57_faillog-r_empty_file/config/etc/group rename to tests/log/faillog/57_faillog-r_empty_file/config/etc/group diff --git a/tests/tests/log/faillog/57_faillog-r_empty_file/config/etc/gshadow b/tests/log/faillog/57_faillog-r_empty_file/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/57_faillog-r_empty_file/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/58_faillog-l_no_failcount/config/etc/group b/tests/log/faillog/58_faillog-l_no_failcount/config/etc/group similarity index 100% rename from tests/tests/log/faillog/58_faillog-l_no_failcount/config/etc/group rename to tests/log/faillog/58_faillog-l_no_failcount/config/etc/group diff --git a/tests/tests/log/faillog/58_faillog-l_no_failcount/config/etc/gshadow b/tests/log/faillog/58_faillog-l_no_failcount/config/etc/gshadow similarity index 100% rename from tests/tests/log/faillog/58_faillog-l_no_failcount/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/lastlog/01_lastlog_no_lastlog/config/etc/group b/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/group similarity index 100% rename from tests/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/group rename to tests/log/lastlog/01_lastlog_no_lastlog/config/etc/group diff --git a/tests/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/gshadow b/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/gshadow similarity index 100% rename from tests/tests/log/lastlog/01_lastlog_no_lastlog/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/log/lastlog/01_lastlog_no_lastlog/config/etc/shadow b/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/shadow similarity index 100% rename from tests/tests/log/lastlog/01_lastlog_no_lastlog/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/lastlog/02_lastlog_usage/config/etc/group b/tests/log/lastlog/02_lastlog_usage/config/etc/group similarity index 100% rename from tests/tests/log/lastlog/02_lastlog_usage/config/etc/group rename to tests/log/lastlog/02_lastlog_usage/config/etc/group diff --git a/tests/tests/log/lastlog/02_lastlog_usage/config/etc/gshadow b/tests/log/lastlog/02_lastlog_usage/config/etc/gshadow similarity index 100% rename from tests/tests/log/lastlog/02_lastlog_usage/config/etc/gshadow rename to tests/log/lastlog/02_lastlog_usage/config/etc/gshadow diff --git a/tests/tests/log/lastlog/02_lastlog_usage/config/etc/passwd b/tests/log/lastlog/02_lastlog_usage/config/etc/passwd similarity index 100% rename from tests/tests/log/lastlog/02_lastlog_usage/config/etc/passwd rename to tests/log/lastlog/02_lastlog_usage/config/etc/passwd diff --git a/tests/tests/log/lastlog/02_lastlog_usage/config/etc/shadow b/tests/log/lastlog/02_lastlog_usage/config/etc/shadow similarity index 100% rename from tests/tests/log/lastlog/02_lastlog_usage/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/lastlog/03_lastlog_format/config/etc/group b/tests/log/lastlog/03_lastlog_format/config/etc/group similarity index 100% rename from tests/tests/log/lastlog/03_lastlog_format/config/etc/group rename to tests/log/lastlog/03_lastlog_format/config/etc/group diff --git a/tests/tests/log/lastlog/03_lastlog_format/config/etc/gshadow b/tests/log/lastlog/03_lastlog_format/config/etc/gshadow similarity index 100% rename from tests/tests/log/lastlog/03_lastlog_format/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/log/lastlog/03_lastlog_format/config/etc/shadow b/tests/log/lastlog/03_lastlog_format/config/etc/shadow similarity index 100% rename from tests/tests/log/lastlog/03_lastlog_format/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/lastlog/04_lastlog_multiple/config/etc/group b/tests/log/lastlog/04_lastlog_multiple/config/etc/group similarity index 100% rename from tests/tests/log/lastlog/04_lastlog_multiple/config/etc/group rename to tests/log/lastlog/04_lastlog_multiple/config/etc/group diff --git a/tests/tests/log/lastlog/04_lastlog_multiple/config/etc/gshadow b/tests/log/lastlog/04_lastlog_multiple/config/etc/gshadow similarity index 100% rename from tests/tests/log/lastlog/04_lastlog_multiple/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/05_lastlog-u_ID/config/etc/group b/tests/log/lastlog/05_lastlog-u_ID/config/etc/group similarity index 100% rename from tests/tests/log/lastlog/05_lastlog-u_ID/config/etc/group rename to tests/log/lastlog/05_lastlog-u_ID/config/etc/group diff --git a/tests/tests/log/lastlog/05_lastlog-u_ID/config/etc/gshadow b/tests/log/lastlog/05_lastlog-u_ID/config/etc/gshadow similarity index 100% rename from tests/tests/log/lastlog/05_lastlog-u_ID/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/06_lastlog-u_name/config/etc/group b/tests/log/lastlog/06_lastlog-u_name/config/etc/group similarity index 100% rename from tests/tests/log/lastlog/06_lastlog-u_name/config/etc/group rename to tests/log/lastlog/06_lastlog-u_name/config/etc/group diff --git a/tests/tests/log/lastlog/06_lastlog-u_name/config/etc/gshadow b/tests/log/lastlog/06_lastlog-u_name/config/etc/gshadow similarity index 100% rename from tests/tests/log/lastlog/06_lastlog-u_name/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/07_lastlog-u_ID_invalid/config/etc/group b/tests/log/lastlog/07_lastlog-u_ID_invalid/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/07_lastlog-u_ID_invalid/config/etc/group diff --git a/tests/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/gshadow b/tests/log/lastlog/07_lastlog-u_ID_invalid/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/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/08_lastlog-u_name_invalid/config/etc/group b/tests/log/lastlog/08_lastlog-u_name_invalid/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/08_lastlog-u_name_invalid/config/etc/group diff --git a/tests/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/gshadow b/tests/log/lastlog/08_lastlog-u_name_invalid/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/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/09_lastlog-u_range/config/etc/group b/tests/log/lastlog/09_lastlog-u_range/config/etc/group similarity index 100% rename from tests/tests/log/lastlog/09_lastlog-u_range/config/etc/group rename to tests/log/lastlog/09_lastlog-u_range/config/etc/group diff --git a/tests/tests/log/lastlog/09_lastlog-u_range/config/etc/gshadow b/tests/log/lastlog/09_lastlog-u_range/config/etc/gshadow similarity index 100% rename from tests/tests/log/lastlog/09_lastlog-u_range/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/10_lastlog-u_open_range/config/etc/group b/tests/log/lastlog/10_lastlog-u_open_range/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/10_lastlog-u_open_range/config/etc/group diff --git a/tests/tests/log/lastlog/10_lastlog-u_open_range/config/etc/gshadow b/tests/log/lastlog/10_lastlog-u_open_range/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/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/11_lastlog-u_range_open/config/etc/group b/tests/log/lastlog/11_lastlog-u_range_open/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/11_lastlog-u_range_open/config/etc/group diff --git a/tests/tests/log/lastlog/11_lastlog-u_range_open/config/etc/gshadow b/tests/log/lastlog/11_lastlog-u_range_open/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/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/12_lastlog-u_range_invalid1/config/etc/group b/tests/log/lastlog/12_lastlog-u_range_invalid1/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/12_lastlog-u_range_invalid1/config/etc/group diff --git a/tests/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/gshadow b/tests/log/lastlog/12_lastlog-u_range_invalid1/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/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/13_lastlog-u_range_invalid2/config/etc/group b/tests/log/lastlog/13_lastlog-u_range_invalid2/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/13_lastlog-u_range_invalid2/config/etc/group diff --git a/tests/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/gshadow b/tests/log/lastlog/13_lastlog-u_range_invalid2/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/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/14_lastlog-u_range_invalid3/config/etc/group b/tests/log/lastlog/14_lastlog-u_range_invalid3/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/14_lastlog-u_range_invalid3/config/etc/group diff --git a/tests/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/gshadow b/tests/log/lastlog/14_lastlog-u_range_invalid3/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/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/15_lastlog_bad_option/config/etc/group b/tests/log/lastlog/15_lastlog_bad_option/config/etc/group similarity index 100% rename from tests/tests/log/lastlog/15_lastlog_bad_option/config/etc/group rename to tests/log/lastlog/15_lastlog_bad_option/config/etc/group diff --git a/tests/tests/log/lastlog/15_lastlog_bad_option/config/etc/gshadow b/tests/log/lastlog/15_lastlog_bad_option/config/etc/gshadow similarity index 100% rename from tests/tests/log/lastlog/15_lastlog_bad_option/config/etc/gshadow rename to tests/log/lastlog/15_lastlog_bad_option/config/etc/gshadow diff --git a/tests/tests/log/lastlog/15_lastlog_bad_option/config/etc/passwd b/tests/log/lastlog/15_lastlog_bad_option/config/etc/passwd similarity index 100% rename from tests/tests/log/lastlog/15_lastlog_bad_option/config/etc/passwd rename to tests/log/lastlog/15_lastlog_bad_option/config/etc/passwd diff --git a/tests/tests/log/lastlog/15_lastlog_bad_option/config/etc/shadow b/tests/log/lastlog/15_lastlog_bad_option/config/etc/shadow similarity index 100% rename from tests/tests/log/lastlog/15_lastlog_bad_option/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/16_lastlog_extra_arg/config/etc/group b/tests/log/lastlog/16_lastlog_extra_arg/config/etc/group similarity index 100% rename from tests/tests/log/lastlog/16_lastlog_extra_arg/config/etc/group rename to tests/log/lastlog/16_lastlog_extra_arg/config/etc/group diff --git a/tests/tests/log/lastlog/16_lastlog_extra_arg/config/etc/gshadow b/tests/log/lastlog/16_lastlog_extra_arg/config/etc/gshadow similarity index 100% rename from tests/tests/log/lastlog/16_lastlog_extra_arg/config/etc/gshadow rename to tests/log/lastlog/16_lastlog_extra_arg/config/etc/gshadow diff --git a/tests/tests/log/lastlog/16_lastlog_extra_arg/config/etc/passwd b/tests/log/lastlog/16_lastlog_extra_arg/config/etc/passwd similarity index 100% rename from tests/tests/log/lastlog/16_lastlog_extra_arg/config/etc/passwd rename to tests/log/lastlog/16_lastlog_extra_arg/config/etc/passwd diff --git a/tests/tests/log/lastlog/16_lastlog_extra_arg/config/etc/shadow b/tests/log/lastlog/16_lastlog_extra_arg/config/etc/shadow similarity index 100% rename from tests/tests/log/lastlog/16_lastlog_extra_arg/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/17_lastlog-t/config/etc/group b/tests/log/lastlog/17_lastlog-t/config/etc/group similarity index 100% rename from tests/tests/log/lastlog/17_lastlog-t/config/etc/group rename to tests/log/lastlog/17_lastlog-t/config/etc/group diff --git a/tests/tests/log/lastlog/17_lastlog-t/config/etc/gshadow b/tests/log/lastlog/17_lastlog-t/config/etc/gshadow similarity index 100% rename from tests/tests/log/lastlog/17_lastlog-t/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/18_lastlog-b/config/etc/group b/tests/log/lastlog/18_lastlog-b/config/etc/group similarity index 100% rename from tests/tests/log/lastlog/18_lastlog-b/config/etc/group rename to tests/log/lastlog/18_lastlog-b/config/etc/group diff --git a/tests/tests/log/lastlog/18_lastlog-b/config/etc/gshadow b/tests/log/lastlog/18_lastlog-b/config/etc/gshadow similarity index 100% rename from tests/tests/log/lastlog/18_lastlog-b/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/19_lastlog-t_invalid/config/etc/group b/tests/log/lastlog/19_lastlog-t_invalid/config/etc/group similarity index 100% rename from tests/tests/log/lastlog/19_lastlog-t_invalid/config/etc/group rename to tests/log/lastlog/19_lastlog-t_invalid/config/etc/group diff --git a/tests/tests/log/lastlog/19_lastlog-t_invalid/config/etc/gshadow b/tests/log/lastlog/19_lastlog-t_invalid/config/etc/gshadow similarity index 100% rename from tests/tests/log/lastlog/19_lastlog-t_invalid/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/20_lastlog-b_invalid/config/etc/group b/tests/log/lastlog/20_lastlog-b_invalid/config/etc/group similarity index 100% rename from tests/tests/log/lastlog/20_lastlog-b_invalid/config/etc/group rename to tests/log/lastlog/20_lastlog-b_invalid/config/etc/group diff --git a/tests/tests/log/lastlog/20_lastlog-b_invalid/config/etc/gshadow b/tests/log/lastlog/20_lastlog-b_invalid/config/etc/gshadow similarity index 100% rename from tests/tests/log/lastlog/20_lastlog-b_invalid/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/login/01_login_prompt/config/etc/group b/tests/login/01_login_prompt/config/etc/group similarity index 100% rename from tests/tests/login/01_login_prompt/config/etc/group rename to tests/login/01_login_prompt/config/etc/group diff --git a/tests/tests/login/01_login_prompt/config/etc/gshadow b/tests/login/01_login_prompt/config/etc/gshadow similarity index 100% rename from tests/tests/login/01_login_prompt/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/02_login_user/config/etc/group b/tests/login/02_login_user/config/etc/group similarity index 100% rename from tests/tests/login/02_login_user/config/etc/group rename to tests/login/02_login_user/config/etc/group diff --git a/tests/tests/login/02_login_user/config/etc/gshadow b/tests/login/02_login_user/config/etc/gshadow similarity index 100% rename from tests/tests/login/02_login_user/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/03_login_check_tty/config/etc/group b/tests/login/03_login_check_tty/config/etc/group similarity index 100% rename from tests/tests/login/03_login_check_tty/config/etc/group rename to tests/login/03_login_check_tty/config/etc/group diff --git a/tests/tests/login/03_login_check_tty/config/etc/gshadow b/tests/login/03_login_check_tty/config/etc/gshadow similarity index 100% rename from tests/tests/login/03_login_check_tty/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/newgidmap/01_newgidmap/config.txt b/tests/newgidmap/01_newgidmap/config.txt similarity index 100% rename from tests/tests/newgidmap/01_newgidmap/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/newgidmap/02_newgidmap_relaxed_gid_check/config.txt b/tests/newgidmap/02_newgidmap_relaxed_gid_check/config.txt similarity index 100% rename from tests/tests/newgidmap/02_newgidmap_relaxed_gid_check/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/newuidmap/01_newuidmap/config.txt b/tests/newuidmap/01_newuidmap/config.txt similarity index 100% rename from tests/tests/newuidmap/01_newuidmap/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/newuidmap/02_newuidmap_relaxed_gid_check/config.txt b/tests/newuidmap/02_newuidmap_relaxed_gid_check/config.txt similarity index 100% rename from tests/tests/newuidmap/02_newuidmap_relaxed_gid_check/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/newusers/01_create_user/config.txt b/tests/newusers/01_create_user/config.txt similarity index 100% rename from tests/tests/newusers/01_create_user/config.txt rename to tests/newusers/01_create_user/config.txt diff --git a/tests/tests/newusers/01_create_user/config/etc/group b/tests/newusers/01_create_user/config/etc/group similarity index 100% rename from tests/tests/newusers/01_create_user/config/etc/group rename to tests/newusers/01_create_user/config/etc/group diff --git a/tests/tests/newusers/01_create_user/config/etc/gshadow b/tests/newusers/01_create_user/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/01_create_user/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/newusers/01_create_user/config/etc/passwd b/tests/newusers/01_create_user/config/etc/passwd similarity index 100% rename from tests/tests/newusers/01_create_user/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/newusers/01_create_user/data/group b/tests/newusers/01_create_user/data/group similarity index 100% rename from tests/tests/newusers/01_create_user/data/group rename to tests/newusers/01_create_user/data/group diff --git a/tests/tests/newusers/01_create_user/data/gshadow b/tests/newusers/01_create_user/data/gshadow similarity index 100% rename from tests/tests/newusers/01_create_user/data/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/02_update_password/config/etc/gshadow b/tests/newusers/02_update_password/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/02_update_password/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/03_no_update_pid/config/etc/gshadow b/tests/newusers/03_no_update_pid/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/03_no_update_pid/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/04_no_update_gid/config/etc/gshadow b/tests/newusers/04_no_update_gid/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/04_no_update_gid/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/newusers/05_create_user_pid/config.txt b/tests/newusers/05_create_user_pid/config.txt similarity index 100% rename from tests/tests/newusers/05_create_user_pid/config.txt rename to tests/newusers/05_create_user_pid/config.txt diff --git a/tests/tests/newusers/05_create_user_pid/config/etc/group b/tests/newusers/05_create_user_pid/config/etc/group similarity index 100% rename from tests/tests/newusers/05_create_user_pid/config/etc/group rename to tests/newusers/05_create_user_pid/config/etc/group diff --git a/tests/tests/newusers/05_create_user_pid/config/etc/gshadow b/tests/newusers/05_create_user_pid/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/05_create_user_pid/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/05_create_user_pid/config/etc/passwd b/tests/newusers/05_create_user_pid/config/etc/passwd similarity index 100% rename from tests/tests/newusers/05_create_user_pid/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/newusers/05_create_user_pid/data/gshadow b/tests/newusers/05_create_user_pid/data/gshadow similarity index 100% rename from tests/tests/newusers/05_create_user_pid/data/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/newusers/06_create_user_gid/config.txt b/tests/newusers/06_create_user_gid/config.txt similarity index 100% rename from tests/tests/newusers/06_create_user_gid/config.txt rename to tests/newusers/06_create_user_gid/config.txt diff --git a/tests/tests/newusers/06_create_user_gid/config/etc/group b/tests/newusers/06_create_user_gid/config/etc/group similarity index 100% rename from tests/tests/newusers/06_create_user_gid/config/etc/group rename to tests/newusers/06_create_user_gid/config/etc/group diff --git a/tests/tests/newusers/06_create_user_gid/config/etc/gshadow b/tests/newusers/06_create_user_gid/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/06_create_user_gid/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/06_create_user_gid/config/etc/passwd b/tests/newusers/06_create_user_gid/config/etc/passwd similarity index 100% rename from tests/tests/newusers/06_create_user_gid/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/newusers/06_create_user_gid/data/gshadow b/tests/newusers/06_create_user_gid/data/gshadow similarity index 100% rename from tests/tests/newusers/06_create_user_gid/data/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/newusers/07_create_user_pid_gid/config.txt b/tests/newusers/07_create_user_pid_gid/config.txt similarity index 100% rename from tests/tests/newusers/07_create_user_pid_gid/config.txt rename to tests/newusers/07_create_user_pid_gid/config.txt diff --git a/tests/tests/newusers/07_create_user_pid_gid/config/etc/group b/tests/newusers/07_create_user_pid_gid/config/etc/group similarity index 100% rename from tests/tests/newusers/07_create_user_pid_gid/config/etc/group rename to tests/newusers/07_create_user_pid_gid/config/etc/group diff --git a/tests/tests/newusers/07_create_user_pid_gid/config/etc/gshadow b/tests/newusers/07_create_user_pid_gid/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/07_create_user_pid_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/07_create_user_pid_gid/config/etc/passwd b/tests/newusers/07_create_user_pid_gid/config/etc/passwd similarity index 100% rename from tests/tests/newusers/07_create_user_pid_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/07_create_user_pid_gid/data/gshadow b/tests/newusers/07_create_user_pid_gid/data/gshadow similarity index 100% rename from tests/tests/newusers/07_create_user_pid_gid/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/newusers/08_create_user_pid_other-gid/config.txt b/tests/newusers/08_create_user_pid_other-gid/config.txt similarity index 100% rename from tests/tests/newusers/08_create_user_pid_other-gid/config.txt rename to tests/newusers/08_create_user_pid_other-gid/config.txt diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/config/etc/group b/tests/newusers/08_create_user_pid_other-gid/config/etc/group similarity index 100% rename from tests/tests/newusers/08_create_user_pid_other-gid/config/etc/group rename to tests/newusers/08_create_user_pid_other-gid/config/etc/group diff --git a/tests/tests/newusers/08_create_user_pid_other-gid/config/etc/gshadow b/tests/newusers/08_create_user_pid_other-gid/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/08_create_user_pid_other-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/08_create_user_pid_other-gid/config/etc/passwd b/tests/newusers/08_create_user_pid_other-gid/config/etc/passwd similarity index 100% rename from tests/tests/newusers/08_create_user_pid_other-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/08_create_user_pid_other-gid/data/gshadow b/tests/newusers/08_create_user_pid_other-gid/data/gshadow similarity index 100% rename from tests/tests/newusers/08_create_user_pid_other-gid/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/newusers/09_create_user_pid-as-user-bar/config.txt b/tests/newusers/09_create_user_pid-as-user-bar/config.txt similarity index 100% rename from tests/tests/newusers/09_create_user_pid-as-user-bar/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/newusers/10_create_user_gid-as-group-bar/config.txt b/tests/newusers/10_create_user_gid-as-group-bar/config.txt similarity index 100% rename from tests/tests/newusers/10_create_user_gid-as-group-bar/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/11_update_gecos/config/etc/gshadow b/tests/newusers/11_update_gecos/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/11_update_gecos/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/12_update_shell/config/etc/gshadow b/tests/newusers/12_update_shell/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/12_update_shell/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/newusers/13_create_user_new-home/config.txt b/tests/newusers/13_create_user_new-home/config.txt similarity index 100% rename from tests/tests/newusers/13_create_user_new-home/config.txt rename to tests/newusers/13_create_user_new-home/config.txt diff --git a/tests/tests/newusers/13_create_user_new-home/config/etc/group b/tests/newusers/13_create_user_new-home/config/etc/group similarity index 100% rename from tests/tests/newusers/13_create_user_new-home/config/etc/group rename to tests/newusers/13_create_user_new-home/config/etc/group diff --git a/tests/tests/newusers/13_create_user_new-home/config/etc/gshadow b/tests/newusers/13_create_user_new-home/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/13_create_user_new-home/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/13_create_user_new-home/config/etc/passwd b/tests/newusers/13_create_user_new-home/config/etc/passwd similarity index 100% rename from tests/tests/newusers/13_create_user_new-home/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/newusers/13_create_user_new-home/data/group b/tests/newusers/13_create_user_new-home/data/group similarity index 100% rename from tests/tests/newusers/13_create_user_new-home/data/group rename to tests/newusers/13_create_user_new-home/data/group diff --git a/tests/tests/newusers/13_create_user_new-home/data/gshadow b/tests/newusers/13_create_user_new-home/data/gshadow similarity index 100% rename from tests/tests/newusers/13_create_user_new-home/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/newusers/14_create_user_existing-home/config.txt b/tests/newusers/14_create_user_existing-home/config.txt similarity index 100% rename from tests/tests/newusers/14_create_user_existing-home/config.txt rename to tests/newusers/14_create_user_existing-home/config.txt diff --git a/tests/tests/newusers/14_create_user_existing-home/config/etc/group b/tests/newusers/14_create_user_existing-home/config/etc/group similarity index 100% rename from tests/tests/newusers/14_create_user_existing-home/config/etc/group rename to tests/newusers/14_create_user_existing-home/config/etc/group diff --git a/tests/tests/newusers/14_create_user_existing-home/config/etc/gshadow b/tests/newusers/14_create_user_existing-home/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/14_create_user_existing-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/14_create_user_existing-home/config/etc/passwd b/tests/newusers/14_create_user_existing-home/config/etc/passwd similarity index 100% rename from tests/tests/newusers/14_create_user_existing-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/newusers/14_create_user_existing-home/data/group b/tests/newusers/14_create_user_existing-home/data/group similarity index 100% rename from tests/tests/newusers/14_create_user_existing-home/data/group rename to tests/newusers/14_create_user_existing-home/data/group diff --git a/tests/tests/newusers/14_create_user_existing-home/data/gshadow b/tests/newusers/14_create_user_existing-home/data/gshadow similarity index 100% rename from tests/tests/newusers/14_create_user_existing-home/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/15_update_new-home/config/etc/gshadow b/tests/newusers/15_update_new-home/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/15_update_new-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/16_update_existing-home/config/etc/gshadow b/tests/newusers/16_update_existing-home/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/16_update_existing-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/newusers/17_create_user_pid-already-used/config.txt b/tests/newusers/17_create_user_pid-already-used/config.txt similarity index 100% rename from tests/tests/newusers/17_create_user_pid-already-used/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/newusers/18_create_user_gid-already-used/config.txt b/tests/newusers/18_create_user_gid-already-used/config.txt similarity index 100% rename from tests/tests/newusers/18_create_user_gid-already-used/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/19_update_keep-old-home/config/etc/gshadow b/tests/newusers/19_update_keep-old-home/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/19_update_keep-old-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/20_multiple_users/config/etc/gshadow b/tests/newusers/20_multiple_users/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/20_multiple_users/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/21_create_user_UID_MAX/config.txt b/tests/newusers/21_create_user_UID_MAX/config.txt similarity index 100% rename from tests/tests/newusers/21_create_user_UID_MAX/config.txt rename to tests/newusers/21_create_user_UID_MAX/config.txt diff --git a/tests/tests/newusers/21_create_user_UID_MAX/config/etc/group b/tests/newusers/21_create_user_UID_MAX/config/etc/group similarity index 100% rename from tests/tests/newusers/21_create_user_UID_MAX/config/etc/group rename to tests/newusers/21_create_user_UID_MAX/config/etc/group diff --git a/tests/tests/newusers/21_create_user_UID_MAX/config/etc/gshadow b/tests/newusers/21_create_user_UID_MAX/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/21_create_user_UID_MAX/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/21_create_user_UID_MAX/config/etc/passwd b/tests/newusers/21_create_user_UID_MAX/config/etc/passwd similarity index 100% rename from tests/tests/newusers/21_create_user_UID_MAX/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/22_create_user_GID_MAX/config.txt b/tests/newusers/22_create_user_GID_MAX/config.txt similarity index 100% rename from tests/tests/newusers/22_create_user_GID_MAX/config.txt rename to tests/newusers/22_create_user_GID_MAX/config.txt diff --git a/tests/tests/newusers/22_create_user_GID_MAX/config/etc/group b/tests/newusers/22_create_user_GID_MAX/config/etc/group similarity index 100% rename from tests/tests/newusers/22_create_user_GID_MAX/config/etc/group rename to tests/newusers/22_create_user_GID_MAX/config/etc/group diff --git a/tests/tests/newusers/22_create_user_GID_MAX/config/etc/gshadow b/tests/newusers/22_create_user_GID_MAX/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/22_create_user_GID_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/22_create_user_GID_MAX/config/etc/passwd b/tests/newusers/22_create_user_GID_MAX/config/etc/passwd similarity index 100% rename from tests/tests/newusers/22_create_user_GID_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/23_create_user_error_negative_UID/config.txt b/tests/newusers/23_create_user_error_negative_UID/config.txt similarity index 100% rename from tests/tests/newusers/23_create_user_error_negative_UID/config.txt rename to tests/newusers/23_create_user_error_negative_UID/config.txt diff --git a/tests/tests/newusers/23_create_user_error_negative_UID/config/etc/group b/tests/newusers/23_create_user_error_negative_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/23_create_user_error_negative_UID/config/etc/group diff --git a/tests/tests/newusers/23_create_user_error_negative_UID/config/etc/gshadow b/tests/newusers/23_create_user_error_negative_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/23_create_user_error_negative_UID/config/etc/gshadow diff --git a/tests/tests/newusers/23_create_user_error_negative_UID/config/etc/passwd b/tests/newusers/23_create_user_error_negative_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/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/24_create_user_error_invalid_UID/config.txt b/tests/newusers/24_create_user_error_invalid_UID/config.txt similarity index 100% rename from tests/tests/newusers/24_create_user_error_invalid_UID/config.txt rename to tests/newusers/24_create_user_error_invalid_UID/config.txt diff --git a/tests/tests/newusers/24_create_user_error_invalid_UID/config/etc/group b/tests/newusers/24_create_user_error_invalid_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/24_create_user_error_invalid_UID/config/etc/group diff --git a/tests/tests/newusers/24_create_user_error_invalid_UID/config/etc/gshadow b/tests/newusers/24_create_user_error_invalid_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/24_create_user_error_invalid_UID/config/etc/gshadow diff --git a/tests/tests/newusers/24_create_user_error_invalid_UID/config/etc/passwd b/tests/newusers/24_create_user_error_invalid_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/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/25_create_user_error_no_remaining_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/25_create_user_error_no_remaining_UID/config/etc/group rename to tests/newusers/25_create_user_error_no_remaining_UID/config/etc/group diff --git a/tests/tests/newusers/25_create_user_error_no_remaining_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/25_create_user_error_no_remaining_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/25_create_user_error_no_remaining_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/25_create_user_error_no_remaining_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/26_create_user_error_no_remaining_GID/config/etc/group b/tests/newusers/26_create_user_error_no_remaining_GID/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/26_create_user_error_no_remaining_GID/config/etc/group diff --git a/tests/tests/newusers/26_create_user_error_no_remaining_GID/config/etc/gshadow b/tests/newusers/26_create_user_error_no_remaining_GID/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/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/26_create_user_error_no_remaining_GID/config/etc/passwd b/tests/newusers/26_create_user_error_no_remaining_GID/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/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/27_create_user_error_invalid_username/config.txt b/tests/newusers/27_create_user_error_invalid_username/config.txt similarity index 100% rename from tests/tests/newusers/27_create_user_error_invalid_username/config.txt rename to tests/newusers/27_create_user_error_invalid_username/config.txt diff --git a/tests/tests/newusers/27_create_user_error_invalid_username/config/etc/group b/tests/newusers/27_create_user_error_invalid_username/config/etc/group similarity index 100% rename from tests/tests/newusers/27_create_user_error_invalid_username/config/etc/group rename to tests/newusers/27_create_user_error_invalid_username/config/etc/group diff --git a/tests/tests/newusers/27_create_user_error_invalid_username/config/etc/gshadow b/tests/newusers/27_create_user_error_invalid_username/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/27_create_user_error_invalid_username/config/etc/gshadow rename to tests/newusers/27_create_user_error_invalid_username/config/etc/gshadow diff --git a/tests/tests/newusers/27_create_user_error_invalid_username/config/etc/passwd b/tests/newusers/27_create_user_error_invalid_username/config/etc/passwd similarity index 100% rename from tests/tests/newusers/27_create_user_error_invalid_username/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/28_create_user_error_invalid_groupname/config.txt b/tests/newusers/28_create_user_error_invalid_groupname/config.txt similarity index 100% rename from tests/tests/newusers/28_create_user_error_invalid_groupname/config.txt rename to tests/newusers/28_create_user_error_invalid_groupname/config.txt diff --git a/tests/tests/newusers/28_create_user_error_invalid_groupname/config/etc/group b/tests/newusers/28_create_user_error_invalid_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/28_create_user_error_invalid_groupname/config/etc/group diff --git a/tests/tests/newusers/28_create_user_error_invalid_groupname/config/etc/gshadow b/tests/newusers/28_create_user_error_invalid_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/28_create_user_error_invalid_groupname/config/etc/gshadow diff --git a/tests/tests/newusers/28_create_user_error_invalid_groupname/config/etc/passwd b/tests/newusers/28_create_user_error_invalid_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/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/29_create_user_error_invalid_username_valid_groupname/config.txt b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config.txt similarity index 100% rename from tests/tests/newusers/29_create_user_error_invalid_username_valid_groupname/config.txt rename to tests/newusers/29_create_user_error_invalid_username_valid_groupname/config.txt diff --git a/tests/tests/newusers/29_create_user_error_invalid_username_valid_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/29_create_user_error_invalid_username_valid_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/29_create_user_error_invalid_username_valid_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/29_create_user_error_invalid_username_valid_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/29_create_user_error_invalid_username_valid_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/29_create_user_error_invalid_username_valid_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/30_create_user_different_groupname/config.txt b/tests/newusers/30_create_user_different_groupname/config.txt similarity index 100% rename from tests/tests/newusers/30_create_user_different_groupname/config.txt rename to tests/newusers/30_create_user_different_groupname/config.txt diff --git a/tests/tests/newusers/30_create_user_different_groupname/config/etc/group b/tests/newusers/30_create_user_different_groupname/config/etc/group similarity index 100% rename from tests/tests/newusers/30_create_user_different_groupname/config/etc/group rename to tests/newusers/30_create_user_different_groupname/config/etc/group diff --git a/tests/tests/newusers/30_create_user_different_groupname/config/etc/gshadow b/tests/newusers/30_create_user_different_groupname/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/30_create_user_different_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/30_create_user_different_groupname/config/etc/passwd b/tests/newusers/30_create_user_different_groupname/config/etc/passwd similarity index 100% rename from tests/tests/newusers/30_create_user_different_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/31_create_user_error_invalid_GID/config.txt b/tests/newusers/31_create_user_error_invalid_GID/config.txt similarity index 100% rename from tests/tests/newusers/31_create_user_error_invalid_GID/config.txt rename to tests/newusers/31_create_user_error_invalid_GID/config.txt diff --git a/tests/tests/newusers/31_create_user_error_invalid_GID/config/etc/group b/tests/newusers/31_create_user_error_invalid_GID/config/etc/group similarity index 100% rename from tests/tests/newusers/31_create_user_error_invalid_GID/config/etc/group rename to tests/newusers/31_create_user_error_invalid_GID/config/etc/group diff --git a/tests/tests/newusers/31_create_user_error_invalid_GID/config/etc/gshadow b/tests/newusers/31_create_user_error_invalid_GID/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/31_create_user_error_invalid_GID/config/etc/gshadow rename to tests/newusers/31_create_user_error_invalid_GID/config/etc/gshadow diff --git a/tests/tests/newusers/31_create_user_error_invalid_GID/config/etc/passwd b/tests/newusers/31_create_user_error_invalid_GID/config/etc/passwd similarity index 100% rename from tests/tests/newusers/31_create_user_error_invalid_GID/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/32_create_user_error_gshadow_group_exists/config/etc/group b/tests/newusers/32_create_user_error_gshadow_group_exists/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/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/32_create_user_error_gshadow_group_exists/config/etc/passwd b/tests/newusers/32_create_user_error_gshadow_group_exists/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/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/33_update_password_no_shadow_password/config/etc/gshadow b/tests/newusers/33_update_password_no_shadow_password/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/33_update_password_no_shadow_password/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/34_update_password_no_shadow/config/etc/gshadow b/tests/newusers/34_update_password_no_shadow/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/34_update_password_no_shadow/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/35_read_from_stdin/config.txt b/tests/newusers/35_read_from_stdin/config.txt similarity index 100% rename from tests/tests/newusers/35_read_from_stdin/config.txt rename to tests/newusers/35_read_from_stdin/config.txt diff --git a/tests/tests/newusers/35_read_from_stdin/config/etc/group b/tests/newusers/35_read_from_stdin/config/etc/group similarity index 100% rename from tests/tests/newusers/35_read_from_stdin/config/etc/group rename to tests/newusers/35_read_from_stdin/config/etc/group diff --git a/tests/tests/newusers/35_read_from_stdin/config/etc/gshadow b/tests/newusers/35_read_from_stdin/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/35_read_from_stdin/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/35_read_from_stdin/config/etc/passwd b/tests/newusers/35_read_from_stdin/config/etc/passwd similarity index 100% rename from tests/tests/newusers/35_read_from_stdin/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/36_create_user_encrypted/config.txt b/tests/newusers/36_create_user_encrypted/config.txt similarity index 100% rename from tests/tests/newusers/36_create_user_encrypted/config.txt rename to tests/newusers/36_create_user_encrypted/config.txt diff --git a/tests/tests/newusers/36_create_user_encrypted/config/etc/group b/tests/newusers/36_create_user_encrypted/config/etc/group similarity index 100% rename from tests/tests/newusers/36_create_user_encrypted/config/etc/group rename to tests/newusers/36_create_user_encrypted/config/etc/group diff --git a/tests/tests/newusers/36_create_user_encrypted/config/etc/gshadow b/tests/newusers/36_create_user_encrypted/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/36_create_user_encrypted/config/etc/gshadow rename to tests/newusers/36_create_user_encrypted/config/etc/gshadow diff --git a/tests/tests/newusers/36_create_user_encrypted/config/etc/passwd b/tests/newusers/36_create_user_encrypted/config/etc/passwd similarity index 100% rename from tests/tests/newusers/36_create_user_encrypted/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/36_create_user_encrypted/data/group b/tests/newusers/36_create_user_encrypted/data/group similarity index 100% rename from tests/tests/newusers/36_create_user_encrypted/data/group rename to tests/newusers/36_create_user_encrypted/data/group diff --git a/tests/tests/newusers/36_create_user_encrypted/data/gshadow b/tests/newusers/36_create_user_encrypted/data/gshadow similarity index 100% rename from tests/tests/newusers/36_create_user_encrypted/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/37_create_user_encrypt_MD5-PAM/config.txt b/tests/newusers/37_create_user_encrypt_MD5-PAM/config.txt similarity index 100% rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/config.txt rename to tests/newusers/37_create_user_encrypt_MD5-PAM/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-PAM/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-PAM/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-PAM/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-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/37_create_user_encrypt_MD5-PAM/config/etc/passwd b/tests/newusers/37_create_user_encrypt_MD5-PAM/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-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/37_create_user_encrypt_MD5-PAM/data/group b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/group similarity index 100% rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/data/group rename to tests/newusers/37_create_user_encrypt_MD5-PAM/data/group diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5-PAM/data/gshadow b/tests/newusers/37_create_user_encrypt_MD5-PAM/data/gshadow similarity index 100% rename from tests/tests/newusers/37_create_user_encrypt_MD5-PAM/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/37_create_user_encrypt_MD5/config.txt b/tests/newusers/37_create_user_encrypt_MD5/config.txt similarity index 100% rename from tests/tests/newusers/37_create_user_encrypt_MD5/config.txt rename to tests/newusers/37_create_user_encrypt_MD5/config.txt diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5/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/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/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/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/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/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/37_create_user_encrypt_MD5/data/group b/tests/newusers/37_create_user_encrypt_MD5/data/group similarity index 100% rename from tests/tests/newusers/37_create_user_encrypt_MD5/data/group rename to tests/newusers/37_create_user_encrypt_MD5/data/group diff --git a/tests/tests/newusers/37_create_user_encrypt_MD5/data/gshadow b/tests/newusers/37_create_user_encrypt_MD5/data/gshadow similarity index 100% rename from tests/tests/newusers/37_create_user_encrypt_MD5/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/38_update_password_no_shadow_encrypted/config/etc/gshadow b/tests/newusers/38_update_password_no_shadow_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/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/39_update_password_no_shadow_password_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/39_update_password_no_shadow_password_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/40_update_password_encrypted/config/etc/gshadow b/tests/newusers/40_update_password_encrypted/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/40_update_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/41_create_user_encrypt_SHA256-PAM/config.txt b/tests/newusers/41_create_user_encrypt_SHA256-PAM/config.txt similarity index 100% rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/config.txt rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/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-PAM/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-PAM/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-PAM/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-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/41_create_user_encrypt_SHA256-PAM/config/etc/passwd b/tests/newusers/41_create_user_encrypt_SHA256-PAM/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-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/41_create_user_encrypt_SHA256-PAM/data/group b/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/group similarity index 100% rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/group rename to tests/newusers/41_create_user_encrypt_SHA256-PAM/data/group diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/gshadow b/tests/newusers/41_create_user_encrypt_SHA256-PAM/data/gshadow similarity index 100% rename from tests/tests/newusers/41_create_user_encrypt_SHA256-PAM/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/41_create_user_encrypt_SHA256/config.txt b/tests/newusers/41_create_user_encrypt_SHA256/config.txt similarity index 100% rename from tests/tests/newusers/41_create_user_encrypt_SHA256/config.txt rename to tests/newusers/41_create_user_encrypt_SHA256/config.txt diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256/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/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/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/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/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/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/41_create_user_encrypt_SHA256/data/group b/tests/newusers/41_create_user_encrypt_SHA256/data/group similarity index 100% rename from tests/tests/newusers/41_create_user_encrypt_SHA256/data/group rename to tests/newusers/41_create_user_encrypt_SHA256/data/group diff --git a/tests/tests/newusers/41_create_user_encrypt_SHA256/data/gshadow b/tests/newusers/41_create_user_encrypt_SHA256/data/gshadow similarity index 100% rename from tests/tests/newusers/41_create_user_encrypt_SHA256/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/42_create_user_encrypt_SHA512-PAM/config.txt b/tests/newusers/42_create_user_encrypt_SHA512-PAM/config.txt similarity index 100% rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/config.txt rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/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-PAM/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-PAM/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-PAM/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-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/42_create_user_encrypt_SHA512-PAM/config/etc/passwd b/tests/newusers/42_create_user_encrypt_SHA512-PAM/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-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/42_create_user_encrypt_SHA512-PAM/data/group b/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/group similarity index 100% rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/group rename to tests/newusers/42_create_user_encrypt_SHA512-PAM/data/group diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/gshadow b/tests/newusers/42_create_user_encrypt_SHA512-PAM/data/gshadow similarity index 100% rename from tests/tests/newusers/42_create_user_encrypt_SHA512-PAM/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/42_create_user_encrypt_SHA512/config.txt b/tests/newusers/42_create_user_encrypt_SHA512/config.txt similarity index 100% rename from tests/tests/newusers/42_create_user_encrypt_SHA512/config.txt rename to tests/newusers/42_create_user_encrypt_SHA512/config.txt diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512/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/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/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/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/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/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/42_create_user_encrypt_SHA512/data/group b/tests/newusers/42_create_user_encrypt_SHA512/data/group similarity index 100% rename from tests/tests/newusers/42_create_user_encrypt_SHA512/data/group rename to tests/newusers/42_create_user_encrypt_SHA512/data/group diff --git a/tests/tests/newusers/42_create_user_encrypt_SHA512/data/gshadow b/tests/newusers/42_create_user_encrypt_SHA512/data/gshadow similarity index 100% rename from tests/tests/newusers/42_create_user_encrypt_SHA512/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/43_create_user_encrypt_SHA256_rounds_3000-PAM/config.txt b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config.txt similarity index 100% rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/config.txt rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/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-PAM/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-PAM/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-PAM/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-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/43_create_user_encrypt_SHA256_rounds_3000-PAM/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/43_create_user_encrypt_SHA256_rounds_3000-PAM/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/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/group b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/group similarity index 100% rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/group rename to tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/group diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/gshadow b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/data/gshadow similarity index 100% rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000-PAM/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/43_create_user_encrypt_SHA256_rounds_3000/config.txt b/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/config.txt similarity index 100% rename from tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/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/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/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/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/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/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/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/43_create_user_encrypt_SHA256_rounds_3000/data/group b/tests/newusers/43_create_user_encrypt_SHA256_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/43_create_user_encrypt_SHA256_rounds_3000/data/group diff --git a/tests/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/data/gshadow b/tests/newusers/43_create_user_encrypt_SHA256_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/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/44_create_user_encrypt_SHA256_rounds_300-PAM/config.txt b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config.txt similarity index 100% rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/config.txt rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/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-PAM/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-PAM/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-PAM/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-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/44_create_user_encrypt_SHA256_rounds_300-PAM/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/44_create_user_encrypt_SHA256_rounds_300-PAM/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/44_create_user_encrypt_SHA256_rounds_300-PAM/data/group b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/group similarity index 100% rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/group rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/group diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/gshadow b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/data/gshadow similarity index 100% rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300-PAM/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/44_create_user_encrypt_SHA256_rounds_300/config.txt b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/config.txt similarity index 100% rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/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/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/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/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/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/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/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/44_create_user_encrypt_SHA256_rounds_300/data/group b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/group similarity index 100% rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/group rename to tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/group diff --git a/tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/gshadow b/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/data/gshadow similarity index 100% rename from tests/tests/newusers/44_create_user_encrypt_SHA256_rounds_300/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/45_create_user_encrypt_rounds_3000/config.txt b/tests/newusers/45_create_user_encrypt_rounds_3000/config.txt similarity index 100% rename from tests/tests/newusers/45_create_user_encrypt_rounds_3000/config.txt rename to tests/newusers/45_create_user_encrypt_rounds_3000/config.txt diff --git a/tests/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/group b/tests/newusers/45_create_user_encrypt_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/45_create_user_encrypt_rounds_3000/config/etc/group diff --git a/tests/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/gshadow b/tests/newusers/45_create_user_encrypt_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/45_create_user_encrypt_rounds_3000/config/etc/gshadow diff --git a/tests/tests/newusers/45_create_user_encrypt_rounds_3000/config/etc/passwd b/tests/newusers/45_create_user_encrypt_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/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/46_create_user_encrypt_MD5_ignore_rounds_3000/config.txt b/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config.txt similarity index 100% rename from tests/tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config.txt rename to tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/config.txt diff --git a/tests/tests/newusers/46_create_user_encrypt_MD5_ignore_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/46_create_user_encrypt_MD5_ignore_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/46_create_user_encrypt_MD5_ignore_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/46_create_user_encrypt_MD5_ignore_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/46_create_user_encrypt_MD5_ignore_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/46_create_user_encrypt_MD5_ignore_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/46_create_user_encrypt_MD5_ignore_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/46_create_user_encrypt_MD5_ignore_rounds_3000/data/group rename to tests/newusers/46_create_user_encrypt_MD5_ignore_rounds_3000/data/group diff --git a/tests/tests/newusers/46_create_user_encrypt_MD5_ignore_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/46_create_user_encrypt_MD5_ignore_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/47_create_user_error_UID_4294967295/config.txt b/tests/newusers/47_create_user_error_UID_4294967295/config.txt similarity index 100% rename from tests/tests/newusers/47_create_user_error_UID_4294967295/config.txt rename to tests/newusers/47_create_user_error_UID_4294967295/config.txt diff --git a/tests/tests/newusers/47_create_user_error_UID_4294967295/config/etc/group b/tests/newusers/47_create_user_error_UID_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/47_create_user_error_UID_4294967295/config/etc/group diff --git a/tests/tests/newusers/47_create_user_error_UID_4294967295/config/etc/gshadow b/tests/newusers/47_create_user_error_UID_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/47_create_user_error_UID_4294967295/config/etc/gshadow diff --git a/tests/tests/newusers/47_create_user_error_UID_4294967295/config/etc/passwd b/tests/newusers/47_create_user_error_UID_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/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/48_create_user_error_GID_4294967295/config.txt b/tests/newusers/48_create_user_error_GID_4294967295/config.txt similarity index 100% rename from tests/tests/newusers/48_create_user_error_GID_4294967295/config.txt rename to tests/newusers/48_create_user_error_GID_4294967295/config.txt diff --git a/tests/tests/newusers/48_create_user_error_GID_4294967295/config/etc/group b/tests/newusers/48_create_user_error_GID_4294967295/config/etc/group similarity index 100% rename from tests/tests/newusers/48_create_user_error_GID_4294967295/config/etc/group rename to tests/newusers/48_create_user_error_GID_4294967295/config/etc/group diff --git a/tests/tests/newusers/48_create_user_error_GID_4294967295/config/etc/gshadow b/tests/newusers/48_create_user_error_GID_4294967295/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/48_create_user_error_GID_4294967295/config/etc/gshadow rename to tests/newusers/48_create_user_error_GID_4294967295/config/etc/gshadow diff --git a/tests/tests/newusers/48_create_user_error_GID_4294967295/config/etc/passwd b/tests/newusers/48_create_user_error_GID_4294967295/config/etc/passwd similarity index 100% rename from tests/tests/newusers/48_create_user_error_GID_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/50_usage/config.txt b/tests/newusers/50_usage/config.txt similarity index 100% rename from tests/tests/newusers/50_usage/config.txt rename to tests/newusers/50_usage/config.txt diff --git a/tests/tests/newusers/50_usage/config/etc/group b/tests/newusers/50_usage/config/etc/group similarity index 100% rename from tests/tests/newusers/50_usage/config/etc/group rename to tests/newusers/50_usage/config/etc/group diff --git a/tests/tests/newusers/50_usage/config/etc/gshadow b/tests/newusers/50_usage/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/50_usage/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/51_usage_invalid_option/config.txt b/tests/newusers/51_usage_invalid_option/config.txt similarity index 100% rename from tests/tests/newusers/51_usage_invalid_option/config.txt rename to tests/newusers/51_usage_invalid_option/config.txt diff --git a/tests/tests/newusers/51_usage_invalid_option/config/etc/group b/tests/newusers/51_usage_invalid_option/config/etc/group similarity index 100% rename from tests/tests/newusers/51_usage_invalid_option/config/etc/group rename to tests/newusers/51_usage_invalid_option/config/etc/group diff --git a/tests/tests/newusers/51_usage_invalid_option/config/etc/gshadow b/tests/newusers/51_usage_invalid_option/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/51_usage_invalid_option/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/52_usage_2_input_files/config.txt b/tests/newusers/52_usage_2_input_files/config.txt similarity index 100% rename from tests/tests/newusers/52_usage_2_input_files/config.txt rename to tests/newusers/52_usage_2_input_files/config.txt diff --git a/tests/tests/newusers/52_usage_2_input_files/config/etc/group b/tests/newusers/52_usage_2_input_files/config/etc/group similarity index 100% rename from tests/tests/newusers/52_usage_2_input_files/config/etc/group rename to tests/newusers/52_usage_2_input_files/config/etc/group diff --git a/tests/tests/newusers/52_usage_2_input_files/config/etc/gshadow b/tests/newusers/52_usage_2_input_files/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/52_usage_2_input_files/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/53_locked_passwd/config.txt b/tests/newusers/53_locked_passwd/config.txt similarity index 100% rename from tests/tests/newusers/53_locked_passwd/config.txt rename to tests/newusers/53_locked_passwd/config.txt diff --git a/tests/tests/newusers/53_locked_passwd/config/etc/group b/tests/newusers/53_locked_passwd/config/etc/group similarity index 100% rename from tests/tests/newusers/53_locked_passwd/config/etc/group rename to tests/newusers/53_locked_passwd/config/etc/group diff --git a/tests/tests/newusers/53_locked_passwd/config/etc/gshadow b/tests/newusers/53_locked_passwd/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/53_locked_passwd/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/54_locked_shadow/config.txt b/tests/newusers/54_locked_shadow/config.txt similarity index 100% rename from tests/tests/newusers/54_locked_shadow/config.txt rename to tests/newusers/54_locked_shadow/config.txt diff --git a/tests/tests/newusers/54_locked_shadow/config/etc/group b/tests/newusers/54_locked_shadow/config/etc/group similarity index 100% rename from tests/tests/newusers/54_locked_shadow/config/etc/group rename to tests/newusers/54_locked_shadow/config/etc/group diff --git a/tests/tests/newusers/54_locked_shadow/config/etc/gshadow b/tests/newusers/54_locked_shadow/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/54_locked_shadow/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/55_locked_group/config.txt b/tests/newusers/55_locked_group/config.txt similarity index 100% rename from tests/tests/newusers/55_locked_group/config.txt rename to tests/newusers/55_locked_group/config.txt diff --git a/tests/tests/newusers/55_locked_group/config/etc/group b/tests/newusers/55_locked_group/config/etc/group similarity index 100% rename from tests/tests/newusers/55_locked_group/config/etc/group rename to tests/newusers/55_locked_group/config/etc/group diff --git a/tests/tests/newusers/55_locked_group/config/etc/gshadow b/tests/newusers/55_locked_group/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/55_locked_group/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/56_locked_gshadow/config.txt b/tests/newusers/56_locked_gshadow/config.txt similarity index 100% rename from tests/tests/newusers/56_locked_gshadow/config.txt rename to tests/newusers/56_locked_gshadow/config.txt diff --git a/tests/tests/newusers/56_locked_gshadow/config/etc/group b/tests/newusers/56_locked_gshadow/config/etc/group similarity index 100% rename from tests/tests/newusers/56_locked_gshadow/config/etc/group rename to tests/newusers/56_locked_gshadow/config/etc/group diff --git a/tests/tests/newusers/56_locked_gshadow/config/etc/gshadow b/tests/newusers/56_locked_gshadow/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/56_locked_gshadow/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/57_missing_input_file/config.txt b/tests/newusers/57_missing_input_file/config.txt similarity index 100% rename from tests/tests/newusers/57_missing_input_file/config.txt rename to tests/newusers/57_missing_input_file/config.txt diff --git a/tests/tests/newusers/57_missing_input_file/config/etc/group b/tests/newusers/57_missing_input_file/config/etc/group similarity index 100% rename from tests/tests/newusers/57_missing_input_file/config/etc/group rename to tests/newusers/57_missing_input_file/config/etc/group diff --git a/tests/tests/newusers/57_missing_input_file/config/etc/gshadow b/tests/newusers/57_missing_input_file/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/57_missing_input_file/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/58_invalid_input_file/config.txt b/tests/newusers/58_invalid_input_file/config.txt similarity index 100% rename from tests/tests/newusers/58_invalid_input_file/config.txt rename to tests/newusers/58_invalid_input_file/config.txt diff --git a/tests/tests/newusers/58_invalid_input_file/config/etc/group b/tests/newusers/58_invalid_input_file/config/etc/group similarity index 100% rename from tests/tests/newusers/58_invalid_input_file/config/etc/group rename to tests/newusers/58_invalid_input_file/config/etc/group diff --git a/tests/tests/newusers/58_invalid_input_file/config/etc/gshadow b/tests/newusers/58_invalid_input_file/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/58_invalid_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/59_no_gshadow_file/config/etc/group b/tests/newusers/59_no_gshadow_file/config/etc/group similarity index 100% rename from tests/tests/newusers/59_no_gshadow_file/config/etc/group rename to tests/newusers/59_no_gshadow_file/config/etc/group diff --git a/tests/tests/newusers/59_no_gshadow_file/config/etc/gshadow b/tests/newusers/59_no_gshadow_file/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/59_no_gshadow_file/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/59_no_gshadow_file/config/etc/passwd b/tests/newusers/59_no_gshadow_file/config/etc/passwd similarity index 100% rename from tests/tests/newusers/59_no_gshadow_file/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/60_update_no_gecos/config/etc/gshadow b/tests/newusers/60_update_no_gecos/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/60_update_no_gecos/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/61_update_no_shell/config/etc/gshadow b/tests/newusers/61_update_no_shell/config/etc/gshadow similarity index 100% rename from tests/tests/newusers/61_update_no_shell/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/passwd/01_passwd_-S_root_locked_account/config/etc/group b/tests/passwd/01_passwd_-S_root_locked_account/config/etc/group similarity index 100% rename from tests/tests/passwd/01_passwd_-S_root_locked_account/config/etc/group rename to tests/passwd/01_passwd_-S_root_locked_account/config/etc/group diff --git a/tests/tests/passwd/01_passwd_-S_root_locked_account/config/etc/gshadow b/tests/passwd/01_passwd_-S_root_locked_account/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/01_passwd_-S_root_locked_account/config/etc/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/passwd/02_passwd_-S_root_valid_account/config/etc/group b/tests/passwd/02_passwd_-S_root_valid_account/config/etc/group similarity index 100% rename from tests/tests/passwd/02_passwd_-S_root_valid_account/config/etc/group rename to tests/passwd/02_passwd_-S_root_valid_account/config/etc/group diff --git a/tests/tests/passwd/02_passwd_-S_root_valid_account/config/etc/gshadow b/tests/passwd/02_passwd_-S_root_valid_account/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/02_passwd_-S_root_valid_account/config/etc/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/passwd/03_passwd_-S_root_empty_password/config/etc/group b/tests/passwd/03_passwd_-S_root_empty_password/config/etc/group similarity index 100% rename from tests/tests/passwd/03_passwd_-S_root_empty_password/config/etc/group rename to tests/passwd/03_passwd_-S_root_empty_password/config/etc/group diff --git a/tests/tests/passwd/03_passwd_-S_root_empty_password/config/etc/gshadow b/tests/passwd/03_passwd_-S_root_empty_password/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/03_passwd_-S_root_empty_password/config/etc/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/04_passwd_-S_root_valid_account_no_shadow_file/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/04_passwd_-S_root_valid_account_no_shadow_file/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/04_passwd_-S_root_valid_account_no_shadow_file/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/04_passwd_-S_root_valid_account_no_shadow_file/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/05_passwd_-S_root_valid_account_no_shadow_entry/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/05_passwd_-S_root_valid_account_no_shadow_entry/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/05_passwd_-S_root_valid_account_no_shadow_entry/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/05_passwd_-S_root_valid_account_no_shadow_entry/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/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/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/passwd/05_passwd_-S_root_valid_account_no_shadow_entry/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/06_passwd_-l_root_lock_account/config/etc/group b/tests/passwd/06_passwd_-l_root_lock_account/config/etc/group similarity index 100% rename from tests/tests/passwd/06_passwd_-l_root_lock_account/config/etc/group rename to tests/passwd/06_passwd_-l_root_lock_account/config/etc/group diff --git a/tests/tests/passwd/06_passwd_-l_root_lock_account/config/etc/gshadow b/tests/passwd/06_passwd_-l_root_lock_account/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/06_passwd_-l_root_lock_account/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/07_passwd_-l_root_lock_account_no_shadow_entry/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/07_passwd_-l_root_lock_account_no_shadow_entry/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/07_passwd_-l_root_lock_account_no_shadow_entry/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/07_passwd_-l_root_lock_account_no_shadow_entry/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/07_passwd_-l_root_lock_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/07_passwd_-l_root_lock_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/08_passwd_-u_root_unlock_account/config/etc/group b/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/group similarity index 100% rename from tests/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/group rename to tests/passwd/08_passwd_-u_root_unlock_account/config/etc/group diff --git a/tests/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/gshadow b/tests/passwd/08_passwd_-u_root_unlock_account/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/08_passwd_-u_root_unlock_account/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/09_passwd_-u_root_unlock_to_empty/config/etc/group b/tests/passwd/09_passwd_-u_root_unlock_to_empty/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/09_passwd_-u_root_unlock_to_empty/config/etc/group diff --git a/tests/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/gshadow b/tests/passwd/09_passwd_-u_root_unlock_to_empty/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/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/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/shadow b/tests/passwd/09_passwd_-u_root_unlock_to_empty/config/etc/shadow similarity index 100% rename from tests/tests/passwd/09_passwd_-u_root_unlock_to_empty/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/10_passwd_-d_root/config/etc/group b/tests/passwd/10_passwd_-d_root/config/etc/group similarity index 100% rename from tests/tests/passwd/10_passwd_-d_root/config/etc/group rename to tests/passwd/10_passwd_-d_root/config/etc/group diff --git a/tests/tests/passwd/10_passwd_-d_root/config/etc/gshadow b/tests/passwd/10_passwd_-d_root/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/10_passwd_-d_root/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/11_passwd_--mindays_root/config/etc/group b/tests/passwd/11_passwd_--mindays_root/config/etc/group similarity index 100% rename from tests/tests/passwd/11_passwd_--mindays_root/config/etc/group rename to tests/passwd/11_passwd_--mindays_root/config/etc/group diff --git a/tests/tests/passwd/11_passwd_--mindays_root/config/etc/gshadow b/tests/passwd/11_passwd_--mindays_root/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/11_passwd_--mindays_root/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/12_passwd_--maxdays_root/config/etc/group b/tests/passwd/12_passwd_--maxdays_root/config/etc/group similarity index 100% rename from tests/tests/passwd/12_passwd_--maxdays_root/config/etc/group rename to tests/passwd/12_passwd_--maxdays_root/config/etc/group diff --git a/tests/tests/passwd/12_passwd_--maxdays_root/config/etc/gshadow b/tests/passwd/12_passwd_--maxdays_root/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/12_passwd_--maxdays_root/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/13_passwd_--warndays_root/config/etc/group b/tests/passwd/13_passwd_--warndays_root/config/etc/group similarity index 100% rename from tests/tests/passwd/13_passwd_--warndays_root/config/etc/group rename to tests/passwd/13_passwd_--warndays_root/config/etc/group diff --git a/tests/tests/passwd/13_passwd_--warndays_root/config/etc/gshadow b/tests/passwd/13_passwd_--warndays_root/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/13_passwd_--warndays_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/14_passwd_--inactive_root/config/etc/group b/tests/passwd/14_passwd_--inactive_root/config/etc/group similarity index 100% rename from tests/tests/passwd/14_passwd_--inactive_root/config/etc/group rename to tests/passwd/14_passwd_--inactive_root/config/etc/group diff --git a/tests/tests/passwd/14_passwd_--inactive_root/config/etc/gshadow b/tests/passwd/14_passwd_--inactive_root/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/14_passwd_--inactive_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/15_passwd_--expire_root/config/etc/group b/tests/passwd/15_passwd_--expire_root/config/etc/group similarity index 100% rename from tests/tests/passwd/15_passwd_--expire_root/config/etc/group rename to tests/passwd/15_passwd_--expire_root/config/etc/group diff --git a/tests/tests/passwd/15_passwd_--expire_root/config/etc/gshadow b/tests/passwd/15_passwd_--expire_root/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/15_passwd_--expire_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/16_passwd_-S-a_root/config/etc/group b/tests/passwd/16_passwd_-S-a_root/config/etc/group similarity index 100% rename from tests/tests/passwd/16_passwd_-S-a_root/config/etc/group rename to tests/passwd/16_passwd_-S-a_root/config/etc/group diff --git a/tests/tests/passwd/16_passwd_-S-a_root/config/etc/gshadow b/tests/passwd/16_passwd_-S-a_root/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/16_passwd_-S-a_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/17_passwd_root_change_password/config/etc/group b/tests/passwd/17_passwd_root_change_password/config/etc/group similarity index 100% rename from tests/tests/passwd/17_passwd_root_change_password/config/etc/group rename to tests/passwd/17_passwd_root_change_password/config/etc/group diff --git a/tests/tests/passwd/17_passwd_root_change_password/config/etc/gshadow b/tests/passwd/17_passwd_root_change_password/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/17_passwd_root_change_password/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/18_passwd_root_change_password_user/config/etc/group b/tests/passwd/18_passwd_root_change_password_user/config/etc/group similarity index 100% rename from tests/tests/passwd/18_passwd_root_change_password_user/config/etc/group rename to tests/passwd/18_passwd_root_change_password_user/config/etc/group diff --git a/tests/tests/passwd/18_passwd_root_change_password_user/config/etc/gshadow b/tests/passwd/18_passwd_root_change_password_user/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/18_passwd_root_change_password_user/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/19_passwd_user_change_password/config/etc/group b/tests/passwd/19_passwd_user_change_password/config/etc/group similarity index 100% rename from tests/tests/passwd/19_passwd_user_change_password/config/etc/group rename to tests/passwd/19_passwd_user_change_password/config/etc/group diff --git a/tests/tests/passwd/19_passwd_user_change_password/config/etc/gshadow b/tests/passwd/19_passwd_user_change_password/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/19_passwd_user_change_password/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/20_passwd_user_change_password_same_user/config/etc/group b/tests/passwd/20_passwd_user_change_password_same_user/config/etc/group similarity index 100% rename from tests/tests/passwd/20_passwd_user_change_password_same_user/config/etc/group rename to tests/passwd/20_passwd_user_change_password_same_user/config/etc/group diff --git a/tests/tests/passwd/20_passwd_user_change_password_same_user/config/etc/gshadow b/tests/passwd/20_passwd_user_change_password_same_user/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/20_passwd_user_change_password_same_user/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/passwd/22_passwd_usage/config/etc/group b/tests/passwd/22_passwd_usage/config/etc/group similarity index 100% rename from tests/tests/passwd/22_passwd_usage/config/etc/group rename to tests/passwd/22_passwd_usage/config/etc/group diff --git a/tests/tests/passwd/22_passwd_usage/config/etc/gshadow b/tests/passwd/22_passwd_usage/config/etc/gshadow similarity index 100% rename from tests/tests/passwd/22_passwd_usage/config/etc/gshadow rename to tests/passwd/22_passwd_usage/config/etc/gshadow diff --git a/tests/tests/passwd/22_passwd_usage/config/etc/passwd b/tests/passwd/22_passwd_usage/config/etc/passwd similarity index 100% rename from tests/tests/passwd/22_passwd_usage/config/etc/passwd rename to tests/passwd/22_passwd_usage/config/etc/passwd diff --git a/tests/tests/passwd/22_passwd_usage/config/etc/shadow b/tests/passwd/22_passwd_usage/config/etc/shadow similarity index 100% rename from tests/tests/passwd/22_passwd_usage/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 100% rename from tests/tests/run_all rename to tests/run_all diff --git a/tests/tests/run_all.coverage b/tests/run_all.coverage similarity index 100% rename from tests/tests/run_all.coverage rename to tests/run_all.coverage 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/su/01/config/etc/group b/tests/su/01/config/etc/group similarity index 100% rename from tests/tests/su/01/config/etc/group rename to tests/su/01/config/etc/group diff --git a/tests/tests/su/01/config/etc/gshadow b/tests/su/01/config/etc/gshadow similarity index 100% rename from tests/tests/su/01/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/02/config/etc/group b/tests/su/02/config/etc/group similarity index 100% rename from tests/tests/su/02/config/etc/group rename to tests/su/02/config/etc/group diff --git a/tests/tests/su/02/config/etc/gshadow b/tests/su/02/config/etc/gshadow similarity index 100% rename from tests/tests/su/02/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/03/config/etc/group b/tests/su/03/config/etc/group similarity index 100% rename from tests/tests/su/03/config/etc/group rename to tests/su/03/config/etc/group diff --git a/tests/tests/su/03/config/etc/gshadow b/tests/su/03/config/etc/gshadow similarity index 100% rename from tests/tests/su/03/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/04/config/etc/group b/tests/su/04/config/etc/group similarity index 100% rename from tests/tests/su/04/config/etc/group rename to tests/su/04/config/etc/group diff --git a/tests/tests/su/04/config/etc/gshadow b/tests/su/04/config/etc/gshadow similarity index 100% rename from tests/tests/su/04/config/etc/gshadow rename to tests/su/04/config/etc/gshadow diff --git a/tests/tests/su/04/config/etc/login.defs b/tests/su/04/config/etc/login.defs similarity index 100% rename from tests/tests/su/04/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/05/config/etc/group b/tests/su/05/config/etc/group similarity index 100% rename from tests/tests/su/05/config/etc/group rename to tests/su/05/config/etc/group diff --git a/tests/tests/su/05/config/etc/gshadow b/tests/su/05/config/etc/gshadow similarity index 100% rename from tests/tests/su/05/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/06/config/etc/group b/tests/su/06/config/etc/group similarity index 100% rename from tests/tests/su/06/config/etc/group rename to tests/su/06/config/etc/group diff --git a/tests/tests/su/06/config/etc/gshadow b/tests/su/06/config/etc/gshadow similarity index 100% rename from tests/tests/su/06/config/etc/gshadow rename to tests/su/06/config/etc/gshadow diff --git a/tests/tests/su/06/config/etc/login.defs b/tests/su/06/config/etc/login.defs similarity index 100% rename from tests/tests/su/06/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/07/config/etc/group b/tests/su/07/config/etc/group similarity index 100% rename from tests/tests/su/07/config/etc/group rename to tests/su/07/config/etc/group diff --git a/tests/tests/su/07/config/etc/gshadow b/tests/su/07/config/etc/gshadow similarity index 100% rename from tests/tests/su/07/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/su/08/config.txt b/tests/su/08/config.txt similarity index 100% rename from tests/tests/su/08/config.txt rename to tests/su/08/config.txt diff --git a/tests/tests/su/08/config/etc/group b/tests/su/08/config/etc/group similarity index 100% rename from tests/tests/su/08/config/etc/group rename to tests/su/08/config/etc/group diff --git a/tests/tests/su/08/config/etc/gshadow b/tests/su/08/config/etc/gshadow similarity index 100% rename from tests/tests/su/08/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/09/config/etc/group b/tests/su/09/config/etc/group similarity index 100% rename from tests/tests/su/09/config/etc/group rename to tests/su/09/config/etc/group diff --git a/tests/tests/su/09/config/etc/gshadow b/tests/su/09/config/etc/gshadow similarity index 100% rename from tests/tests/su/09/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/10_su_sulog_success/config/etc/group b/tests/su/10_su_sulog_success/config/etc/group similarity index 100% rename from tests/tests/su/10_su_sulog_success/config/etc/group rename to tests/su/10_su_sulog_success/config/etc/group diff --git a/tests/tests/su/10_su_sulog_success/config/etc/gshadow b/tests/su/10_su_sulog_success/config/etc/gshadow similarity index 100% rename from tests/tests/su/10_su_sulog_success/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/11_su_sulog_failure/config/etc/group b/tests/su/11_su_sulog_failure/config/etc/group similarity index 100% rename from tests/tests/su/11_su_sulog_failure/config/etc/group rename to tests/su/11_su_sulog_failure/config/etc/group diff --git a/tests/tests/su/11_su_sulog_failure/config/etc/gshadow b/tests/su/11_su_sulog_failure/config/etc/gshadow similarity index 100% rename from tests/tests/su/11_su_sulog_failure/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/12_su_child_failure/config/etc/group b/tests/su/12_su_child_failure/config/etc/group similarity index 100% rename from tests/tests/su/12_su_child_failure/config/etc/group rename to tests/su/12_su_child_failure/config/etc/group diff --git a/tests/tests/su/12_su_child_failure/config/etc/gshadow b/tests/su/12_su_child_failure/config/etc/gshadow similarity index 100% rename from tests/tests/su/12_su_child_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/13_su_child_success/config/etc/group b/tests/su/13_su_child_success/config/etc/group similarity index 100% rename from tests/tests/su/13_su_child_success/config/etc/group rename to tests/su/13_su_child_success/config/etc/group diff --git a/tests/tests/su/13_su_child_success/config/etc/gshadow b/tests/su/13_su_child_success/config/etc/gshadow similarity index 100% rename from tests/tests/su/13_su_child_success/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/subids/01_useradd_no_subids/config.txt b/tests/subids/01_useradd_no_subids/config.txt similarity index 100% rename from tests/tests/subids/01_useradd_no_subids/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/subids/01_useradd_no_subids/config/etc/group b/tests/subids/01_useradd_no_subids/config/etc/group similarity index 100% rename from tests/tests/subids/01_useradd_no_subids/config/etc/group rename to tests/subids/01_useradd_no_subids/config/etc/group diff --git a/tests/tests/subids/01_useradd_no_subids/config/etc/gshadow b/tests/subids/01_useradd_no_subids/config/etc/gshadow similarity index 100% rename from tests/tests/subids/01_useradd_no_subids/config/etc/gshadow rename to tests/subids/01_useradd_no_subids/config/etc/gshadow diff --git a/tests/tests/subids/01_useradd_no_subids/config/etc/passwd b/tests/subids/01_useradd_no_subids/config/etc/passwd similarity index 100% rename from tests/tests/subids/01_useradd_no_subids/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/subids/01_useradd_no_subids/data/group b/tests/subids/01_useradd_no_subids/data/group similarity index 100% rename from tests/tests/subids/01_useradd_no_subids/data/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/subids/02_useradd_with_subids/config.txt b/tests/subids/02_useradd_with_subids/config.txt similarity index 100% rename from tests/tests/subids/02_useradd_with_subids/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/02_useradd_with_subids/config/etc/group b/tests/subids/02_useradd_with_subids/config/etc/group similarity index 100% rename from tests/tests/subids/02_useradd_with_subids/config/etc/group rename to tests/subids/02_useradd_with_subids/config/etc/group diff --git a/tests/tests/subids/02_useradd_with_subids/config/etc/gshadow b/tests/subids/02_useradd_with_subids/config/etc/gshadow similarity index 100% rename from tests/tests/subids/02_useradd_with_subids/config/etc/gshadow rename to tests/subids/02_useradd_with_subids/config/etc/gshadow diff --git a/tests/tests/subids/02_useradd_with_subids/config/etc/passwd b/tests/subids/02_useradd_with_subids/config/etc/passwd similarity index 100% rename from tests/tests/subids/02_useradd_with_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/subids/02_useradd_with_subids/data/group b/tests/subids/02_useradd_with_subids/data/group similarity index 100% rename from tests/tests/subids/02_useradd_with_subids/data/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/subids/03_useradd_no_subgid/config.txt b/tests/subids/03_useradd_no_subgid/config.txt similarity index 100% rename from tests/tests/subids/03_useradd_no_subgid/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/03_useradd_no_subgid/config/etc/group b/tests/subids/03_useradd_no_subgid/config/etc/group similarity index 100% rename from tests/tests/subids/03_useradd_no_subgid/config/etc/group rename to tests/subids/03_useradd_no_subgid/config/etc/group diff --git a/tests/tests/subids/03_useradd_no_subgid/config/etc/gshadow b/tests/subids/03_useradd_no_subgid/config/etc/gshadow similarity index 100% rename from tests/tests/subids/03_useradd_no_subgid/config/etc/gshadow rename to tests/subids/03_useradd_no_subgid/config/etc/gshadow diff --git a/tests/tests/subids/03_useradd_no_subgid/config/etc/passwd b/tests/subids/03_useradd_no_subgid/config/etc/passwd similarity index 100% rename from tests/tests/subids/03_useradd_no_subgid/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/subids/03_useradd_no_subgid/data/group b/tests/subids/03_useradd_no_subgid/data/group similarity index 100% rename from tests/tests/subids/03_useradd_no_subgid/data/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/subids/04_useradd_no_subuid/config.txt b/tests/subids/04_useradd_no_subuid/config.txt similarity index 100% rename from tests/tests/subids/04_useradd_no_subuid/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/04_useradd_no_subuid/config/etc/group b/tests/subids/04_useradd_no_subuid/config/etc/group similarity index 100% rename from tests/tests/subids/04_useradd_no_subuid/config/etc/group rename to tests/subids/04_useradd_no_subuid/config/etc/group diff --git a/tests/tests/subids/04_useradd_no_subuid/config/etc/gshadow b/tests/subids/04_useradd_no_subuid/config/etc/gshadow similarity index 100% rename from tests/tests/subids/04_useradd_no_subuid/config/etc/gshadow rename to tests/subids/04_useradd_no_subuid/config/etc/gshadow diff --git a/tests/tests/subids/04_useradd_no_subuid/config/etc/passwd b/tests/subids/04_useradd_no_subuid/config/etc/passwd similarity index 100% rename from tests/tests/subids/04_useradd_no_subuid/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/04_useradd_no_subuid/data/group b/tests/subids/04_useradd_no_subuid/data/group similarity index 100% rename from tests/tests/subids/04_useradd_no_subuid/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/subids/05_useradd_fill_gap_start/config.txt b/tests/subids/05_useradd_fill_gap_start/config.txt similarity index 100% rename from tests/tests/subids/05_useradd_fill_gap_start/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/05_useradd_fill_gap_start/config/etc/group b/tests/subids/05_useradd_fill_gap_start/config/etc/group similarity index 100% rename from tests/tests/subids/05_useradd_fill_gap_start/config/etc/group rename to tests/subids/05_useradd_fill_gap_start/config/etc/group diff --git a/tests/tests/subids/05_useradd_fill_gap_start/config/etc/gshadow b/tests/subids/05_useradd_fill_gap_start/config/etc/gshadow similarity index 100% rename from tests/tests/subids/05_useradd_fill_gap_start/config/etc/gshadow rename to tests/subids/05_useradd_fill_gap_start/config/etc/gshadow diff --git a/tests/tests/subids/05_useradd_fill_gap_start/config/etc/passwd b/tests/subids/05_useradd_fill_gap_start/config/etc/passwd similarity index 100% rename from tests/tests/subids/05_useradd_fill_gap_start/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/05_useradd_fill_gap_start/data/group b/tests/subids/05_useradd_fill_gap_start/data/group similarity index 100% rename from tests/tests/subids/05_useradd_fill_gap_start/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/subids/06_useradd_fill_gap_middle/config.txt b/tests/subids/06_useradd_fill_gap_middle/config.txt similarity index 100% rename from tests/tests/subids/06_useradd_fill_gap_middle/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/06_useradd_fill_gap_middle/config/etc/group b/tests/subids/06_useradd_fill_gap_middle/config/etc/group similarity index 100% rename from tests/tests/subids/06_useradd_fill_gap_middle/config/etc/group rename to tests/subids/06_useradd_fill_gap_middle/config/etc/group diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/config/etc/gshadow b/tests/subids/06_useradd_fill_gap_middle/config/etc/gshadow similarity index 100% rename from tests/tests/subids/06_useradd_fill_gap_middle/config/etc/gshadow rename to tests/subids/06_useradd_fill_gap_middle/config/etc/gshadow diff --git a/tests/tests/subids/06_useradd_fill_gap_middle/config/etc/passwd b/tests/subids/06_useradd_fill_gap_middle/config/etc/passwd similarity index 100% rename from tests/tests/subids/06_useradd_fill_gap_middle/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/06_useradd_fill_gap_middle/data/group b/tests/subids/06_useradd_fill_gap_middle/data/group similarity index 100% rename from tests/tests/subids/06_useradd_fill_gap_middle/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/subids/07_useradd_fill_gap_end/config.txt b/tests/subids/07_useradd_fill_gap_end/config.txt similarity index 100% rename from tests/tests/subids/07_useradd_fill_gap_end/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/07_useradd_fill_gap_end/config/etc/group b/tests/subids/07_useradd_fill_gap_end/config/etc/group similarity index 100% rename from tests/tests/subids/07_useradd_fill_gap_end/config/etc/group rename to tests/subids/07_useradd_fill_gap_end/config/etc/group diff --git a/tests/tests/subids/07_useradd_fill_gap_end/config/etc/gshadow b/tests/subids/07_useradd_fill_gap_end/config/etc/gshadow similarity index 100% rename from tests/tests/subids/07_useradd_fill_gap_end/config/etc/gshadow rename to tests/subids/07_useradd_fill_gap_end/config/etc/gshadow diff --git a/tests/tests/subids/07_useradd_fill_gap_end/config/etc/passwd b/tests/subids/07_useradd_fill_gap_end/config/etc/passwd similarity index 100% rename from tests/tests/subids/07_useradd_fill_gap_end/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/07_useradd_fill_gap_end/data/group b/tests/subids/07_useradd_fill_gap_end/data/group similarity index 100% rename from tests/tests/subids/07_useradd_fill_gap_end/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/subids/08_useradd_no_more_subuids_start/config.txt b/tests/subids/08_useradd_no_more_subuids_start/config.txt similarity index 100% rename from tests/tests/subids/08_useradd_no_more_subuids_start/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/08_useradd_no_more_subuids_start/config/etc/group b/tests/subids/08_useradd_no_more_subuids_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/08_useradd_no_more_subuids_start/config/etc/group diff --git a/tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/gshadow b/tests/subids/08_useradd_no_more_subuids_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/08_useradd_no_more_subuids_start/config/etc/gshadow diff --git a/tests/tests/subids/08_useradd_no_more_subuids_start/config/etc/passwd b/tests/subids/08_useradd_no_more_subuids_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/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/subids/09_useradd_no_more_subgids_start/config.txt b/tests/subids/09_useradd_no_more_subgids_start/config.txt similarity index 100% rename from tests/tests/subids/09_useradd_no_more_subgids_start/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/09_useradd_no_more_subgids_start/config/etc/group b/tests/subids/09_useradd_no_more_subgids_start/config/etc/group similarity index 100% rename from tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/group rename to tests/subids/09_useradd_no_more_subgids_start/config/etc/group diff --git a/tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/gshadow b/tests/subids/09_useradd_no_more_subgids_start/config/etc/gshadow similarity index 100% rename from tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/gshadow rename to tests/subids/09_useradd_no_more_subgids_start/config/etc/gshadow diff --git a/tests/tests/subids/09_useradd_no_more_subgids_start/config/etc/passwd b/tests/subids/09_useradd_no_more_subgids_start/config/etc/passwd similarity index 100% rename from tests/tests/subids/09_useradd_no_more_subgids_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/subids/10_useradd_no_more_subuids_end/config.txt b/tests/subids/10_useradd_no_more_subuids_end/config.txt similarity index 100% rename from tests/tests/subids/10_useradd_no_more_subuids_end/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/10_useradd_no_more_subuids_end/config/etc/group b/tests/subids/10_useradd_no_more_subuids_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/10_useradd_no_more_subuids_end/config/etc/group diff --git a/tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/gshadow b/tests/subids/10_useradd_no_more_subuids_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/10_useradd_no_more_subuids_end/config/etc/gshadow diff --git a/tests/tests/subids/10_useradd_no_more_subuids_end/config/etc/passwd b/tests/subids/10_useradd_no_more_subuids_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/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/subids/11_useradd_no_more_subgids_end/config.txt b/tests/subids/11_useradd_no_more_subgids_end/config.txt similarity index 100% rename from tests/tests/subids/11_useradd_no_more_subgids_end/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/11_useradd_no_more_subgids_end/config/etc/group b/tests/subids/11_useradd_no_more_subgids_end/config/etc/group similarity index 100% rename from tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/group rename to tests/subids/11_useradd_no_more_subgids_end/config/etc/group diff --git a/tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/gshadow b/tests/subids/11_useradd_no_more_subgids_end/config/etc/gshadow similarity index 100% rename from tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/gshadow rename to tests/subids/11_useradd_no_more_subgids_end/config/etc/gshadow diff --git a/tests/tests/subids/11_useradd_no_more_subgids_end/config/etc/passwd b/tests/subids/11_useradd_no_more_subgids_end/config/etc/passwd similarity index 100% rename from tests/tests/subids/11_useradd_no_more_subgids_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/12_useradd_invalid_subuid_configuration1/config.txt b/tests/subids/12_useradd_invalid_subuid_configuration1/config.txt similarity index 100% rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/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/12_useradd_invalid_subuid_configuration1/config/etc/group b/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/group similarity index 100% rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/group rename to tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/group diff --git a/tests/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/gshadow b/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/gshadow similarity index 100% rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/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/12_useradd_invalid_subuid_configuration1/config/etc/passwd b/tests/subids/12_useradd_invalid_subuid_configuration1/config/etc/passwd similarity index 100% rename from tests/tests/subids/12_useradd_invalid_subuid_configuration1/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/13_useradd_invalid_subuid_configuration2/config.txt b/tests/subids/13_useradd_invalid_subuid_configuration2/config.txt similarity index 100% rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/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/13_useradd_invalid_subuid_configuration2/config/etc/group b/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/group similarity index 100% rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/group rename to tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/group diff --git a/tests/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/gshadow b/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/gshadow similarity index 100% rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/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/13_useradd_invalid_subuid_configuration2/config/etc/passwd b/tests/subids/13_useradd_invalid_subuid_configuration2/config/etc/passwd similarity index 100% rename from tests/tests/subids/13_useradd_invalid_subuid_configuration2/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/14_useradd_invalid_subuid_configuration3/config.txt b/tests/subids/14_useradd_invalid_subuid_configuration3/config.txt similarity index 100% rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/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/14_useradd_invalid_subuid_configuration3/config/etc/group b/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/group similarity index 100% rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/group rename to tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/group diff --git a/tests/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/gshadow b/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/gshadow similarity index 100% rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/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/14_useradd_invalid_subuid_configuration3/config/etc/passwd b/tests/subids/14_useradd_invalid_subuid_configuration3/config/etc/passwd similarity index 100% rename from tests/tests/subids/14_useradd_invalid_subuid_configuration3/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/15_useradd_invalid_subgid_configuration1/config.txt b/tests/subids/15_useradd_invalid_subgid_configuration1/config.txt similarity index 100% rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/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/15_useradd_invalid_subgid_configuration1/config/etc/group b/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/group similarity index 100% rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/group rename to tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/group diff --git a/tests/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/gshadow b/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/gshadow similarity index 100% rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/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/15_useradd_invalid_subgid_configuration1/config/etc/passwd b/tests/subids/15_useradd_invalid_subgid_configuration1/config/etc/passwd similarity index 100% rename from tests/tests/subids/15_useradd_invalid_subgid_configuration1/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/16_useradd_invalid_subgid_configuration2/config.txt b/tests/subids/16_useradd_invalid_subgid_configuration2/config.txt similarity index 100% rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/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/16_useradd_invalid_subgid_configuration2/config/etc/group b/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/group similarity index 100% rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/group rename to tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/group diff --git a/tests/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/gshadow b/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/gshadow similarity index 100% rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/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/16_useradd_invalid_subgid_configuration2/config/etc/passwd b/tests/subids/16_useradd_invalid_subgid_configuration2/config/etc/passwd similarity index 100% rename from tests/tests/subids/16_useradd_invalid_subgid_configuration2/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/17_useradd_invalid_subgid_configuration3/config.txt b/tests/subids/17_useradd_invalid_subgid_configuration3/config.txt similarity index 100% rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/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/17_useradd_invalid_subgid_configuration3/config/etc/group b/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/group similarity index 100% rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/group rename to tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/group diff --git a/tests/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/gshadow b/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/gshadow similarity index 100% rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/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/17_useradd_invalid_subgid_configuration3/config/etc/passwd b/tests/subids/17_useradd_invalid_subgid_configuration3/config/etc/passwd similarity index 100% rename from tests/tests/subids/17_useradd_invalid_subgid_configuration3/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/18_useradd_min=max/config.txt b/tests/subids/18_useradd_min=max/config.txt similarity index 100% rename from tests/tests/subids/18_useradd_min=max/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/18_useradd_min=max/config/etc/group b/tests/subids/18_useradd_min=max/config/etc/group similarity index 100% rename from tests/tests/subids/18_useradd_min=max/config/etc/group rename to tests/subids/18_useradd_min=max/config/etc/group diff --git a/tests/tests/subids/18_useradd_min=max/config/etc/gshadow b/tests/subids/18_useradd_min=max/config/etc/gshadow similarity index 100% rename from tests/tests/subids/18_useradd_min=max/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/18_useradd_min=max/config/etc/passwd b/tests/subids/18_useradd_min=max/config/etc/passwd similarity index 100% rename from tests/tests/subids/18_useradd_min=max/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/18_useradd_min=max/data/group b/tests/subids/18_useradd_min=max/data/group similarity index 100% rename from tests/tests/subids/18_useradd_min=max/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/19_useradd_locked_subuid/config.txt b/tests/subids/19_useradd_locked_subuid/config.txt similarity index 100% rename from tests/tests/subids/19_useradd_locked_subuid/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/19_useradd_locked_subuid/config/etc/passwd b/tests/subids/19_useradd_locked_subuid/config/etc/passwd similarity index 100% rename from tests/tests/subids/19_useradd_locked_subuid/config/etc/passwd rename to tests/subids/19_useradd_locked_subuid/config/etc/passwd diff --git a/tests/tests/subids/19_useradd_locked_subuid/config/etc/shadow b/tests/subids/19_useradd_locked_subuid/config/etc/shadow similarity index 100% rename from tests/tests/subids/19_useradd_locked_subuid/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/20_useradd_locked_subgid/config.txt b/tests/subids/20_useradd_locked_subgid/config.txt similarity index 100% rename from tests/tests/subids/20_useradd_locked_subgid/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/20_useradd_locked_subgid/config/etc/passwd b/tests/subids/20_useradd_locked_subgid/config/etc/passwd similarity index 100% rename from tests/tests/subids/20_useradd_locked_subgid/config/etc/passwd rename to tests/subids/20_useradd_locked_subgid/config/etc/passwd diff --git a/tests/tests/subids/20_useradd_locked_subgid/config/etc/shadow b/tests/subids/20_useradd_locked_subgid/config/etc/shadow similarity index 100% rename from tests/tests/subids/20_useradd_locked_subgid/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/subids/21_usermod_create_subuid_range/config/etc/group b/tests/subids/21_usermod_create_subuid_range/config/etc/group similarity index 100% rename from tests/tests/subids/21_usermod_create_subuid_range/config/etc/group rename to tests/subids/21_usermod_create_subuid_range/config/etc/group diff --git a/tests/tests/subids/21_usermod_create_subuid_range/config/etc/gshadow b/tests/subids/21_usermod_create_subuid_range/config/etc/gshadow similarity index 100% rename from tests/tests/subids/21_usermod_create_subuid_range/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/subids/21_usermod_create_subuid_range/config/etc/shadow b/tests/subids/21_usermod_create_subuid_range/config/etc/shadow similarity index 100% rename from tests/tests/subids/21_usermod_create_subuid_range/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/subids/22_usermod_create_subgid_range/config/etc/group b/tests/subids/22_usermod_create_subgid_range/config/etc/group similarity index 100% rename from tests/tests/subids/22_usermod_create_subgid_range/config/etc/group rename to tests/subids/22_usermod_create_subgid_range/config/etc/group diff --git a/tests/tests/subids/22_usermod_create_subgid_range/config/etc/gshadow b/tests/subids/22_usermod_create_subgid_range/config/etc/gshadow similarity index 100% rename from tests/tests/subids/22_usermod_create_subgid_range/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/subids/22_usermod_create_subgid_range/config/etc/shadow b/tests/subids/22_usermod_create_subgid_range/config/etc/shadow similarity index 100% rename from tests/tests/subids/22_usermod_create_subgid_range/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/subids/23_usermod_create_subids_ranges/config/etc/group b/tests/subids/23_usermod_create_subids_ranges/config/etc/group similarity index 100% rename from tests/tests/subids/23_usermod_create_subids_ranges/config/etc/group rename to tests/subids/23_usermod_create_subids_ranges/config/etc/group diff --git a/tests/tests/subids/23_usermod_create_subids_ranges/config/etc/gshadow b/tests/subids/23_usermod_create_subids_ranges/config/etc/gshadow similarity index 100% rename from tests/tests/subids/23_usermod_create_subids_ranges/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/subids/23_usermod_create_subids_ranges/config/etc/shadow b/tests/subids/23_usermod_create_subids_ranges/config/etc/shadow similarity index 100% rename from tests/tests/subids/23_usermod_create_subids_ranges/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/24_usermod_create_subids_overlapping_ranges/config/etc/group b/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/group similarity index 100% rename from tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/group rename to tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/group diff --git a/tests/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/gshadow b/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/gshadow similarity index 100% rename from tests/tests/subids/24_usermod_create_subids_overlapping_ranges/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/subids/24_usermod_create_subids_overlapping_ranges/config/etc/shadow b/tests/subids/24_usermod_create_subids_overlapping_ranges/config/etc/shadow similarity index 100% rename from tests/tests/subids/24_usermod_create_subids_overlapping_ranges/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/25_usermod_add_range/config/etc/group b/tests/subids/25_usermod_add_range/config/etc/group similarity index 100% rename from tests/tests/subids/25_usermod_add_range/config/etc/group rename to tests/subids/25_usermod_add_range/config/etc/group diff --git a/tests/tests/subids/25_usermod_add_range/config/etc/gshadow b/tests/subids/25_usermod_add_range/config/etc/gshadow similarity index 100% rename from tests/tests/subids/25_usermod_add_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/subids/25_usermod_add_range/config/etc/shadow b/tests/subids/25_usermod_add_range/config/etc/shadow similarity index 100% rename from tests/tests/subids/25_usermod_add_range/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/26_usermod_add_overlapping_ranges/config/etc/group b/tests/subids/26_usermod_add_overlapping_ranges/config/etc/group similarity index 100% rename from tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/group rename to tests/subids/26_usermod_add_overlapping_ranges/config/etc/group diff --git a/tests/tests/subids/26_usermod_add_overlapping_ranges/config/etc/gshadow b/tests/subids/26_usermod_add_overlapping_ranges/config/etc/gshadow similarity index 100% rename from tests/tests/subids/26_usermod_add_overlapping_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/subids/26_usermod_add_overlapping_ranges/config/etc/shadow b/tests/subids/26_usermod_add_overlapping_ranges/config/etc/shadow similarity index 100% rename from tests/tests/subids/26_usermod_add_overlapping_ranges/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/27_usermod_remove_range_all/config/etc/group b/tests/subids/27_usermod_remove_range_all/config/etc/group similarity index 100% rename from tests/tests/subids/27_usermod_remove_range_all/config/etc/group rename to tests/subids/27_usermod_remove_range_all/config/etc/group diff --git a/tests/tests/subids/27_usermod_remove_range_all/config/etc/gshadow b/tests/subids/27_usermod_remove_range_all/config/etc/gshadow similarity index 100% rename from tests/tests/subids/27_usermod_remove_range_all/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/27_usermod_remove_range_all/config/etc/shadow b/tests/subids/27_usermod_remove_range_all/config/etc/shadow similarity index 100% rename from tests/tests/subids/27_usermod_remove_range_all/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/28_usermod_remove_range_partial_begin/config/etc/group b/tests/subids/28_usermod_remove_range_partial_begin/config/etc/group similarity index 100% rename from tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/group rename to tests/subids/28_usermod_remove_range_partial_begin/config/etc/group diff --git a/tests/tests/subids/28_usermod_remove_range_partial_begin/config/etc/gshadow b/tests/subids/28_usermod_remove_range_partial_begin/config/etc/gshadow similarity index 100% rename from tests/tests/subids/28_usermod_remove_range_partial_begin/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/28_usermod_remove_range_partial_begin/config/etc/shadow b/tests/subids/28_usermod_remove_range_partial_begin/config/etc/shadow similarity index 100% rename from tests/tests/subids/28_usermod_remove_range_partial_begin/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/29_usermod_remove_range_partial_middle/config/etc/group b/tests/subids/29_usermod_remove_range_partial_middle/config/etc/group similarity index 100% rename from tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/group rename to tests/subids/29_usermod_remove_range_partial_middle/config/etc/group diff --git a/tests/tests/subids/29_usermod_remove_range_partial_middle/config/etc/gshadow b/tests/subids/29_usermod_remove_range_partial_middle/config/etc/gshadow similarity index 100% rename from tests/tests/subids/29_usermod_remove_range_partial_middle/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/29_usermod_remove_range_partial_middle/config/etc/shadow b/tests/subids/29_usermod_remove_range_partial_middle/config/etc/shadow similarity index 100% rename from tests/tests/subids/29_usermod_remove_range_partial_middle/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/30_usermod_remove_range_partial_end/config/etc/group b/tests/subids/30_usermod_remove_range_partial_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/30_usermod_remove_range_partial_end/config/etc/group diff --git a/tests/tests/subids/30_usermod_remove_range_partial_end/config/etc/gshadow b/tests/subids/30_usermod_remove_range_partial_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/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/30_usermod_remove_range_partial_end/config/etc/shadow b/tests/subids/30_usermod_remove_range_partial_end/config/etc/shadow similarity index 100% rename from tests/tests/subids/30_usermod_remove_range_partial_end/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/31_usermod_remove_outside_range/config/etc/group b/tests/subids/31_usermod_remove_outside_range/config/etc/group similarity index 100% rename from tests/tests/subids/31_usermod_remove_outside_range/config/etc/group rename to tests/subids/31_usermod_remove_outside_range/config/etc/group diff --git a/tests/tests/subids/31_usermod_remove_outside_range/config/etc/gshadow b/tests/subids/31_usermod_remove_outside_range/config/etc/gshadow similarity index 100% rename from tests/tests/subids/31_usermod_remove_outside_range/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/31_usermod_remove_outside_range/config/etc/shadow b/tests/subids/31_usermod_remove_outside_range/config/etc/shadow similarity index 100% rename from tests/tests/subids/31_usermod_remove_outside_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/32_usermod_remove_overlapping_range_begin/config/etc/group b/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/group similarity index 100% rename from tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/group rename to tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/group diff --git a/tests/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/gshadow b/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/gshadow similarity index 100% rename from tests/tests/subids/32_usermod_remove_overlapping_range_begin/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/32_usermod_remove_overlapping_range_begin/config/etc/shadow b/tests/subids/32_usermod_remove_overlapping_range_begin/config/etc/shadow similarity index 100% rename from tests/tests/subids/32_usermod_remove_overlapping_range_begin/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/33_usermod_remove_overlapping_range_end/config/etc/group b/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/group similarity index 100% rename from tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/group rename to tests/subids/33_usermod_remove_overlapping_range_end/config/etc/group diff --git a/tests/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/gshadow b/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/gshadow similarity index 100% rename from tests/tests/subids/33_usermod_remove_overlapping_range_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/33_usermod_remove_overlapping_range_end/config/etc/shadow b/tests/subids/33_usermod_remove_overlapping_range_end/config/etc/shadow similarity index 100% rename from tests/tests/subids/33_usermod_remove_overlapping_range_end/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/34_usermod_remove_overlapping_range_all/config/etc/group b/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/group similarity index 100% rename from tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/group rename to tests/subids/34_usermod_remove_overlapping_range_all/config/etc/group diff --git a/tests/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/gshadow b/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/gshadow similarity index 100% rename from tests/tests/subids/34_usermod_remove_overlapping_range_all/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/34_usermod_remove_overlapping_range_all/config/etc/shadow b/tests/subids/34_usermod_remove_overlapping_range_all/config/etc/shadow similarity index 100% rename from tests/tests/subids/34_usermod_remove_overlapping_range_all/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/35_usermod_remove_only_user_ranges/config/etc/group b/tests/subids/35_usermod_remove_only_user_ranges/config/etc/group similarity index 100% rename from tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/group rename to tests/subids/35_usermod_remove_only_user_ranges/config/etc/group diff --git a/tests/tests/subids/35_usermod_remove_only_user_ranges/config/etc/gshadow b/tests/subids/35_usermod_remove_only_user_ranges/config/etc/gshadow similarity index 100% rename from tests/tests/subids/35_usermod_remove_only_user_ranges/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/35_usermod_remove_only_user_ranges/config/etc/shadow b/tests/subids/35_usermod_remove_only_user_ranges/config/etc/shadow similarity index 100% rename from tests/tests/subids/35_usermod_remove_only_user_ranges/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/36_usermod_remove_with_comment/config/etc/group b/tests/subids/36_usermod_remove_with_comment/config/etc/group similarity index 100% rename from tests/tests/subids/36_usermod_remove_with_comment/config/etc/group rename to tests/subids/36_usermod_remove_with_comment/config/etc/group diff --git a/tests/tests/subids/36_usermod_remove_with_comment/config/etc/gshadow b/tests/subids/36_usermod_remove_with_comment/config/etc/gshadow similarity index 100% rename from tests/tests/subids/36_usermod_remove_with_comment/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/36_usermod_remove_with_comment/config/etc/shadow b/tests/subids/36_usermod_remove_with_comment/config/etc/shadow similarity index 100% rename from tests/tests/subids/36_usermod_remove_with_comment/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/37_usermod_-v_invalid_range/config/etc/group b/tests/subids/37_usermod_-v_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/37_usermod_-v_invalid_range/config/etc/group diff --git a/tests/tests/subids/37_usermod_-v_invalid_range/config/etc/gshadow b/tests/subids/37_usermod_-v_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/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/37_usermod_-v_invalid_range/config/etc/shadow b/tests/subids/37_usermod_-v_invalid_range/config/etc/shadow similarity index 100% rename from tests/tests/subids/37_usermod_-v_invalid_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/38_usermod_-V_invalid_range/config/etc/group b/tests/subids/38_usermod_-V_invalid_range/config/etc/group similarity index 100% rename from tests/tests/subids/38_usermod_-V_invalid_range/config/etc/group rename to tests/subids/38_usermod_-V_invalid_range/config/etc/group diff --git a/tests/tests/subids/38_usermod_-V_invalid_range/config/etc/gshadow b/tests/subids/38_usermod_-V_invalid_range/config/etc/gshadow similarity index 100% rename from tests/tests/subids/38_usermod_-V_invalid_range/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/38_usermod_-V_invalid_range/config/etc/shadow b/tests/subids/38_usermod_-V_invalid_range/config/etc/shadow similarity index 100% rename from tests/tests/subids/38_usermod_-V_invalid_range/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/39_usermod_-w_invalid_range/config/etc/group b/tests/subids/39_usermod_-w_invalid_range/config/etc/group similarity index 100% rename from tests/tests/subids/39_usermod_-w_invalid_range/config/etc/group rename to tests/subids/39_usermod_-w_invalid_range/config/etc/group diff --git a/tests/tests/subids/39_usermod_-w_invalid_range/config/etc/gshadow b/tests/subids/39_usermod_-w_invalid_range/config/etc/gshadow similarity index 100% rename from tests/tests/subids/39_usermod_-w_invalid_range/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/39_usermod_-w_invalid_range/config/etc/shadow b/tests/subids/39_usermod_-w_invalid_range/config/etc/shadow similarity index 100% rename from tests/tests/subids/39_usermod_-w_invalid_range/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/40_usermod_-W_invalid_range/config/etc/group b/tests/subids/40_usermod_-W_invalid_range/config/etc/group similarity index 100% rename from tests/tests/subids/40_usermod_-W_invalid_range/config/etc/group rename to tests/subids/40_usermod_-W_invalid_range/config/etc/group diff --git a/tests/tests/subids/40_usermod_-W_invalid_range/config/etc/gshadow b/tests/subids/40_usermod_-W_invalid_range/config/etc/gshadow similarity index 100% rename from tests/tests/subids/40_usermod_-W_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/40_usermod_-W_invalid_range/config/etc/shadow b/tests/subids/40_usermod_-W_invalid_range/config/etc/shadow similarity index 100% rename from tests/tests/subids/40_usermod_-W_invalid_range/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/41_usermod_locked_subuid/config.txt b/tests/subids/41_usermod_locked_subuid/config.txt similarity index 100% rename from tests/tests/subids/41_usermod_locked_subuid/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/41_usermod_locked_subuid/config/etc/shadow b/tests/subids/41_usermod_locked_subuid/config/etc/shadow similarity index 100% rename from tests/tests/subids/41_usermod_locked_subuid/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/42_usermod_locked_subgid/config.txt b/tests/subids/42_usermod_locked_subgid/config.txt similarity index 100% rename from tests/tests/subids/42_usermod_locked_subgid/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/42_usermod_locked_subgid/config/etc/shadow b/tests/subids/42_usermod_locked_subgid/config/etc/shadow similarity index 100% rename from tests/tests/subids/42_usermod_locked_subgid/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/43_usermod_-w_no_subgid/config.txt b/tests/subids/43_usermod_-w_no_subgid/config.txt similarity index 100% rename from tests/tests/subids/43_usermod_-w_no_subgid/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/43_usermod_-w_no_subgid/config/etc/shadow b/tests/subids/43_usermod_-w_no_subgid/config/etc/shadow similarity index 100% rename from tests/tests/subids/43_usermod_-w_no_subgid/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/44_usermod_-W_no_subgid/config.txt b/tests/subids/44_usermod_-W_no_subgid/config.txt similarity index 100% rename from tests/tests/subids/44_usermod_-W_no_subgid/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/44_usermod_-W_no_subgid/config/etc/shadow b/tests/subids/44_usermod_-W_no_subgid/config/etc/shadow similarity index 100% rename from tests/tests/subids/44_usermod_-W_no_subgid/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/45_usermod_-v_no_subgid/config.txt b/tests/subids/45_usermod_-v_no_subgid/config.txt similarity index 100% rename from tests/tests/subids/45_usermod_-v_no_subgid/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/45_usermod_-v_no_subgid/config/etc/shadow b/tests/subids/45_usermod_-v_no_subgid/config/etc/shadow similarity index 100% rename from tests/tests/subids/45_usermod_-v_no_subgid/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/46_usermod_-V_no_subgid/config.txt b/tests/subids/46_usermod_-V_no_subgid/config.txt similarity index 100% rename from tests/tests/subids/46_usermod_-V_no_subgid/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/46_usermod_-V_no_subgid/config/etc/shadow b/tests/subids/46_usermod_-V_no_subgid/config/etc/shadow similarity index 100% rename from tests/tests/subids/46_usermod_-V_no_subgid/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/47_usermod_-v_invalid_range2/config/etc/group b/tests/subids/47_usermod_-v_invalid_range2/config/etc/group similarity index 100% rename from tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/group rename to tests/subids/47_usermod_-v_invalid_range2/config/etc/group diff --git a/tests/tests/subids/47_usermod_-v_invalid_range2/config/etc/gshadow b/tests/subids/47_usermod_-v_invalid_range2/config/etc/gshadow similarity index 100% rename from tests/tests/subids/47_usermod_-v_invalid_range2/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/47_usermod_-v_invalid_range2/config/etc/shadow b/tests/subids/47_usermod_-v_invalid_range2/config/etc/shadow similarity index 100% rename from tests/tests/subids/47_usermod_-v_invalid_range2/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/48_usermod_-v_invalid_range3/config/etc/group b/tests/subids/48_usermod_-v_invalid_range3/config/etc/group similarity index 100% rename from tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/group rename to tests/subids/48_usermod_-v_invalid_range3/config/etc/group diff --git a/tests/tests/subids/48_usermod_-v_invalid_range3/config/etc/gshadow b/tests/subids/48_usermod_-v_invalid_range3/config/etc/gshadow similarity index 100% rename from tests/tests/subids/48_usermod_-v_invalid_range3/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/48_usermod_-v_invalid_range3/config/etc/shadow b/tests/subids/48_usermod_-v_invalid_range3/config/etc/shadow similarity index 100% rename from tests/tests/subids/48_usermod_-v_invalid_range3/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/49_usermod_-v_invalid_range4/config/etc/group b/tests/subids/49_usermod_-v_invalid_range4/config/etc/group similarity index 100% rename from tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/group rename to tests/subids/49_usermod_-v_invalid_range4/config/etc/group diff --git a/tests/tests/subids/49_usermod_-v_invalid_range4/config/etc/gshadow b/tests/subids/49_usermod_-v_invalid_range4/config/etc/gshadow similarity index 100% rename from tests/tests/subids/49_usermod_-v_invalid_range4/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/49_usermod_-v_invalid_range4/config/etc/shadow b/tests/subids/49_usermod_-v_invalid_range4/config/etc/shadow similarity index 100% rename from tests/tests/subids/49_usermod_-v_invalid_range4/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/50_usermod_-v_invalid_range5/config/etc/group b/tests/subids/50_usermod_-v_invalid_range5/config/etc/group similarity index 100% rename from tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/group rename to tests/subids/50_usermod_-v_invalid_range5/config/etc/group diff --git a/tests/tests/subids/50_usermod_-v_invalid_range5/config/etc/gshadow b/tests/subids/50_usermod_-v_invalid_range5/config/etc/gshadow similarity index 100% rename from tests/tests/subids/50_usermod_-v_invalid_range5/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/50_usermod_-v_invalid_range5/config/etc/shadow b/tests/subids/50_usermod_-v_invalid_range5/config/etc/shadow similarity index 100% rename from tests/tests/subids/50_usermod_-v_invalid_range5/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/51_usermod_-v_invalid_range6/config/etc/group b/tests/subids/51_usermod_-v_invalid_range6/config/etc/group similarity index 100% rename from tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/group rename to tests/subids/51_usermod_-v_invalid_range6/config/etc/group diff --git a/tests/tests/subids/51_usermod_-v_invalid_range6/config/etc/gshadow b/tests/subids/51_usermod_-v_invalid_range6/config/etc/gshadow similarity index 100% rename from tests/tests/subids/51_usermod_-v_invalid_range6/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/51_usermod_-v_invalid_range6/config/etc/shadow b/tests/subids/51_usermod_-v_invalid_range6/config/etc/shadow similarity index 100% rename from tests/tests/subids/51_usermod_-v_invalid_range6/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/52_usermod_-v_invalid_range7/config/etc/group b/tests/subids/52_usermod_-v_invalid_range7/config/etc/group similarity index 100% rename from tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/group rename to tests/subids/52_usermod_-v_invalid_range7/config/etc/group diff --git a/tests/tests/subids/52_usermod_-v_invalid_range7/config/etc/gshadow b/tests/subids/52_usermod_-v_invalid_range7/config/etc/gshadow similarity index 100% rename from tests/tests/subids/52_usermod_-v_invalid_range7/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/52_usermod_-v_invalid_range7/config/etc/shadow b/tests/subids/52_usermod_-v_invalid_range7/config/etc/shadow similarity index 100% rename from tests/tests/subids/52_usermod_-v_invalid_range7/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/53_userdel_one_subuid_range/config/etc/group b/tests/subids/53_userdel_one_subuid_range/config/etc/group similarity index 100% rename from tests/tests/subids/53_userdel_one_subuid_range/config/etc/group rename to tests/subids/53_userdel_one_subuid_range/config/etc/group diff --git a/tests/tests/subids/53_userdel_one_subuid_range/config/etc/gshadow b/tests/subids/53_userdel_one_subuid_range/config/etc/gshadow similarity index 100% rename from tests/tests/subids/53_userdel_one_subuid_range/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/53_userdel_one_subuid_range/config/etc/shadow b/tests/subids/53_userdel_one_subuid_range/config/etc/shadow similarity index 100% rename from tests/tests/subids/53_userdel_one_subuid_range/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/53_userdel_one_subuid_range/data/passwd b/tests/subids/53_userdel_one_subuid_range/data/passwd similarity index 100% rename from tests/tests/subids/53_userdel_one_subuid_range/data/passwd rename to tests/subids/53_userdel_one_subuid_range/data/passwd diff --git a/tests/tests/subids/53_userdel_one_subuid_range/data/shadow b/tests/subids/53_userdel_one_subuid_range/data/shadow similarity index 100% rename from tests/tests/subids/53_userdel_one_subuid_range/data/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/54_userdel_one_subgid_range/config/etc/group b/tests/subids/54_userdel_one_subgid_range/config/etc/group similarity index 100% rename from tests/tests/subids/54_userdel_one_subgid_range/config/etc/group rename to tests/subids/54_userdel_one_subgid_range/config/etc/group diff --git a/tests/tests/subids/54_userdel_one_subgid_range/config/etc/gshadow b/tests/subids/54_userdel_one_subgid_range/config/etc/gshadow similarity index 100% rename from tests/tests/subids/54_userdel_one_subgid_range/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/54_userdel_one_subgid_range/config/etc/shadow b/tests/subids/54_userdel_one_subgid_range/config/etc/shadow similarity index 100% rename from tests/tests/subids/54_userdel_one_subgid_range/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/54_userdel_one_subgid_range/data/passwd b/tests/subids/54_userdel_one_subgid_range/data/passwd similarity index 100% rename from tests/tests/subids/54_userdel_one_subgid_range/data/passwd rename to tests/subids/54_userdel_one_subgid_range/data/passwd diff --git a/tests/tests/subids/54_userdel_one_subgid_range/data/shadow b/tests/subids/54_userdel_one_subgid_range/data/shadow similarity index 100% rename from tests/tests/subids/54_userdel_one_subgid_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/55_userdel_no_subuid/config/etc/group b/tests/subids/55_userdel_no_subuid/config/etc/group similarity index 100% rename from tests/tests/subids/55_userdel_no_subuid/config/etc/group rename to tests/subids/55_userdel_no_subuid/config/etc/group diff --git a/tests/tests/subids/55_userdel_no_subuid/config/etc/gshadow b/tests/subids/55_userdel_no_subuid/config/etc/gshadow similarity index 100% rename from tests/tests/subids/55_userdel_no_subuid/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/55_userdel_no_subuid/config/etc/shadow b/tests/subids/55_userdel_no_subuid/config/etc/shadow similarity index 100% rename from tests/tests/subids/55_userdel_no_subuid/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/55_userdel_no_subuid/data/passwd b/tests/subids/55_userdel_no_subuid/data/passwd similarity index 100% rename from tests/tests/subids/55_userdel_no_subuid/data/passwd rename to tests/subids/55_userdel_no_subuid/data/passwd diff --git a/tests/tests/subids/55_userdel_no_subuid/data/shadow b/tests/subids/55_userdel_no_subuid/data/shadow similarity index 100% rename from tests/tests/subids/55_userdel_no_subuid/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/56_userdel_no_subgid/config/etc/group b/tests/subids/56_userdel_no_subgid/config/etc/group similarity index 100% rename from tests/tests/subids/56_userdel_no_subgid/config/etc/group rename to tests/subids/56_userdel_no_subgid/config/etc/group diff --git a/tests/tests/subids/56_userdel_no_subgid/config/etc/gshadow b/tests/subids/56_userdel_no_subgid/config/etc/gshadow similarity index 100% rename from tests/tests/subids/56_userdel_no_subgid/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/56_userdel_no_subgid/config/etc/shadow b/tests/subids/56_userdel_no_subgid/config/etc/shadow similarity index 100% rename from tests/tests/subids/56_userdel_no_subgid/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/56_userdel_no_subgid/data/passwd b/tests/subids/56_userdel_no_subgid/data/passwd similarity index 100% rename from tests/tests/subids/56_userdel_no_subgid/data/passwd rename to tests/subids/56_userdel_no_subgid/data/passwd diff --git a/tests/tests/subids/56_userdel_no_subgid/data/shadow b/tests/subids/56_userdel_no_subgid/data/shadow similarity index 100% rename from tests/tests/subids/56_userdel_no_subgid/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/57_userdel_multiple_ranges/config/etc/group b/tests/subids/57_userdel_multiple_ranges/config/etc/group similarity index 100% rename from tests/tests/subids/57_userdel_multiple_ranges/config/etc/group rename to tests/subids/57_userdel_multiple_ranges/config/etc/group diff --git a/tests/tests/subids/57_userdel_multiple_ranges/config/etc/gshadow b/tests/subids/57_userdel_multiple_ranges/config/etc/gshadow similarity index 100% rename from tests/tests/subids/57_userdel_multiple_ranges/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/57_userdel_multiple_ranges/config/etc/shadow b/tests/subids/57_userdel_multiple_ranges/config/etc/shadow similarity index 100% rename from tests/tests/subids/57_userdel_multiple_ranges/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/57_userdel_multiple_ranges/data/passwd b/tests/subids/57_userdel_multiple_ranges/data/passwd similarity index 100% rename from tests/tests/subids/57_userdel_multiple_ranges/data/passwd rename to tests/subids/57_userdel_multiple_ranges/data/passwd diff --git a/tests/tests/subids/57_userdel_multiple_ranges/data/shadow b/tests/subids/57_userdel_multiple_ranges/data/shadow similarity index 100% rename from tests/tests/subids/57_userdel_multiple_ranges/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/58_newusers_with_subids/config.txt b/tests/subids/58_newusers_with_subids/config.txt similarity index 100% rename from tests/tests/subids/58_newusers_with_subids/config.txt rename to tests/subids/58_newusers_with_subids/config.txt diff --git a/tests/tests/subids/58_newusers_with_subids/config/etc/group b/tests/subids/58_newusers_with_subids/config/etc/group similarity index 100% rename from tests/tests/subids/58_newusers_with_subids/config/etc/group rename to tests/subids/58_newusers_with_subids/config/etc/group diff --git a/tests/tests/subids/58_newusers_with_subids/config/etc/gshadow b/tests/subids/58_newusers_with_subids/config/etc/gshadow similarity index 100% rename from tests/tests/subids/58_newusers_with_subids/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/58_newusers_with_subids/config/etc/passwd b/tests/subids/58_newusers_with_subids/config/etc/passwd similarity index 100% rename from tests/tests/subids/58_newusers_with_subids/config/etc/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/58_newusers_with_subids/data/group b/tests/subids/58_newusers_with_subids/data/group similarity index 100% rename from tests/tests/subids/58_newusers_with_subids/data/group rename to tests/subids/58_newusers_with_subids/data/group diff --git a/tests/tests/subids/58_newusers_with_subids/data/gshadow b/tests/subids/58_newusers_with_subids/data/gshadow similarity index 100% rename from tests/tests/subids/58_newusers_with_subids/data/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/59_newusers_no_subuid/config.txt b/tests/subids/59_newusers_no_subuid/config.txt similarity index 100% rename from tests/tests/subids/59_newusers_no_subuid/config.txt rename to tests/subids/59_newusers_no_subuid/config.txt diff --git a/tests/tests/subids/59_newusers_no_subuid/config/etc/group b/tests/subids/59_newusers_no_subuid/config/etc/group similarity index 100% rename from tests/tests/subids/59_newusers_no_subuid/config/etc/group rename to tests/subids/59_newusers_no_subuid/config/etc/group diff --git a/tests/tests/subids/59_newusers_no_subuid/config/etc/gshadow b/tests/subids/59_newusers_no_subuid/config/etc/gshadow similarity index 100% rename from tests/tests/subids/59_newusers_no_subuid/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/59_newusers_no_subuid/config/etc/passwd b/tests/subids/59_newusers_no_subuid/config/etc/passwd similarity index 100% rename from tests/tests/subids/59_newusers_no_subuid/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/59_newusers_no_subuid/data/group b/tests/subids/59_newusers_no_subuid/data/group similarity index 100% rename from tests/tests/subids/59_newusers_no_subuid/data/group rename to tests/subids/59_newusers_no_subuid/data/group diff --git a/tests/tests/subids/59_newusers_no_subuid/data/gshadow b/tests/subids/59_newusers_no_subuid/data/gshadow similarity index 100% rename from tests/tests/subids/59_newusers_no_subuid/data/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/60_newusers_no_subgid/config.txt b/tests/subids/60_newusers_no_subgid/config.txt similarity index 100% rename from tests/tests/subids/60_newusers_no_subgid/config.txt rename to tests/subids/60_newusers_no_subgid/config.txt diff --git a/tests/tests/subids/60_newusers_no_subgid/config/etc/group b/tests/subids/60_newusers_no_subgid/config/etc/group similarity index 100% rename from tests/tests/subids/60_newusers_no_subgid/config/etc/group rename to tests/subids/60_newusers_no_subgid/config/etc/group diff --git a/tests/tests/subids/60_newusers_no_subgid/config/etc/gshadow b/tests/subids/60_newusers_no_subgid/config/etc/gshadow similarity index 100% rename from tests/tests/subids/60_newusers_no_subgid/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/60_newusers_no_subgid/config/etc/passwd b/tests/subids/60_newusers_no_subgid/config/etc/passwd similarity index 100% rename from tests/tests/subids/60_newusers_no_subgid/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/60_newusers_no_subgid/data/group b/tests/subids/60_newusers_no_subgid/data/group similarity index 100% rename from tests/tests/subids/60_newusers_no_subgid/data/group rename to tests/subids/60_newusers_no_subgid/data/group diff --git a/tests/tests/subids/60_newusers_no_subgid/data/gshadow b/tests/subids/60_newusers_no_subgid/data/gshadow similarity index 100% rename from tests/tests/subids/60_newusers_no_subgid/data/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/61_newusers_user_already_has_subgids/config.txt b/tests/subids/61_newusers_user_already_has_subgids/config.txt similarity index 100% rename from tests/tests/subids/61_newusers_user_already_has_subgids/config.txt rename to tests/subids/61_newusers_user_already_has_subgids/config.txt diff --git a/tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/group b/tests/subids/61_newusers_user_already_has_subgids/config/etc/group similarity index 100% rename from tests/tests/subids/61_newusers_user_already_has_subgids/config/etc/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/61_newusers_user_already_has_subgids/data/group b/tests/subids/61_newusers_user_already_has_subgids/data/group similarity index 100% rename from tests/tests/subids/61_newusers_user_already_has_subgids/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/62_newusers_user_already_has_subuids/config.txt b/tests/subids/62_newusers_user_already_has_subuids/config.txt similarity index 100% rename from tests/tests/subids/62_newusers_user_already_has_subuids/config.txt rename to tests/subids/62_newusers_user_already_has_subuids/config.txt diff --git a/tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/group b/tests/subids/62_newusers_user_already_has_subuids/config/etc/group similarity index 100% rename from tests/tests/subids/62_newusers_user_already_has_subuids/config/etc/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/62_newusers_user_already_has_subuids/data/group b/tests/subids/62_newusers_user_already_has_subuids/data/group similarity index 100% rename from tests/tests/subids/62_newusers_user_already_has_subuids/data/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/63_useradd_fill_gap4/config.txt b/tests/subids/63_useradd_fill_gap4/config.txt similarity index 100% rename from tests/tests/subids/63_useradd_fill_gap4/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/63_useradd_fill_gap4/config/etc/group b/tests/subids/63_useradd_fill_gap4/config/etc/group similarity index 100% rename from tests/tests/subids/63_useradd_fill_gap4/config/etc/group rename to tests/subids/63_useradd_fill_gap4/config/etc/group diff --git a/tests/tests/subids/63_useradd_fill_gap4/config/etc/gshadow b/tests/subids/63_useradd_fill_gap4/config/etc/gshadow similarity index 100% rename from tests/tests/subids/63_useradd_fill_gap4/config/etc/gshadow rename to tests/subids/63_useradd_fill_gap4/config/etc/gshadow diff --git a/tests/tests/subids/63_useradd_fill_gap4/config/etc/passwd b/tests/subids/63_useradd_fill_gap4/config/etc/passwd similarity index 100% rename from tests/tests/subids/63_useradd_fill_gap4/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/63_useradd_fill_gap4/data/group b/tests/subids/63_useradd_fill_gap4/data/group similarity index 100% rename from tests/tests/subids/63_useradd_fill_gap4/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/64_useradd_fill_gap5/config.txt b/tests/subids/64_useradd_fill_gap5/config.txt similarity index 100% rename from tests/tests/subids/64_useradd_fill_gap5/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/64_useradd_fill_gap5/config/etc/group b/tests/subids/64_useradd_fill_gap5/config/etc/group similarity index 100% rename from tests/tests/subids/64_useradd_fill_gap5/config/etc/group rename to tests/subids/64_useradd_fill_gap5/config/etc/group diff --git a/tests/tests/subids/64_useradd_fill_gap5/config/etc/gshadow b/tests/subids/64_useradd_fill_gap5/config/etc/gshadow similarity index 100% rename from tests/tests/subids/64_useradd_fill_gap5/config/etc/gshadow rename to tests/subids/64_useradd_fill_gap5/config/etc/gshadow diff --git a/tests/tests/subids/64_useradd_fill_gap5/config/etc/passwd b/tests/subids/64_useradd_fill_gap5/config/etc/passwd similarity index 100% rename from tests/tests/subids/64_useradd_fill_gap5/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/64_useradd_fill_gap5/data/group b/tests/subids/64_useradd_fill_gap5/data/group similarity index 100% rename from tests/tests/subids/64_useradd_fill_gap5/data/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/65_useradd_fill_gap6/config.txt b/tests/subids/65_useradd_fill_gap6/config.txt similarity index 100% rename from tests/tests/subids/65_useradd_fill_gap6/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/65_useradd_fill_gap6/config/etc/group b/tests/subids/65_useradd_fill_gap6/config/etc/group similarity index 100% rename from tests/tests/subids/65_useradd_fill_gap6/config/etc/group rename to tests/subids/65_useradd_fill_gap6/config/etc/group diff --git a/tests/tests/subids/65_useradd_fill_gap6/config/etc/gshadow b/tests/subids/65_useradd_fill_gap6/config/etc/gshadow similarity index 100% rename from tests/tests/subids/65_useradd_fill_gap6/config/etc/gshadow rename to tests/subids/65_useradd_fill_gap6/config/etc/gshadow diff --git a/tests/tests/subids/65_useradd_fill_gap6/config/etc/passwd b/tests/subids/65_useradd_fill_gap6/config/etc/passwd similarity index 100% rename from tests/tests/subids/65_useradd_fill_gap6/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/65_useradd_fill_gap6/data/group b/tests/subids/65_useradd_fill_gap6/data/group similarity index 100% rename from tests/tests/subids/65_useradd_fill_gap6/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/66_subordinate_range_cmp/config.txt b/tests/subids/66_subordinate_range_cmp/config.txt similarity index 100% rename from tests/tests/subids/66_subordinate_range_cmp/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/66_subordinate_range_cmp/config/etc/group b/tests/subids/66_subordinate_range_cmp/config/etc/group similarity index 100% rename from tests/tests/subids/66_subordinate_range_cmp/config/etc/group rename to tests/subids/66_subordinate_range_cmp/config/etc/group diff --git a/tests/tests/subids/66_subordinate_range_cmp/config/etc/gshadow b/tests/subids/66_subordinate_range_cmp/config/etc/gshadow similarity index 100% rename from tests/tests/subids/66_subordinate_range_cmp/config/etc/gshadow rename to tests/subids/66_subordinate_range_cmp/config/etc/gshadow diff --git a/tests/tests/subids/66_subordinate_range_cmp/config/etc/passwd b/tests/subids/66_subordinate_range_cmp/config/etc/passwd similarity index 100% rename from tests/tests/subids/66_subordinate_range_cmp/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/66_subordinate_range_cmp/data/group b/tests/subids/66_subordinate_range_cmp/data/group similarity index 100% rename from tests/tests/subids/66_subordinate_range_cmp/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/67_invalid_subuid_file1/config.txt b/tests/subids/67_invalid_subuid_file1/config.txt similarity index 100% rename from tests/tests/subids/67_invalid_subuid_file1/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/67_invalid_subuid_file1/config/etc/group b/tests/subids/67_invalid_subuid_file1/config/etc/group similarity index 100% rename from tests/tests/subids/67_invalid_subuid_file1/config/etc/group rename to tests/subids/67_invalid_subuid_file1/config/etc/group diff --git a/tests/tests/subids/67_invalid_subuid_file1/config/etc/gshadow b/tests/subids/67_invalid_subuid_file1/config/etc/gshadow similarity index 100% rename from tests/tests/subids/67_invalid_subuid_file1/config/etc/gshadow rename to tests/subids/67_invalid_subuid_file1/config/etc/gshadow diff --git a/tests/tests/subids/67_invalid_subuid_file1/config/etc/passwd b/tests/subids/67_invalid_subuid_file1/config/etc/passwd similarity index 100% rename from tests/tests/subids/67_invalid_subuid_file1/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/67_invalid_subuid_file1/data/group b/tests/subids/67_invalid_subuid_file1/data/group similarity index 100% rename from tests/tests/subids/67_invalid_subuid_file1/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/68_invalid_subuid_file2/config.txt b/tests/subids/68_invalid_subuid_file2/config.txt similarity index 100% rename from tests/tests/subids/68_invalid_subuid_file2/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/68_invalid_subuid_file2/config/etc/group b/tests/subids/68_invalid_subuid_file2/config/etc/group similarity index 100% rename from tests/tests/subids/68_invalid_subuid_file2/config/etc/group rename to tests/subids/68_invalid_subuid_file2/config/etc/group diff --git a/tests/tests/subids/68_invalid_subuid_file2/config/etc/gshadow b/tests/subids/68_invalid_subuid_file2/config/etc/gshadow similarity index 100% rename from tests/tests/subids/68_invalid_subuid_file2/config/etc/gshadow rename to tests/subids/68_invalid_subuid_file2/config/etc/gshadow diff --git a/tests/tests/subids/68_invalid_subuid_file2/config/etc/passwd b/tests/subids/68_invalid_subuid_file2/config/etc/passwd similarity index 100% rename from tests/tests/subids/68_invalid_subuid_file2/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/68_invalid_subuid_file2/data/group b/tests/subids/68_invalid_subuid_file2/data/group similarity index 100% rename from tests/tests/subids/68_invalid_subuid_file2/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/69_invalid_subuid_file3/config.txt b/tests/subids/69_invalid_subuid_file3/config.txt similarity index 100% rename from tests/tests/subids/69_invalid_subuid_file3/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/69_invalid_subuid_file3/config/etc/group b/tests/subids/69_invalid_subuid_file3/config/etc/group similarity index 100% rename from tests/tests/subids/69_invalid_subuid_file3/config/etc/group rename to tests/subids/69_invalid_subuid_file3/config/etc/group diff --git a/tests/tests/subids/69_invalid_subuid_file3/config/etc/gshadow b/tests/subids/69_invalid_subuid_file3/config/etc/gshadow similarity index 100% rename from tests/tests/subids/69_invalid_subuid_file3/config/etc/gshadow rename to tests/subids/69_invalid_subuid_file3/config/etc/gshadow diff --git a/tests/tests/subids/69_invalid_subuid_file3/config/etc/passwd b/tests/subids/69_invalid_subuid_file3/config/etc/passwd similarity index 100% rename from tests/tests/subids/69_invalid_subuid_file3/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/69_invalid_subuid_file3/data/group b/tests/subids/69_invalid_subuid_file3/data/group similarity index 100% rename from tests/tests/subids/69_invalid_subuid_file3/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/70_invalid_subuid_file4/config.txt b/tests/subids/70_invalid_subuid_file4/config.txt similarity index 100% rename from tests/tests/subids/70_invalid_subuid_file4/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/70_invalid_subuid_file4/config/etc/group b/tests/subids/70_invalid_subuid_file4/config/etc/group similarity index 100% rename from tests/tests/subids/70_invalid_subuid_file4/config/etc/group rename to tests/subids/70_invalid_subuid_file4/config/etc/group diff --git a/tests/tests/subids/70_invalid_subuid_file4/config/etc/gshadow b/tests/subids/70_invalid_subuid_file4/config/etc/gshadow similarity index 100% rename from tests/tests/subids/70_invalid_subuid_file4/config/etc/gshadow rename to tests/subids/70_invalid_subuid_file4/config/etc/gshadow diff --git a/tests/tests/subids/70_invalid_subuid_file4/config/etc/passwd b/tests/subids/70_invalid_subuid_file4/config/etc/passwd similarity index 100% rename from tests/tests/subids/70_invalid_subuid_file4/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/70_invalid_subuid_file4/data/group b/tests/subids/70_invalid_subuid_file4/data/group similarity index 100% rename from tests/tests/subids/70_invalid_subuid_file4/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/71_useradd_subids_for_system/config.txt b/tests/subids/71_useradd_subids_for_system/config.txt similarity index 100% rename from tests/tests/subids/71_useradd_subids_for_system/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/71_useradd_subids_for_system/config/etc/group b/tests/subids/71_useradd_subids_for_system/config/etc/group similarity index 100% rename from tests/tests/subids/71_useradd_subids_for_system/config/etc/group rename to tests/subids/71_useradd_subids_for_system/config/etc/group diff --git a/tests/tests/subids/71_useradd_subids_for_system/config/etc/gshadow b/tests/subids/71_useradd_subids_for_system/config/etc/gshadow similarity index 100% rename from tests/tests/subids/71_useradd_subids_for_system/config/etc/gshadow rename to tests/subids/71_useradd_subids_for_system/config/etc/gshadow diff --git a/tests/tests/subids/71_useradd_subids_for_system/config/etc/passwd b/tests/subids/71_useradd_subids_for_system/config/etc/passwd similarity index 100% rename from tests/tests/subids/71_useradd_subids_for_system/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/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/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 39e86e1a..00000000 --- a/tests/tests/unit/Makefile +++ /dev/null @@ -1,1702 +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/alx/src/shadow/stable/shadow/4.15.2/missing' aclocal-1.16 -AMTAR = $${TAR-tar} -AM_DEFAULT_VERBOSITY = 0 -AR = ar -AUTOCONF = ${SHELL} '/home/alx/src/shadow/stable/shadow/4.15.2/missing' autoconf -AUTOHEADER = ${SHELL} '/home/alx/src/shadow/stable/shadow/4.15.2/missing' autoheader -AUTOMAKE = ${SHELL} '/home/alx/src/shadow/stable/shadow/4.15.2/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 = -lcmocka -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 -FILECMD = file -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 = -isystem /usr/include/x86_64-linux-gnu/bsd -DLIBBSD_OVERLAY -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 = 4.0.0 -LIBSUBID_ABI_MAJOR = 4 -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/alx/src/shadow/stable/shadow/4.15.2/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.15.2 -PACKAGE_TARNAME = shadow -PACKAGE_URL = https://github.com/shadow-maint/shadow -PACKAGE_VERSION = 4.15.2 -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.15.2 -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/alx/src/shadow/stable/shadow/4.15.2/tests/unit -abs_srcdir = /home/alx/src/shadow/stable/shadow/4.15.2/tests/unit -abs_top_builddir = /home/alx/src/shadow/stable/shadow/4.15.2 -abs_top_srcdir = /home/alx/src/shadow/stable/shadow/4.15.2 -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/alx/src/shadow/stable/shadow/4.15.2/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 108070c3..00000000 --- a/tests/tests/unit/Makefile.in +++ /dev/null @@ -1,1702 +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@ -FILECMD = @FILECMD@ -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 -// SPDX-License-Identifier: BSD-3-Clause - - -#include - -#include // Required by -#include // Required by -#include // Required by -#include // Required by -#include - -#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 -// SPDX-License-Identifier: BSD-3-Clause - - -#include -#include -#include -#include -#include - -#include // Required by -#include // Required by -#include // Required by -#include // Required by -#include - -#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 - * SPDX-License-Identifier: BSD-3-Clause - */ - - -#include -#include -#include -#include -#include - -#include // Required by -#include // Required by -#include // Required by -#include // Required by -#include - -#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 - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include -#include -#include -#include - -#include -#include -#include - -#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 -// SPDX-License-Identifier: BSD-3-Clause - - -#include - -#include -#include - -#include // Required by -#include // Required by -#include // Required by -#include // Required by -#include - -#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 - * SPDX-License-Identifier: BSD-3-Clause - */ - - -#include - -#include - -#include // Required by -#include // Required by -#include // Required by -#include // Required by -#include - -#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 - * SPDX-License-Identifier: BSD-3-Clause - */ - - -#include - -#include - -#include // Required by -#include // Required by -#include // Required by -#include // Required by -#include - -#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 - * SPDX-License-Identifier: BSD-3-Clause - */ - - -#include -#include -#include -#include - -#include // Required by -#include // Required by -#include // Required by -#include // Required by -#include - -#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 -// SPDX-License-Identifier: BSD-3-Clause - - -#include - -#include -#include - -#include // Required by -#include // Required by -#include // Required by -#include // Required by -#include - -#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/unit/test_xasprintf.c b/tests/unit/test_xasprintf.c index 4b5d0935..4c27d78a 100644 --- a/tests/unit/test_xasprintf.c +++ b/tests/unit/test_xasprintf.c @@ -5,6 +5,7 @@ #include +#include #include #include #include @@ -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/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/usertools/01/07_useradd_numerical_primary_group/group b/tests/usertools/01/07_useradd_numerical_primary_group/group similarity index 100% rename from tests/tests/usertools/01/07_useradd_numerical_primary_group/group rename to tests/usertools/01/07_useradd_numerical_primary_group/group diff --git a/tests/tests/usertools/01/07_useradd_numerical_primary_group/gshadow b/tests/usertools/01/07_useradd_numerical_primary_group/gshadow similarity index 100% rename from tests/tests/usertools/01/07_useradd_numerical_primary_group/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/08_useradd_named_primary_group/group b/tests/usertools/01/08_useradd_named_primary_group/group similarity index 100% rename from tests/tests/usertools/01/08_useradd_named_primary_group/group rename to tests/usertools/01/08_useradd_named_primary_group/group diff --git a/tests/tests/usertools/01/08_useradd_named_primary_group/gshadow b/tests/usertools/01/08_useradd_named_primary_group/gshadow similarity index 100% rename from tests/tests/usertools/01/08_useradd_named_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/13_useradd_negative_UID/group b/tests/usertools/01/13_useradd_negative_UID/group similarity index 100% rename from tests/tests/usertools/01/13_useradd_negative_UID/group rename to tests/usertools/01/13_useradd_negative_UID/group diff --git a/tests/tests/usertools/01/13_useradd_negative_UID/gshadow b/tests/usertools/01/13_useradd_negative_UID/gshadow similarity index 100% rename from tests/tests/usertools/01/13_useradd_negative_UID/gshadow rename to tests/usertools/01/13_useradd_negative_UID/gshadow diff --git a/tests/tests/usertools/01/13_useradd_negative_UID/passwd b/tests/usertools/01/13_useradd_negative_UID/passwd similarity index 100% rename from tests/tests/usertools/01/13_useradd_negative_UID/passwd rename to tests/usertools/01/13_useradd_negative_UID/passwd diff --git a/tests/tests/usertools/01/13_useradd_negative_UID/shadow b/tests/usertools/01/13_useradd_negative_UID/shadow similarity index 100% rename from tests/tests/usertools/01/13_useradd_negative_UID/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/14_useradd_out_of_range_UID/group b/tests/usertools/01/14_useradd_out_of_range_UID/group similarity index 100% rename from tests/tests/usertools/01/14_useradd_out_of_range_UID/group rename to tests/usertools/01/14_useradd_out_of_range_UID/group diff --git a/tests/tests/usertools/01/14_useradd_out_of_range_UID/gshadow b/tests/usertools/01/14_useradd_out_of_range_UID/gshadow similarity index 100% rename from tests/tests/usertools/01/14_useradd_out_of_range_UID/gshadow rename to tests/usertools/01/14_useradd_out_of_range_UID/gshadow diff --git a/tests/tests/usertools/01/14_useradd_out_of_range_UID/passwd b/tests/usertools/01/14_useradd_out_of_range_UID/passwd similarity index 100% rename from tests/tests/usertools/01/14_useradd_out_of_range_UID/passwd rename to tests/usertools/01/14_useradd_out_of_range_UID/passwd diff --git a/tests/tests/usertools/01/14_useradd_out_of_range_UID/shadow b/tests/usertools/01/14_useradd_out_of_range_UID/shadow similarity index 100% rename from tests/tests/usertools/01/14_useradd_out_of_range_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/26_useradd_UID_-1/group b/tests/usertools/01/26_useradd_UID_-1/group similarity index 100% rename from tests/tests/usertools/01/26_useradd_UID_-1/group rename to tests/usertools/01/26_useradd_UID_-1/group diff --git a/tests/tests/usertools/01/26_useradd_UID_-1/gshadow b/tests/usertools/01/26_useradd_UID_-1/gshadow similarity index 100% rename from tests/tests/usertools/01/26_useradd_UID_-1/gshadow rename to tests/usertools/01/26_useradd_UID_-1/gshadow diff --git a/tests/tests/usertools/01/26_useradd_UID_-1/passwd b/tests/usertools/01/26_useradd_UID_-1/passwd similarity index 100% rename from tests/tests/usertools/01/26_useradd_UID_-1/passwd rename to tests/usertools/01/26_useradd_UID_-1/passwd diff --git a/tests/tests/usertools/01/26_useradd_UID_-1/shadow b/tests/usertools/01/26_useradd_UID_-1/shadow similarity index 100% rename from tests/tests/usertools/01/26_useradd_UID_-1/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/config/etc/group b/tests/usertools/01/config/etc/group similarity index 100% rename from tests/tests/usertools/01/config/etc/group rename to tests/usertools/01/config/etc/group diff --git a/tests/tests/usertools/01/config/etc/gshadow b/tests/usertools/01/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/01/config/etc/gshadow rename to tests/usertools/01/config/etc/gshadow diff --git a/tests/tests/usertools/01/config/etc/passwd b/tests/usertools/01/config/etc/passwd similarity index 100% rename from tests/tests/usertools/01/config/etc/passwd rename to tests/usertools/01/config/etc/passwd diff --git a/tests/tests/usertools/01/config/etc/shadow b/tests/usertools/01/config/etc/shadow similarity index 100% rename from tests/tests/usertools/01/config/etc/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/usertools/02/config/etc/group b/tests/usertools/02/config/etc/group similarity index 100% rename from tests/tests/usertools/02/config/etc/group rename to tests/usertools/02/config/etc/group diff --git a/tests/tests/usertools/02/config/etc/gshadow b/tests/usertools/02/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/02/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/03/config/etc/group b/tests/usertools/03/config/etc/group similarity index 100% rename from tests/tests/usertools/03/config/etc/group rename to tests/usertools/03/config/etc/group diff --git a/tests/tests/usertools/03/config/etc/gshadow b/tests/usertools/03/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/03/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/04/config/etc/group b/tests/usertools/04/config/etc/group similarity index 100% rename from tests/tests/usertools/04/config/etc/group rename to tests/usertools/04/config/etc/group diff --git a/tests/tests/usertools/04/config/etc/gshadow b/tests/usertools/04/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/04/config/etc/gshadow rename to tests/usertools/04/config/etc/gshadow diff --git a/tests/tests/usertools/04/config/etc/passwd b/tests/usertools/04/config/etc/passwd similarity index 100% rename from tests/tests/usertools/04/config/etc/passwd rename to tests/usertools/04/config/etc/passwd diff --git a/tests/tests/usertools/04/config/etc/shadow b/tests/usertools/04/config/etc/shadow similarity index 100% rename from tests/tests/usertools/04/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/usertools/05_userdel_del_from_group_members/config/etc/gshadow b/tests/usertools/05_userdel_del_from_group_members/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/05_userdel_del_from_group_members/config/etc/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/usertools/05_userdel_del_from_group_members/config/etc/shadow b/tests/usertools/05_userdel_del_from_group_members/config/etc/shadow similarity index 100% rename from tests/tests/usertools/05_userdel_del_from_group_members/config/etc/shadow rename to tests/usertools/05_userdel_del_from_group_members/config/etc/shadow diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/data/group b/tests/usertools/05_userdel_del_from_group_members/data/group similarity index 100% rename from tests/tests/usertools/05_userdel_del_from_group_members/data/group rename to tests/usertools/05_userdel_del_from_group_members/data/group diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/data/gshadow b/tests/usertools/05_userdel_del_from_group_members/data/gshadow similarity index 100% rename from tests/tests/usertools/05_userdel_del_from_group_members/data/gshadow rename to tests/usertools/05_userdel_del_from_group_members/data/gshadow diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/data/passwd b/tests/usertools/05_userdel_del_from_group_members/data/passwd similarity index 100% rename from tests/tests/usertools/05_userdel_del_from_group_members/data/passwd rename to tests/usertools/05_userdel_del_from_group_members/data/passwd diff --git a/tests/tests/usertools/05_userdel_del_from_group_members/data/shadow b/tests/usertools/05_userdel_del_from_group_members/data/shadow similarity index 100% rename from tests/tests/usertools/05_userdel_del_from_group_members/data/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/usertools/06_userdel_del_from_gshadow_members/config/etc/shadow b/tests/usertools/06_userdel_del_from_gshadow_members/config/etc/shadow similarity index 100% rename from tests/tests/usertools/06_userdel_del_from_gshadow_members/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/06_userdel_del_from_gshadow_members/data/gshadow b/tests/usertools/06_userdel_del_from_gshadow_members/data/gshadow similarity index 100% rename from tests/tests/usertools/06_userdel_del_from_gshadow_members/data/gshadow rename to tests/usertools/06_userdel_del_from_gshadow_members/data/gshadow diff --git a/tests/tests/usertools/06_userdel_del_from_gshadow_members/data/passwd b/tests/usertools/06_userdel_del_from_gshadow_members/data/passwd similarity index 100% rename from tests/tests/usertools/06_userdel_del_from_gshadow_members/data/passwd rename to tests/usertools/06_userdel_del_from_gshadow_members/data/passwd diff --git a/tests/tests/usertools/06_userdel_del_from_gshadow_members/data/shadow b/tests/usertools/06_userdel_del_from_gshadow_members/data/shadow similarity index 100% rename from tests/tests/usertools/06_userdel_del_from_gshadow_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/usertools/07_userdel_del_from_gshadow_admins/config/etc/shadow b/tests/usertools/07_userdel_del_from_gshadow_admins/config/etc/shadow similarity index 100% rename from tests/tests/usertools/07_userdel_del_from_gshadow_admins/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/07_userdel_del_from_gshadow_admins/data/passwd b/tests/usertools/07_userdel_del_from_gshadow_admins/data/passwd similarity index 100% rename from tests/tests/usertools/07_userdel_del_from_gshadow_admins/data/passwd rename to tests/usertools/07_userdel_del_from_gshadow_admins/data/passwd diff --git a/tests/tests/usertools/07_userdel_del_from_gshadow_admins/data/shadow b/tests/usertools/07_userdel_del_from_gshadow_admins/data/shadow similarity index 100% rename from tests/tests/usertools/07_userdel_del_from_gshadow_admins/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/usertools/08_userdel_del_from_group_and_gshadow/config/etc/shadow b/tests/usertools/08_userdel_del_from_group_and_gshadow/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/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/08_userdel_del_from_group_and_gshadow/data/passwd b/tests/usertools/08_userdel_del_from_group_and_gshadow/data/passwd similarity index 100% rename from tests/tests/usertools/08_userdel_del_from_group_and_gshadow/data/passwd rename to tests/usertools/08_userdel_del_from_group_and_gshadow/data/passwd diff --git a/tests/tests/usertools/08_userdel_del_from_group_and_gshadow/data/shadow b/tests/usertools/08_userdel_del_from_group_and_gshadow/data/shadow similarity index 100% rename from tests/tests/usertools/08_userdel_del_from_group_and_gshadow/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/usertools/09_userdel_del_homedir/config/etc/group b/tests/usertools/09_userdel_del_homedir/config/etc/group similarity index 100% rename from tests/tests/usertools/09_userdel_del_homedir/config/etc/group rename to tests/usertools/09_userdel_del_homedir/config/etc/group diff --git a/tests/tests/usertools/09_userdel_del_homedir/config/etc/gshadow b/tests/usertools/09_userdel_del_homedir/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/09_userdel_del_homedir/config/etc/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/usertools/09_userdel_del_homedir/config/etc/shadow b/tests/usertools/09_userdel_del_homedir/config/etc/shadow similarity index 100% rename from tests/tests/usertools/09_userdel_del_homedir/config/etc/shadow rename to tests/usertools/09_userdel_del_homedir/config/etc/shadow diff --git a/tests/tests/usertools/09_userdel_del_homedir/data/group b/tests/usertools/09_userdel_del_homedir/data/group similarity index 100% rename from tests/tests/usertools/09_userdel_del_homedir/data/group rename to tests/usertools/09_userdel_del_homedir/data/group diff --git a/tests/tests/usertools/09_userdel_del_homedir/data/gshadow b/tests/usertools/09_userdel_del_homedir/data/gshadow similarity index 100% rename from tests/tests/usertools/09_userdel_del_homedir/data/gshadow rename to tests/usertools/09_userdel_del_homedir/data/gshadow diff --git a/tests/tests/usertools/09_userdel_del_homedir/data/passwd b/tests/usertools/09_userdel_del_homedir/data/passwd similarity index 100% rename from tests/tests/usertools/09_userdel_del_homedir/data/passwd rename to tests/usertools/09_userdel_del_homedir/data/passwd diff --git a/tests/tests/usertools/09_userdel_del_homedir/data/shadow b/tests/usertools/09_userdel_del_homedir/data/shadow similarity index 100% rename from tests/tests/usertools/09_userdel_del_homedir/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/usertools/10_userdel_del_homedir_wrong_owner/config/etc/gshadow b/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/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/usertools/10_userdel_del_homedir_wrong_owner/config/etc/shadow b/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/shadow similarity index 100% rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/shadow rename to tests/usertools/10_userdel_del_homedir_wrong_owner/config/etc/shadow diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/group b/tests/usertools/10_userdel_del_homedir_wrong_owner/data/group similarity index 100% rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/group rename to tests/usertools/10_userdel_del_homedir_wrong_owner/data/group diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/gshadow b/tests/usertools/10_userdel_del_homedir_wrong_owner/data/gshadow similarity index 100% rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/gshadow rename to tests/usertools/10_userdel_del_homedir_wrong_owner/data/gshadow diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/passwd b/tests/usertools/10_userdel_del_homedir_wrong_owner/data/passwd similarity index 100% rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/passwd rename to tests/usertools/10_userdel_del_homedir_wrong_owner/data/passwd diff --git a/tests/tests/usertools/10_userdel_del_homedir_wrong_owner/data/shadow b/tests/usertools/10_userdel_del_homedir_wrong_owner/data/shadow similarity index 100% rename from tests/tests/usertools/10_userdel_del_homedir_wrong_owner/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/11_usermod_move_homedir/config/etc/gshadow b/tests/usertools/11_usermod_move_homedir/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/11_usermod_move_homedir/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/11_usermod_move_homedir/config/etc/shadow b/tests/usertools/11_usermod_move_homedir/config/etc/shadow similarity index 100% rename from tests/tests/usertools/11_usermod_move_homedir/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/12_usermod_move_homedir_dev_null/config/etc/gshadow b/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/12_usermod_move_homedir_dev_null/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/12_usermod_move_homedir_dev_null/config/etc/shadow b/tests/usertools/12_usermod_move_homedir_dev_null/config/etc/shadow similarity index 100% rename from tests/tests/usertools/12_usermod_move_homedir_dev_null/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/13_usermod_move_homedir_file/config/etc/gshadow b/tests/usertools/13_usermod_move_homedir_file/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/13_usermod_move_homedir_file/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/13_usermod_move_homedir_file/config/etc/shadow b/tests/usertools/13_usermod_move_homedir_file/config/etc/shadow similarity index 100% rename from tests/tests/usertools/13_usermod_move_homedir_file/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/14_usermod_move_homedir_other_device/config/etc/gshadow b/tests/usertools/14_usermod_move_homedir_other_device/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/14_usermod_move_homedir_other_device/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/14_usermod_move_homedir_other_device/config/etc/shadow b/tests/usertools/14_usermod_move_homedir_other_device/config/etc/shadow similarity index 100% rename from tests/tests/usertools/14_usermod_move_homedir_other_device/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/usertools/15_usermod_change_supplementary_groups/config/etc/group b/tests/usertools/15_usermod_change_supplementary_groups/config/etc/group similarity index 100% rename from tests/tests/usertools/15_usermod_change_supplementary_groups/config/etc/group rename to tests/usertools/15_usermod_change_supplementary_groups/config/etc/group diff --git a/tests/tests/usertools/15_usermod_change_supplementary_groups/config/etc/gshadow b/tests/usertools/15_usermod_change_supplementary_groups/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/15_usermod_change_supplementary_groups/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/15_usermod_change_supplementary_groups/config/etc/shadow b/tests/usertools/15_usermod_change_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/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/usertools/16_usermod_clear_supplementary_groups/config/etc/group b/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/group similarity index 100% rename from tests/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/group rename to tests/usertools/16_usermod_clear_supplementary_groups/config/etc/group diff --git a/tests/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/gshadow b/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/16_usermod_clear_supplementary_groups/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/16_usermod_clear_supplementary_groups/config/etc/shadow b/tests/usertools/16_usermod_clear_supplementary_groups/config/etc/shadow similarity index 100% rename from tests/tests/usertools/16_usermod_clear_supplementary_groups/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/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/group b/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/group similarity index 100% rename from tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/group rename to tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/group diff --git a/tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/gshadow b/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/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/17_usermod_change_supplementary_groups_numerical/config/etc/shadow b/tests/usertools/17_usermod_change_supplementary_groups_numerical/config/etc/shadow similarity index 100% rename from tests/tests/usertools/17_usermod_change_supplementary_groups_numerical/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/18_usermod_change_supplementary_groups-unknown_group/config/etc/group b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/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/18_usermod_change_supplementary_groups-unknown_group/config/etc/group diff --git a/tests/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/config/etc/gshadow b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/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/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/18_usermod_change_supplementary_groups-unknown_group/config/etc/shadow b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/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/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/19_usermod_change_supplementary_groups-unknown_numerical_group/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/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/group rename to tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/config/etc/group diff --git a/tests/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/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/19_usermod_change_supplementary_groups-unknown_numerical_group/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/19_usermod_change_supplementary_groups-unknown_numerical_group/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/19_usermod_change_supplementary_groups-unknown_numerical_group/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/20_usermod_rename_user_in_member_lists/config/etc/group b/tests/usertools/20_usermod_rename_user_in_member_lists/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/20_usermod_rename_user_in_member_lists/config/etc/group diff --git a/tests/tests/usertools/20_usermod_rename_user_in_member_lists/config/etc/gshadow b/tests/usertools/20_usermod_rename_user_in_member_lists/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/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/20_usermod_rename_user_in_member_lists/config/etc/shadow b/tests/usertools/20_usermod_rename_user_in_member_lists/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/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/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/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/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/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/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/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/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/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/21_usermod_rename_user_in_member_lists-and-add_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/21_usermod_rename_user_in_member_lists-and-add_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/22_usermod-a_existing_supplementary_group/config/etc/group b/tests/usertools/22_usermod-a_existing_supplementary_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/22_usermod-a_existing_supplementary_group/config/etc/group diff --git a/tests/tests/usertools/22_usermod-a_existing_supplementary_group/config/etc/gshadow b/tests/usertools/22_usermod-a_existing_supplementary_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/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/22_usermod-a_existing_supplementary_group/config/etc/shadow b/tests/usertools/22_usermod-a_existing_supplementary_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/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/23_usermod-a_existing_supplementary_group+rename/config/etc/group b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/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/23_usermod-a_existing_supplementary_group+rename/config/etc/group diff --git a/tests/tests/usertools/23_usermod-a_existing_supplementary_group+rename/config/etc/gshadow b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/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/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/23_usermod-a_existing_supplementary_group+rename/config/etc/shadow b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/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/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/usertools/24_usermod_locked_passwd/config.txt b/tests/usertools/24_usermod_locked_passwd/config.txt similarity index 100% rename from tests/tests/usertools/24_usermod_locked_passwd/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/24_usermod_locked_passwd/config/etc/group b/tests/usertools/24_usermod_locked_passwd/config/etc/group similarity index 100% rename from tests/tests/usertools/24_usermod_locked_passwd/config/etc/group rename to tests/usertools/24_usermod_locked_passwd/config/etc/group diff --git a/tests/tests/usertools/24_usermod_locked_passwd/config/etc/gshadow b/tests/usertools/24_usermod_locked_passwd/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/24_usermod_locked_passwd/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/24_usermod_locked_passwd/config/etc/shadow b/tests/usertools/24_usermod_locked_passwd/config/etc/shadow similarity index 100% rename from tests/tests/usertools/24_usermod_locked_passwd/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/usertools/25_usermod-G_locked_group/config.txt b/tests/usertools/25_usermod-G_locked_group/config.txt similarity index 100% rename from tests/tests/usertools/25_usermod-G_locked_group/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/25_usermod-G_locked_group/config/etc/group b/tests/usertools/25_usermod-G_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/25_usermod-G_locked_group/config/etc/group diff --git a/tests/tests/usertools/25_usermod-G_locked_group/config/etc/gshadow b/tests/usertools/25_usermod-G_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/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/25_usermod-G_locked_group/config/etc/shadow b/tests/usertools/25_usermod-G_locked_group/config/etc/shadow similarity index 100% rename from tests/tests/usertools/25_usermod-G_locked_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/usertools/26_usermod_locked_shadow/config.txt b/tests/usertools/26_usermod_locked_shadow/config.txt similarity index 100% rename from tests/tests/usertools/26_usermod_locked_shadow/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/26_usermod_locked_shadow/config/etc/group b/tests/usertools/26_usermod_locked_shadow/config/etc/group similarity index 100% rename from tests/tests/usertools/26_usermod_locked_shadow/config/etc/group rename to tests/usertools/26_usermod_locked_shadow/config/etc/group diff --git a/tests/tests/usertools/26_usermod_locked_shadow/config/etc/gshadow b/tests/usertools/26_usermod_locked_shadow/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/26_usermod_locked_shadow/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/26_usermod_locked_shadow/config/etc/shadow b/tests/usertools/26_usermod_locked_shadow/config/etc/shadow similarity index 100% rename from tests/tests/usertools/26_usermod_locked_shadow/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/usertools/27_usermod-G_locked_gshadow/config.txt b/tests/usertools/27_usermod-G_locked_gshadow/config.txt similarity index 100% rename from tests/tests/usertools/27_usermod-G_locked_gshadow/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/27_usermod-G_locked_gshadow/config/etc/group b/tests/usertools/27_usermod-G_locked_gshadow/config/etc/group similarity index 100% rename from tests/tests/usertools/27_usermod-G_locked_gshadow/config/etc/group rename to tests/usertools/27_usermod-G_locked_gshadow/config/etc/group diff --git a/tests/tests/usertools/27_usermod-G_locked_gshadow/config/etc/gshadow b/tests/usertools/27_usermod-G_locked_gshadow/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/27_usermod-G_locked_gshadow/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/27_usermod-G_locked_gshadow/config/etc/shadow b/tests/usertools/27_usermod-G_locked_gshadow/config/etc/shadow similarity index 100% rename from tests/tests/usertools/27_usermod-G_locked_gshadow/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/28_usermod-c_locked_group/config/etc/group b/tests/usertools/28_usermod-c_locked_group/config/etc/group similarity index 100% rename from tests/tests/usertools/28_usermod-c_locked_group/config/etc/group rename to tests/usertools/28_usermod-c_locked_group/config/etc/group diff --git a/tests/tests/usertools/28_usermod-c_locked_group/config/etc/gshadow b/tests/usertools/28_usermod-c_locked_group/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/28_usermod-c_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/28_usermod-c_locked_group/config/etc/shadow b/tests/usertools/28_usermod-c_locked_group/config/etc/shadow similarity index 100% rename from tests/tests/usertools/28_usermod-c_locked_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/29_usermod-c_locked_gshadow/config/etc/group b/tests/usertools/29_usermod-c_locked_gshadow/config/etc/group similarity index 100% rename from tests/tests/usertools/29_usermod-c_locked_gshadow/config/etc/group rename to tests/usertools/29_usermod-c_locked_gshadow/config/etc/group diff --git a/tests/tests/usertools/29_usermod-c_locked_gshadow/config/etc/gshadow b/tests/usertools/29_usermod-c_locked_gshadow/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/29_usermod-c_locked_gshadow/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/29_usermod-c_locked_gshadow/config/etc/shadow b/tests/usertools/29_usermod-c_locked_gshadow/config/etc/shadow similarity index 100% rename from tests/tests/usertools/29_usermod-c_locked_gshadow/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/30_usermod-l_locked_group/config/etc/group b/tests/usertools/30_usermod-l_locked_group/config/etc/group similarity index 100% rename from tests/tests/usertools/30_usermod-l_locked_group/config/etc/group rename to tests/usertools/30_usermod-l_locked_group/config/etc/group diff --git a/tests/tests/usertools/30_usermod-l_locked_group/config/etc/gshadow b/tests/usertools/30_usermod-l_locked_group/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/30_usermod-l_locked_group/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/30_usermod-l_locked_group/config/etc/shadow b/tests/usertools/30_usermod-l_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/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/31_usermod-l_locked_gshadow/config/etc/group b/tests/usertools/31_usermod-l_locked_gshadow/config/etc/group similarity index 100% rename from tests/tests/usertools/31_usermod-l_locked_gshadow/config/etc/group rename to tests/usertools/31_usermod-l_locked_gshadow/config/etc/group diff --git a/tests/tests/usertools/31_usermod-l_locked_gshadow/config/etc/gshadow b/tests/usertools/31_usermod-l_locked_gshadow/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/31_usermod-l_locked_gshadow/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/31_usermod-l_locked_gshadow/config/etc/shadow b/tests/usertools/31_usermod-l_locked_gshadow/config/etc/shadow similarity index 100% rename from tests/tests/usertools/31_usermod-l_locked_gshadow/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/32_usermod-u_new_UID/config/etc/group b/tests/usertools/32_usermod-u_new_UID/config/etc/group similarity index 100% rename from tests/tests/usertools/32_usermod-u_new_UID/config/etc/group rename to tests/usertools/32_usermod-u_new_UID/config/etc/group diff --git a/tests/tests/usertools/32_usermod-u_new_UID/config/etc/gshadow b/tests/usertools/32_usermod-u_new_UID/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/32_usermod-u_new_UID/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/32_usermod-u_new_UID/config/etc/shadow b/tests/usertools/32_usermod-u_new_UID/config/etc/shadow similarity index 100% rename from tests/tests/usertools/32_usermod-u_new_UID/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/36_usermod_change_uid+move_homedir_other_device/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/36_usermod_change_uid+move_homedir_other_device/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/36_usermod_change_uid+move_homedir_other_device/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/36_usermod_change_uid+move_homedir_other_device/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/47_usermod-l_no_shadow_file/config/etc/group b/tests/usertools/47_usermod-l_no_shadow_file/config/etc/group similarity index 100% rename from tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/group rename to tests/usertools/47_usermod-l_no_shadow_file/config/etc/group diff --git a/tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/gshadow b/tests/usertools/47_usermod-l_no_shadow_file/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/gshadow rename to tests/usertools/47_usermod-l_no_shadow_file/config/etc/gshadow diff --git a/tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/passwd b/tests/usertools/47_usermod-l_no_shadow_file/config/etc/passwd similarity index 100% rename from tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/passwd rename to tests/usertools/47_usermod-l_no_shadow_file/config/etc/passwd diff --git a/tests/tests/usertools/47_usermod-l_no_shadow_file/config/etc/shadow b/tests/usertools/47_usermod-l_no_shadow_file/config/etc/shadow similarity index 100% rename from tests/tests/usertools/47_usermod-l_no_shadow_file/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/48_userdel_keep_group_if_primary_other_user/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/48_userdel_keep_group_if_primary_other_user/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/usertools/48_userdel_keep_group_if_primary_other_user/data/group b/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/group similarity index 100% rename from tests/tests/usertools/48_userdel_keep_group_if_primary_other_user/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/55_userdel_busy_user/config/etc/gshadow b/tests/usertools/55_userdel_busy_user/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/55_userdel_busy_user/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/usertools/56_userdel_locked_passwd/config.txt b/tests/usertools/56_userdel_locked_passwd/config.txt similarity index 100% rename from tests/tests/usertools/56_userdel_locked_passwd/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/56_userdel_locked_passwd/config/etc/group b/tests/usertools/56_userdel_locked_passwd/config/etc/group similarity index 100% rename from tests/tests/usertools/56_userdel_locked_passwd/config/etc/group rename to tests/usertools/56_userdel_locked_passwd/config/etc/group diff --git a/tests/tests/usertools/56_userdel_locked_passwd/config/etc/gshadow b/tests/usertools/56_userdel_locked_passwd/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/56_userdel_locked_passwd/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/56_userdel_locked_passwd/config/etc/shadow b/tests/usertools/56_userdel_locked_passwd/config/etc/shadow similarity index 100% rename from tests/tests/usertools/56_userdel_locked_passwd/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/usertools/57_userdel_locked_group/config.txt b/tests/usertools/57_userdel_locked_group/config.txt similarity index 100% rename from tests/tests/usertools/57_userdel_locked_group/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/57_userdel_locked_group/config/etc/group b/tests/usertools/57_userdel_locked_group/config/etc/group similarity index 100% rename from tests/tests/usertools/57_userdel_locked_group/config/etc/group rename to tests/usertools/57_userdel_locked_group/config/etc/group diff --git a/tests/tests/usertools/57_userdel_locked_group/config/etc/gshadow b/tests/usertools/57_userdel_locked_group/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/57_userdel_locked_group/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/57_userdel_locked_group/config/etc/shadow b/tests/usertools/57_userdel_locked_group/config/etc/shadow similarity index 100% rename from tests/tests/usertools/57_userdel_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/usertools/58_userdel_locked_shadow/config.txt b/tests/usertools/58_userdel_locked_shadow/config.txt similarity index 100% rename from tests/tests/usertools/58_userdel_locked_shadow/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/58_userdel_locked_shadow/config/etc/group b/tests/usertools/58_userdel_locked_shadow/config/etc/group similarity index 100% rename from tests/tests/usertools/58_userdel_locked_shadow/config/etc/group rename to tests/usertools/58_userdel_locked_shadow/config/etc/group diff --git a/tests/tests/usertools/58_userdel_locked_shadow/config/etc/gshadow b/tests/usertools/58_userdel_locked_shadow/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/58_userdel_locked_shadow/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/58_userdel_locked_shadow/config/etc/shadow b/tests/usertools/58_userdel_locked_shadow/config/etc/shadow similarity index 100% rename from tests/tests/usertools/58_userdel_locked_shadow/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/usertools/59_userdel_locked_gshadow/config.txt b/tests/usertools/59_userdel_locked_gshadow/config.txt similarity index 100% rename from tests/tests/usertools/59_userdel_locked_gshadow/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/59_userdel_locked_gshadow/config/etc/group b/tests/usertools/59_userdel_locked_gshadow/config/etc/group similarity index 100% rename from tests/tests/usertools/59_userdel_locked_gshadow/config/etc/group rename to tests/usertools/59_userdel_locked_gshadow/config/etc/group diff --git a/tests/tests/usertools/59_userdel_locked_gshadow/config/etc/gshadow b/tests/usertools/59_userdel_locked_gshadow/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/59_userdel_locked_gshadow/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/59_userdel_locked_gshadow/config/etc/shadow b/tests/usertools/59_userdel_locked_gshadow/config/etc/shadow similarity index 100% rename from tests/tests/usertools/59_userdel_locked_gshadow/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/usertools/60_userdel_invalid_user/config.txt b/tests/usertools/60_userdel_invalid_user/config.txt similarity index 100% rename from tests/tests/usertools/60_userdel_invalid_user/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/60_userdel_invalid_user/config/etc/group b/tests/usertools/60_userdel_invalid_user/config/etc/group similarity index 100% rename from tests/tests/usertools/60_userdel_invalid_user/config/etc/group rename to tests/usertools/60_userdel_invalid_user/config/etc/group diff --git a/tests/tests/usertools/60_userdel_invalid_user/config/etc/gshadow b/tests/usertools/60_userdel_invalid_user/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/60_userdel_invalid_user/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/60_userdel_invalid_user/config/etc/shadow b/tests/usertools/60_userdel_invalid_user/config/etc/shadow similarity index 100% rename from tests/tests/usertools/60_userdel_invalid_user/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/usertools/61_userdel_del_homedir_with_symlinks/config/etc/group b/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/group similarity index 100% rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/group rename to tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/group diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/gshadow b/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/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/61_userdel_del_homedir_with_symlinks/config/etc/shadow b/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/shadow similarity index 100% rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/shadow rename to tests/usertools/61_userdel_del_homedir_with_symlinks/config/etc/shadow diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/group b/tests/usertools/61_userdel_del_homedir_with_symlinks/data/group similarity index 100% rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/group rename to tests/usertools/61_userdel_del_homedir_with_symlinks/data/group diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/gshadow b/tests/usertools/61_userdel_del_homedir_with_symlinks/data/gshadow similarity index 100% rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/gshadow rename to tests/usertools/61_userdel_del_homedir_with_symlinks/data/gshadow diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/passwd b/tests/usertools/61_userdel_del_homedir_with_symlinks/data/passwd similarity index 100% rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/passwd rename to tests/usertools/61_userdel_del_homedir_with_symlinks/data/passwd diff --git a/tests/tests/usertools/61_userdel_del_homedir_with_symlinks/data/shadow b/tests/usertools/61_userdel_del_homedir_with_symlinks/data/shadow similarity index 100% rename from tests/tests/usertools/61_userdel_del_homedir_with_symlinks/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/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/group b/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/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/01_chpasswd_invalid_user/config/etc/group diff --git a/tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/gshadow b/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/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/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/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/passwd b/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/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/01_chpasswd_invalid_user/config/etc/passwd diff --git a/tests/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/config/etc/shadow b/tests/usertools/chpasswd-PAM/01_chpasswd_invalid_user/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/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/02_chpasswd_multiple_users/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/02_chpasswd_multiple_users/config/etc/group rename to tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/group diff --git a/tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/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/02_chpasswd_multiple_users/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/02_chpasswd_multiple_users/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/02_chpasswd_multiple_users/config/etc/passwd rename to tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/config/etc/passwd diff --git a/tests/tests/usertools/chpasswd-PAM/02_chpasswd_multiple_users/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/02_chpasswd_multiple_users/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/03_chpasswd_no_shadow_file/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/03_chpasswd_no_shadow_file/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/03_chpasswd_no_shadow_file/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/03_chpasswd_no_shadow_file/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/03_chpasswd_no_shadow_file/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/03_chpasswd_no_shadow_file/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/04_chpasswd_no_shadow_entry/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/04_chpasswd_no_shadow_entry/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/04_chpasswd_no_shadow_entry/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/04_chpasswd_no_shadow_entry/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/05_chpasswd_error_no_password/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/05_chpasswd_error_no_password/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/05_chpasswd_error_no_password/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/05_chpasswd_error_no_password/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/05_chpasswd_error_no_password/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/05_chpasswd_error_no_password/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/05_chpasswd_error_no_password/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/05_chpasswd_error_no_password/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/06_chpasswd_usage/config/etc/group b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/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/06_chpasswd_usage/config/etc/group diff --git a/tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/gshadow b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/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/06_chpasswd_usage/config/etc/gshadow diff --git a/tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/passwd b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/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/06_chpasswd_usage/config/etc/passwd diff --git a/tests/tests/usertools/chpasswd-PAM/06_chpasswd_usage/config/etc/shadow b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/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/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/07_chpasswd_usage_bad_option/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/07_chpasswd_usage_bad_option/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/07_chpasswd_usage_bad_option/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/07_chpasswd_usage_bad_option/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/07_chpasswd_usage_bad_option/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/07_chpasswd_usage_bad_option/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/07_chpasswd_usage_bad_option/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/07_chpasswd_usage_bad_option/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/08_chpasswd_usage-e-m_exclusive/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/08_chpasswd_usage-e-m_exclusive/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/08_chpasswd_usage-e-m_exclusive/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/08_chpasswd_usage-e-m_exclusive/config/etc/gshadow rename to tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_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/08_chpasswd_usage-e-m_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/08_chpasswd_usage-e-m_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/08_chpasswd_usage-e-m_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/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/09_chpasswd_usage-e-c_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/09_chpasswd_usage-e-c_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/09_chpasswd_usage-e-c_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/09_chpasswd_usage-e-c_exclusive/config/etc/gshadow rename to tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/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/09_chpasswd_usage-e-c_exclusive/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/09_chpasswd_usage-e-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/09_chpasswd_usage-e-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/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/10_chpasswd_usage-m-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/10_chpasswd_usage-m-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/10_chpasswd_usage-m-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/10_chpasswd_usage-m-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/10_chpasswd_usage-m-c_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/10_chpasswd_usage-m-c_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/10_chpasswd_usage-m-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/10_chpasswd_usage-m-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/11_chpasswd_usage-s_without-c/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/11_chpasswd_usage-s_without-c/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/11_chpasswd_usage-s_without-c/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/11_chpasswd_usage-s_without-c/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/11_chpasswd_usage-s_without-c/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/11_chpasswd_usage-s_without-c/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/11_chpasswd_usage-s_without-c/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/11_chpasswd_usage-s_without-c/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/12_chpasswd_usage-s_invalid/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/12_chpasswd_usage-s_invalid/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/12_chpasswd_usage-s_invalid/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/12_chpasswd_usage-s_invalid/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/12_chpasswd_usage-s_invalid/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/12_chpasswd_usage-s_invalid/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/12_chpasswd_usage-s_invalid/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/12_chpasswd_usage-s_invalid/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/13_chpasswd_usage-c_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/13_chpasswd_usage-c_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/13_chpasswd_usage-c_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/13_chpasswd_usage-c_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/13_chpasswd_usage-c_invalid/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/13_chpasswd_usage-c_invalid/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/13_chpasswd_usage-c_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/13_chpasswd_usage-c_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/14_chpasswd_password_encrypted/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/14_chpasswd_password_encrypted/config/etc/group rename to tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/group diff --git a/tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/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/14_chpasswd_password_encrypted/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/14_chpasswd_password_encrypted/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/14_chpasswd_password_encrypted/config/etc/passwd rename to tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/config/etc/passwd diff --git a/tests/tests/usertools/chpasswd-PAM/14_chpasswd_password_encrypted/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/14_chpasswd_password_encrypted/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/15_chpasswd_password_md5/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/15_chpasswd_password_md5/config/etc/group rename to tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/group diff --git a/tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/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/15_chpasswd_password_md5/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/15_chpasswd_password_md5/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/15_chpasswd_password_md5/config/etc/passwd rename to tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/config/etc/passwd diff --git a/tests/tests/usertools/chpasswd-PAM/15_chpasswd_password_md5/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/15_chpasswd_password_md5/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/16_chpasswd_password_NONE/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/16_chpasswd_password_NONE/config/etc/group rename to tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/group diff --git a/tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/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/16_chpasswd_password_NONE/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/16_chpasswd_password_NONE/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/16_chpasswd_password_NONE/config/etc/passwd rename to tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/config/etc/passwd diff --git a/tests/tests/usertools/chpasswd-PAM/16_chpasswd_password_NONE/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/16_chpasswd_password_NONE/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/17_chpasswd_password_MD5/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/17_chpasswd_password_MD5/config/etc/group rename to tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/group diff --git a/tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/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/17_chpasswd_password_MD5/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/17_chpasswd_password_MD5/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/17_chpasswd_password_MD5/config/etc/passwd rename to tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/config/etc/passwd diff --git a/tests/tests/usertools/chpasswd-PAM/17_chpasswd_password_MD5/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/17_chpasswd_password_MD5/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/18_chpasswd_password_DES/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/18_chpasswd_password_DES/config/etc/group rename to tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/group diff --git a/tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/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/18_chpasswd_password_DES/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/18_chpasswd_password_DES/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/18_chpasswd_password_DES/config/etc/passwd rename to tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/config/etc/passwd diff --git a/tests/tests/usertools/chpasswd-PAM/18_chpasswd_password_DES/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/18_chpasswd_password_DES/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/19_chpasswd_password_SHA256/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/19_chpasswd_password_SHA256/config/etc/group rename to tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/group diff --git a/tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/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/19_chpasswd_password_SHA256/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/19_chpasswd_password_SHA256/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/19_chpasswd_password_SHA256/config/etc/passwd rename to tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/config/etc/passwd diff --git a/tests/tests/usertools/chpasswd-PAM/19_chpasswd_password_SHA256/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/19_chpasswd_password_SHA256/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/20_chpasswd_password_SHA256_rounds_900/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/20_chpasswd_password_SHA256_rounds_900/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/20_chpasswd_password_SHA256_rounds_900/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/20_chpasswd_password_SHA256_rounds_900/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/20_chpasswd_password_SHA256_rounds_900/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/20_chpasswd_password_SHA256_rounds_900/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/20_chpasswd_password_SHA256_rounds_900/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/20_chpasswd_password_SHA256_rounds_900/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/21_chpasswd_password_SHA256_rounds_9000/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/21_chpasswd_password_SHA256_rounds_9000/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/21_chpasswd_password_SHA256_rounds_9000/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/21_chpasswd_password_SHA256_rounds_9000/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/21_chpasswd_password_SHA256_rounds_9000/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/21_chpasswd_password_SHA256_rounds_9000/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/21_chpasswd_password_SHA256_rounds_9000/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/21_chpasswd_password_SHA256_rounds_9000/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/22_chpasswd_password_SHA512/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/22_chpasswd_password_SHA512/config/etc/group rename to tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/group diff --git a/tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/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/22_chpasswd_password_SHA512/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/22_chpasswd_password_SHA512/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/22_chpasswd_password_SHA512/config/etc/passwd rename to tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/config/etc/passwd diff --git a/tests/tests/usertools/chpasswd-PAM/22_chpasswd_password_SHA512/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/22_chpasswd_password_SHA512/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/23_chpasswd_password_SHA512_rounds_900/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/23_chpasswd_password_SHA512_rounds_900/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/23_chpasswd_password_SHA512_rounds_900/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/23_chpasswd_password_SHA512_rounds_900/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/23_chpasswd_password_SHA512_rounds_900/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/23_chpasswd_password_SHA512_rounds_900/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/23_chpasswd_password_SHA512_rounds_900/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/23_chpasswd_password_SHA512_rounds_900/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/24_chpasswd_password_SHA512_rounds_9000/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/24_chpasswd_password_SHA512_rounds_9000/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/24_chpasswd_password_SHA512_rounds_9000/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/24_chpasswd_password_SHA512_rounds_9000/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/24_chpasswd_password_SHA512_rounds_9000/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/24_chpasswd_password_SHA512_rounds_9000/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/24_chpasswd_password_SHA512_rounds_9000/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/24_chpasswd_password_SHA512_rounds_9000/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/25_chpasswd-e_no_shadow_file/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/25_chpasswd-e_no_shadow_file/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/25_chpasswd-e_no_shadow_file/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/25_chpasswd-e_no_shadow_file/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/25_chpasswd-e_no_shadow_file/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/25_chpasswd-e_no_shadow_file/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/25_chpasswd-e_no_shadow_file/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/25_chpasswd-e_no_shadow_file/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/26_chpasswd_no_shadow_file_invalid_passwd/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/26_chpasswd_no_shadow_file_invalid_passwd/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/26_chpasswd_no_shadow_file_invalid_passwd/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/26_chpasswd_no_shadow_file_invalid_passwd/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/26_chpasswd_no_shadow_file_invalid_passwd/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/26_chpasswd_no_shadow_file_invalid_passwd/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/26_chpasswd_no_shadow_file_invalid_passwd/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/26_chpasswd_no_shadow_file_invalid_passwd/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/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/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/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/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/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/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/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/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/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/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/27_chpasswd_no_shadow_file_1st_invalid_passwd_entry/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/28_chpasswd_no_shadow_file_2nd_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/28_chpasswd_no_shadow_file_2nd_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/28_chpasswd_no_shadow_file_2nd_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/28_chpasswd_no_shadow_file_2nd_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/28_chpasswd_no_shadow_file_2nd_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/28_chpasswd_no_shadow_file_2nd_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/29_chpasswd-e_no_shadow_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/29_chpasswd-e_no_shadow_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/29_chpasswd-e_no_shadow_entry/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/29_chpasswd-e_no_shadow_entry/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/data/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/data/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/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config.txt b/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config.txt similarity index 100% rename from tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/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/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/group b/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/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/30_chpasswd_locked_passwd/config/etc/group diff --git a/tests/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/config/etc/gshadow b/tests/usertools/chpasswd-PAM/30_chpasswd_locked_passwd/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/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/chpasswd-PAM/30_chpasswd_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/chpasswd-PAM/30_chpasswd_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/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config.txt b/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config.txt similarity index 100% rename from tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/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/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/group b/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/group similarity index 100% rename from tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/group rename to tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/group diff --git a/tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/gshadow b/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/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/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/shadow b/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/config/etc/shadow similarity index 100% rename from tests/tests/usertools/chpasswd-PAM/31_chpasswd_locked_shadow/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/chpasswd-PAM/32_chpasswd_invalid_user/config.txt b/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config.txt similarity index 100% rename from tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/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/chpasswd-PAM/32_chpasswd_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/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/group rename to tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/group diff --git a/tests/tests/usertools/chpasswd-PAM/32_chpasswd_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/chpasswd-PAM/32_chpasswd_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/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/shadow b/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/config/etc/shadow similarity index 100% rename from tests/tests/usertools/chpasswd-PAM/32_chpasswd_invalid_user/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/chpasswd-PAM/33_chpasswd-e_invalid_user/config.txt b/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/config.txt similarity index 100% rename from tests/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/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/33_chpasswd-e_invalid_user/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/33_chpasswd-e_invalid_user/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/33_chpasswd-e_invalid_user/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/33_chpasswd-e_invalid_user/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/chpasswd-PAM/33_chpasswd-e_invalid_user/config/etc/shadow b/tests/usertools/chpasswd-PAM/33_chpasswd-e_invalid_user/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/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/34_chpasswd-e_password_shadow_and_passwd/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/34_chpasswd-e_password_shadow_and_passwd/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/34_chpasswd-e_password_shadow_and_passwd/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/34_chpasswd-e_password_shadow_and_passwd/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/34_chpasswd-e_password_shadow_and_passwd/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/34_chpasswd-e_password_shadow_and_passwd/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/01_chpasswd_invalid_user/config/etc/group b/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/group similarity index 100% rename from tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/group rename to tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/group diff --git a/tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/gshadow b/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/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/01_chpasswd_invalid_user/config/etc/passwd b/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/passwd similarity index 100% rename from tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/passwd rename to tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/passwd diff --git a/tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/shadow b/tests/usertools/chpasswd/01_chpasswd_invalid_user/config/etc/shadow similarity index 100% rename from tests/tests/usertools/chpasswd/01_chpasswd_invalid_user/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/02_chpasswd_multiple_users/config/etc/group b/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/group similarity index 100% rename from tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/group rename to tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/group diff --git a/tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/gshadow b/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/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/02_chpasswd_multiple_users/config/etc/passwd b/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/passwd similarity index 100% rename from tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/passwd rename to tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/passwd diff --git a/tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/shadow b/tests/usertools/chpasswd/02_chpasswd_multiple_users/config/etc/shadow similarity index 100% rename from tests/tests/usertools/chpasswd/02_chpasswd_multiple_users/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/03_chpasswd_no_shadow_file/config/etc/group b/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/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/03_chpasswd_no_shadow_file/config/etc/group diff --git a/tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/gshadow b/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/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/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/03_chpasswd_no_shadow_file/config/etc/passwd b/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/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/03_chpasswd_no_shadow_file/config/etc/passwd diff --git a/tests/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/config/etc/shadow b/tests/usertools/chpasswd/03_chpasswd_no_shadow_file/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/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/04_chpasswd_no_shadow_entry/config/etc/group b/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/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/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/04_chpasswd_no_shadow_entry/config/etc/passwd b/tests/usertools/chpasswd/04_chpasswd_no_shadow_entry/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/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/05_chpasswd_error_no_password/config/etc/group b/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/group similarity index 100% rename from tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/group rename to tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/group diff --git a/tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/gshadow b/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/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/05_chpasswd_error_no_password/config/etc/passwd b/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/passwd similarity index 100% rename from tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/passwd rename to tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/passwd diff --git a/tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/shadow b/tests/usertools/chpasswd/05_chpasswd_error_no_password/config/etc/shadow similarity index 100% rename from tests/tests/usertools/chpasswd/05_chpasswd_error_no_password/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/useradd/01_useradd_usage/config/etc/group b/tests/usertools/useradd/01_useradd_usage/config/etc/group similarity index 100% rename from tests/tests/usertools/useradd/01_useradd_usage/config/etc/group rename to tests/usertools/useradd/01_useradd_usage/config/etc/group diff --git a/tests/tests/usertools/useradd/01_useradd_usage/config/etc/gshadow b/tests/usertools/useradd/01_useradd_usage/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/useradd/01_useradd_usage/config/etc/gshadow rename to tests/usertools/useradd/01_useradd_usage/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/01_useradd_usage/config/etc/passwd b/tests/usertools/useradd/01_useradd_usage/config/etc/passwd similarity index 100% rename from tests/tests/usertools/useradd/01_useradd_usage/config/etc/passwd rename to tests/usertools/useradd/01_useradd_usage/config/etc/passwd diff --git a/tests/tests/usertools/useradd/01_useradd_usage/config/etc/shadow b/tests/usertools/useradd/01_useradd_usage/config/etc/shadow similarity index 100% rename from tests/tests/usertools/useradd/01_useradd_usage/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/02_useradd_usage_invalid_option/config/etc/group b/tests/usertools/useradd/02_useradd_usage_invalid_option/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/02_useradd_usage_invalid_option/config/etc/group diff --git a/tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/gshadow b/tests/usertools/useradd/02_useradd_usage_invalid_option/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/02_useradd_usage_invalid_option/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/passwd b/tests/usertools/useradd/02_useradd_usage_invalid_option/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/02_useradd_usage_invalid_option/config/etc/passwd diff --git a/tests/tests/usertools/useradd/02_useradd_usage_invalid_option/config/etc/shadow b/tests/usertools/useradd/02_useradd_usage_invalid_option/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/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/03_useradd_usage_no_users/config/etc/group b/tests/usertools/useradd/03_useradd_usage_no_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/03_useradd_usage_no_users/config/etc/group diff --git a/tests/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/gshadow b/tests/usertools/useradd/03_useradd_usage_no_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/03_useradd_usage_no_users/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/passwd b/tests/usertools/useradd/03_useradd_usage_no_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/03_useradd_usage_no_users/config/etc/passwd diff --git a/tests/tests/usertools/useradd/03_useradd_usage_no_users/config/etc/shadow b/tests/usertools/useradd/03_useradd_usage_no_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/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/04_useradd_usage_2_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/04_useradd_usage_2_users/config/etc/group rename to tests/usertools/useradd/04_useradd_usage_2_users/config/etc/group diff --git a/tests/tests/usertools/useradd/04_useradd_usage_2_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/04_useradd_usage_2_users/config/etc/gshadow rename to tests/usertools/useradd/04_useradd_usage_2_users/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/04_useradd_usage_2_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/04_useradd_usage_2_users/config/etc/passwd rename to tests/usertools/useradd/04_useradd_usage_2_users/config/etc/passwd diff --git a/tests/tests/usertools/useradd/04_useradd_usage_2_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/04_useradd_usage_2_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/05_useradd_usage-b_invalid1/config/etc/group b/tests/usertools/useradd/05_useradd_usage-b_invalid1/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/05_useradd_usage-b_invalid1/config/etc/group diff --git a/tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/gshadow b/tests/usertools/useradd/05_useradd_usage-b_invalid1/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/05_useradd_usage-b_invalid1/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/passwd b/tests/usertools/useradd/05_useradd_usage-b_invalid1/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/05_useradd_usage-b_invalid1/config/etc/passwd diff --git a/tests/tests/usertools/useradd/05_useradd_usage-b_invalid1/config/etc/shadow b/tests/usertools/useradd/05_useradd_usage-b_invalid1/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/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/06_useradd_usage-b_invalid2/config/etc/group b/tests/usertools/useradd/06_useradd_usage-b_invalid2/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/06_useradd_usage-b_invalid2/config/etc/group diff --git a/tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/gshadow b/tests/usertools/useradd/06_useradd_usage-b_invalid2/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/06_useradd_usage-b_invalid2/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/passwd b/tests/usertools/useradd/06_useradd_usage-b_invalid2/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/06_useradd_usage-b_invalid2/config/etc/passwd diff --git a/tests/tests/usertools/useradd/06_useradd_usage-b_invalid2/config/etc/shadow b/tests/usertools/useradd/06_useradd_usage-b_invalid2/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/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/07_useradd_usage-b_invalid3/config/etc/group b/tests/usertools/useradd/07_useradd_usage-b_invalid3/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/07_useradd_usage-b_invalid3/config/etc/group diff --git a/tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/gshadow b/tests/usertools/useradd/07_useradd_usage-b_invalid3/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/07_useradd_usage-b_invalid3/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/passwd b/tests/usertools/useradd/07_useradd_usage-b_invalid3/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/07_useradd_usage-b_invalid3/config/etc/passwd diff --git a/tests/tests/usertools/useradd/07_useradd_usage-b_invalid3/config/etc/shadow b/tests/usertools/useradd/07_useradd_usage-b_invalid3/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/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/08_useradd_usage-c_invalid1/config/etc/group b/tests/usertools/useradd/08_useradd_usage-c_invalid1/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/08_useradd_usage-c_invalid1/config/etc/group diff --git a/tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/gshadow b/tests/usertools/useradd/08_useradd_usage-c_invalid1/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/08_useradd_usage-c_invalid1/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/passwd b/tests/usertools/useradd/08_useradd_usage-c_invalid1/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/08_useradd_usage-c_invalid1/config/etc/passwd diff --git a/tests/tests/usertools/useradd/08_useradd_usage-c_invalid1/config/etc/shadow b/tests/usertools/useradd/08_useradd_usage-c_invalid1/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/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/09_useradd_usage-c_invalid2/config/etc/group b/tests/usertools/useradd/09_useradd_usage-c_invalid2/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/09_useradd_usage-c_invalid2/config/etc/group diff --git a/tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/gshadow b/tests/usertools/useradd/09_useradd_usage-c_invalid2/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/09_useradd_usage-c_invalid2/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/passwd b/tests/usertools/useradd/09_useradd_usage-c_invalid2/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/09_useradd_usage-c_invalid2/config/etc/passwd diff --git a/tests/tests/usertools/useradd/09_useradd_usage-c_invalid2/config/etc/shadow b/tests/usertools/useradd/09_useradd_usage-c_invalid2/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/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/10_useradd_usage-d_invalid1/config/etc/group b/tests/usertools/useradd/10_useradd_usage-d_invalid1/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/10_useradd_usage-d_invalid1/config/etc/group diff --git a/tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/gshadow b/tests/usertools/useradd/10_useradd_usage-d_invalid1/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/10_useradd_usage-d_invalid1/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/passwd b/tests/usertools/useradd/10_useradd_usage-d_invalid1/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/10_useradd_usage-d_invalid1/config/etc/passwd diff --git a/tests/tests/usertools/useradd/10_useradd_usage-d_invalid1/config/etc/shadow b/tests/usertools/useradd/10_useradd_usage-d_invalid1/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/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/11_useradd_usage-d_invalid2/config/etc/group b/tests/usertools/useradd/11_useradd_usage-d_invalid2/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/11_useradd_usage-d_invalid2/config/etc/group diff --git a/tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/gshadow b/tests/usertools/useradd/11_useradd_usage-d_invalid2/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/11_useradd_usage-d_invalid2/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/passwd b/tests/usertools/useradd/11_useradd_usage-d_invalid2/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/11_useradd_usage-d_invalid2/config/etc/passwd diff --git a/tests/tests/usertools/useradd/11_useradd_usage-d_invalid2/config/etc/shadow b/tests/usertools/useradd/11_useradd_usage-d_invalid2/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/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/12_useradd_usage-d_invalid3/config/etc/group b/tests/usertools/useradd/12_useradd_usage-d_invalid3/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/12_useradd_usage-d_invalid3/config/etc/group diff --git a/tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/gshadow b/tests/usertools/useradd/12_useradd_usage-d_invalid3/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/12_useradd_usage-d_invalid3/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/passwd b/tests/usertools/useradd/12_useradd_usage-d_invalid3/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/12_useradd_usage-d_invalid3/config/etc/passwd diff --git a/tests/tests/usertools/useradd/12_useradd_usage-d_invalid3/config/etc/shadow b/tests/usertools/useradd/12_useradd_usage-d_invalid3/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/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/13_useradd_usage-e_invalid1/config/etc/group b/tests/usertools/useradd/13_useradd_usage-e_invalid1/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/13_useradd_usage-e_invalid1/config/etc/group diff --git a/tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/gshadow b/tests/usertools/useradd/13_useradd_usage-e_invalid1/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/13_useradd_usage-e_invalid1/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/passwd b/tests/usertools/useradd/13_useradd_usage-e_invalid1/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/13_useradd_usage-e_invalid1/config/etc/passwd diff --git a/tests/tests/usertools/useradd/13_useradd_usage-e_invalid1/config/etc/shadow b/tests/usertools/useradd/13_useradd_usage-e_invalid1/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/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/14_useradd_usage-e_invalid2/config/etc/group b/tests/usertools/useradd/14_useradd_usage-e_invalid2/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/14_useradd_usage-e_invalid2/config/etc/group diff --git a/tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/gshadow b/tests/usertools/useradd/14_useradd_usage-e_invalid2/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/14_useradd_usage-e_invalid2/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/passwd b/tests/usertools/useradd/14_useradd_usage-e_invalid2/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/14_useradd_usage-e_invalid2/config/etc/passwd diff --git a/tests/tests/usertools/useradd/14_useradd_usage-e_invalid2/config/etc/shadow b/tests/usertools/useradd/14_useradd_usage-e_invalid2/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/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/15_useradd_usage-e_no_shadow_file/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/15_useradd_usage-e_no_shadow_file/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/15_useradd_usage-e_no_shadow_file/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/15_useradd_usage-e_no_shadow_file/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/15_useradd_usage-e_no_shadow_file/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/15_useradd_usage-e_no_shadow_file/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/15_useradd_usage-e_no_shadow_file/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/15_useradd_usage-e_no_shadow_file/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/16_useradd_usage-f_invalid1/config/etc/group b/tests/usertools/useradd/16_useradd_usage-f_invalid1/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/16_useradd_usage-f_invalid1/config/etc/group diff --git a/tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/gshadow b/tests/usertools/useradd/16_useradd_usage-f_invalid1/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/16_useradd_usage-f_invalid1/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/passwd b/tests/usertools/useradd/16_useradd_usage-f_invalid1/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/16_useradd_usage-f_invalid1/config/etc/passwd diff --git a/tests/tests/usertools/useradd/16_useradd_usage-f_invalid1/config/etc/shadow b/tests/usertools/useradd/16_useradd_usage-f_invalid1/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/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/17_useradd_usage-f_invalid2/config/etc/group b/tests/usertools/useradd/17_useradd_usage-f_invalid2/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/17_useradd_usage-f_invalid2/config/etc/group diff --git a/tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/gshadow b/tests/usertools/useradd/17_useradd_usage-f_invalid2/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/17_useradd_usage-f_invalid2/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/passwd b/tests/usertools/useradd/17_useradd_usage-f_invalid2/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/17_useradd_usage-f_invalid2/config/etc/passwd diff --git a/tests/tests/usertools/useradd/17_useradd_usage-f_invalid2/config/etc/shadow b/tests/usertools/useradd/17_useradd_usage-f_invalid2/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/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/18_useradd_usage-f_no_shadow_file/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/18_useradd_usage-f_no_shadow_file/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/18_useradd_usage-f_no_shadow_file/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/18_useradd_usage-f_no_shadow_file/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/18_useradd_usage-f_no_shadow_file/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/18_useradd_usage-f_no_shadow_file/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/18_useradd_usage-f_no_shadow_file/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/18_useradd_usage-f_no_shadow_file/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/19_useradd_usage-K_invalid1/config/etc/group b/tests/usertools/useradd/19_useradd_usage-K_invalid1/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/19_useradd_usage-K_invalid1/config/etc/group diff --git a/tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/gshadow b/tests/usertools/useradd/19_useradd_usage-K_invalid1/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/19_useradd_usage-K_invalid1/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/passwd b/tests/usertools/useradd/19_useradd_usage-K_invalid1/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/19_useradd_usage-K_invalid1/config/etc/passwd diff --git a/tests/tests/usertools/useradd/19_useradd_usage-K_invalid1/config/etc/shadow b/tests/usertools/useradd/19_useradd_usage-K_invalid1/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/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/20_useradd_usage-O_invalid2/config/etc/group b/tests/usertools/useradd/20_useradd_usage-O_invalid2/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/20_useradd_usage-O_invalid2/config/etc/group diff --git a/tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/gshadow b/tests/usertools/useradd/20_useradd_usage-O_invalid2/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/20_useradd_usage-O_invalid2/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/passwd b/tests/usertools/useradd/20_useradd_usage-O_invalid2/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/20_useradd_usage-O_invalid2/config/etc/passwd diff --git a/tests/tests/usertools/useradd/20_useradd_usage-O_invalid2/config/etc/shadow b/tests/usertools/useradd/20_useradd_usage-O_invalid2/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/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/21_useradd_usage-p_invalid1/config/etc/group b/tests/usertools/useradd/21_useradd_usage-p_invalid1/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/21_useradd_usage-p_invalid1/config/etc/group diff --git a/tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/gshadow b/tests/usertools/useradd/21_useradd_usage-p_invalid1/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/21_useradd_usage-p_invalid1/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/passwd b/tests/usertools/useradd/21_useradd_usage-p_invalid1/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/21_useradd_usage-p_invalid1/config/etc/passwd diff --git a/tests/tests/usertools/useradd/21_useradd_usage-p_invalid1/config/etc/shadow b/tests/usertools/useradd/21_useradd_usage-p_invalid1/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/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/22_useradd_usage-p_invalid2/config/etc/group b/tests/usertools/useradd/22_useradd_usage-p_invalid2/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/22_useradd_usage-p_invalid2/config/etc/group diff --git a/tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/gshadow b/tests/usertools/useradd/22_useradd_usage-p_invalid2/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/22_useradd_usage-p_invalid2/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/passwd b/tests/usertools/useradd/22_useradd_usage-p_invalid2/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/22_useradd_usage-p_invalid2/config/etc/passwd diff --git a/tests/tests/usertools/useradd/22_useradd_usage-p_invalid2/config/etc/shadow b/tests/usertools/useradd/22_useradd_usage-p_invalid2/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/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/23_useradd_usage-s_invalid1/config/etc/group b/tests/usertools/useradd/23_useradd_usage-s_invalid1/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/23_useradd_usage-s_invalid1/config/etc/group diff --git a/tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/gshadow b/tests/usertools/useradd/23_useradd_usage-s_invalid1/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/23_useradd_usage-s_invalid1/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/passwd b/tests/usertools/useradd/23_useradd_usage-s_invalid1/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/23_useradd_usage-s_invalid1/config/etc/passwd diff --git a/tests/tests/usertools/useradd/23_useradd_usage-s_invalid1/config/etc/shadow b/tests/usertools/useradd/23_useradd_usage-s_invalid1/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/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/24_useradd_usage-s_invalid2/config/etc/group b/tests/usertools/useradd/24_useradd_usage-s_invalid2/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/24_useradd_usage-s_invalid2/config/etc/group diff --git a/tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/gshadow b/tests/usertools/useradd/24_useradd_usage-s_invalid2/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/24_useradd_usage-s_invalid2/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/passwd b/tests/usertools/useradd/24_useradd_usage-s_invalid2/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/24_useradd_usage-s_invalid2/config/etc/passwd diff --git a/tests/tests/usertools/useradd/24_useradd_usage-s_invalid2/config/etc/shadow b/tests/usertools/useradd/24_useradd_usage-s_invalid2/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/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/25_useradd_usage-s_invalid3/config/etc/group b/tests/usertools/useradd/25_useradd_usage-s_invalid3/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/25_useradd_usage-s_invalid3/config/etc/group diff --git a/tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/gshadow b/tests/usertools/useradd/25_useradd_usage-s_invalid3/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/25_useradd_usage-s_invalid3/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/passwd b/tests/usertools/useradd/25_useradd_usage-s_invalid3/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/25_useradd_usage-s_invalid3/config/etc/passwd diff --git a/tests/tests/usertools/useradd/25_useradd_usage-s_invalid3/config/etc/shadow b/tests/usertools/useradd/25_useradd_usage-s_invalid3/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/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/26_useradd_usage-o_without-u/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/26_useradd_usage-o_without-u/config/etc/group rename to tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/group diff --git a/tests/tests/usertools/useradd/26_useradd_usage-o_without-u/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/26_useradd_usage-o_without-u/config/etc/gshadow rename to tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/26_useradd_usage-o_without-u/config/etc/passwd b/tests/usertools/useradd/26_useradd_usage-o_without-u/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/26_useradd_usage-o_without-u/config/etc/passwd diff --git a/tests/tests/usertools/useradd/26_useradd_usage-o_without-u/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/26_useradd_usage-o_without-u/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/27_useradd_usage-k_without-m/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/27_useradd_usage-k_without-m/config/etc/group rename to tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/group diff --git a/tests/tests/usertools/useradd/27_useradd_usage-k_without-m/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/27_useradd_usage-k_without-m/config/etc/gshadow rename to tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/27_useradd_usage-k_without-m/config/etc/passwd b/tests/usertools/useradd/27_useradd_usage-k_without-m/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/27_useradd_usage-k_without-m/config/etc/passwd diff --git a/tests/tests/usertools/useradd/27_useradd_usage-k_without-m/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/27_useradd_usage-k_without-m/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/28_useradd_usage-U_with-g/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/28_useradd_usage-U_with-g/config/etc/group rename to tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/group diff --git a/tests/tests/usertools/useradd/28_useradd_usage-U_with-g/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/28_useradd_usage-U_with-g/config/etc/gshadow rename to tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/28_useradd_usage-U_with-g/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/28_useradd_usage-U_with-g/config/etc/passwd rename to tests/usertools/useradd/28_useradd_usage-U_with-g/config/etc/passwd diff --git a/tests/tests/usertools/useradd/28_useradd_usage-U_with-g/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/28_useradd_usage-U_with-g/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/29_useradd_usage-U_with-N/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/29_useradd_usage-U_with-N/config/etc/group rename to tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/group diff --git a/tests/tests/usertools/useradd/29_useradd_usage-U_with-N/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/29_useradd_usage-U_with-N/config/etc/gshadow rename to tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/29_useradd_usage-U_with-N/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/29_useradd_usage-U_with-N/config/etc/passwd rename to tests/usertools/useradd/29_useradd_usage-U_with-N/config/etc/passwd diff --git a/tests/tests/usertools/useradd/29_useradd_usage-U_with-N/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/29_useradd_usage-U_with-N/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/30_useradd_usage-m_with-M/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/30_useradd_usage-m_with-M/config/etc/group rename to tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/group diff --git a/tests/tests/usertools/useradd/30_useradd_usage-m_with-M/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/30_useradd_usage-m_with-M/config/etc/gshadow rename to tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/30_useradd_usage-m_with-M/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/30_useradd_usage-m_with-M/config/etc/passwd rename to tests/usertools/useradd/30_useradd_usage-m_with-M/config/etc/passwd diff --git a/tests/tests/usertools/useradd/30_useradd_usage-m_with-M/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/30_useradd_usage-m_with-M/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/31_useradd_usage_user_with-D/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/31_useradd_usage_user_with-D/config/etc/group rename to tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/group diff --git a/tests/tests/usertools/useradd/31_useradd_usage_user_with-D/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/31_useradd_usage_user_with-D/config/etc/gshadow rename to tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/31_useradd_usage_user_with-D/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/31_useradd_usage_user_with-D/config/etc/passwd rename to tests/usertools/useradd/31_useradd_usage_user_with-D/config/etc/passwd diff --git a/tests/tests/usertools/useradd/31_useradd_usage_user_with-D/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/31_useradd_usage_user_with-D/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/32_useradd_usage-D_with_other/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/32_useradd_usage-D_with_other/config/etc/group rename to tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/group diff --git a/tests/tests/usertools/useradd/32_useradd_usage-D_with_other/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/32_useradd_usage-D_with_other/config/etc/gshadow rename to tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/32_useradd_usage-D_with_other/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/32_useradd_usage-D_with_other/config/etc/passwd rename to tests/usertools/useradd/32_useradd_usage-D_with_other/config/etc/passwd diff --git a/tests/tests/usertools/useradd/32_useradd_usage-D_with_other/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/32_useradd_usage-D_with_other/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/33_useradd_usage_invalid_username/config/etc/group b/tests/usertools/useradd/33_useradd_usage_invalid_username/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/33_useradd_usage_invalid_username/config/etc/group diff --git a/tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/gshadow b/tests/usertools/useradd/33_useradd_usage_invalid_username/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/33_useradd_usage_invalid_username/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/passwd b/tests/usertools/useradd/33_useradd_usage_invalid_username/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/33_useradd_usage_invalid_username/config/etc/passwd diff --git a/tests/tests/usertools/useradd/33_useradd_usage_invalid_username/config/etc/shadow b/tests/usertools/useradd/33_useradd_usage_invalid_username/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/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/34_useradd_default_GROUP_GID/config/etc/group b/tests/usertools/useradd/34_useradd_default_GROUP_GID/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/34_useradd_default_GROUP_GID/config/etc/group diff --git a/tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/gshadow b/tests/usertools/useradd/34_useradd_default_GROUP_GID/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/34_useradd_default_GROUP_GID/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/passwd b/tests/usertools/useradd/34_useradd_default_GROUP_GID/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/34_useradd_default_GROUP_GID/config/etc/passwd diff --git a/tests/tests/usertools/useradd/34_useradd_default_GROUP_GID/config/etc/shadow b/tests/usertools/useradd/34_useradd_default_GROUP_GID/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/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/35_useradd_default_GROUP_name/config/etc/group b/tests/usertools/useradd/35_useradd_default_GROUP_name/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/35_useradd_default_GROUP_name/config/etc/group diff --git a/tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/gshadow b/tests/usertools/useradd/35_useradd_default_GROUP_name/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/35_useradd_default_GROUP_name/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/passwd b/tests/usertools/useradd/35_useradd_default_GROUP_name/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/35_useradd_default_GROUP_name/config/etc/passwd diff --git a/tests/tests/usertools/useradd/35_useradd_default_GROUP_name/config/etc/shadow b/tests/usertools/useradd/35_useradd_default_GROUP_name/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/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/36_useradd_default_GROUP_invalid_GID/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/36_useradd_default_GROUP_invalid_GID/config/etc/group rename to tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/group diff --git a/tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/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/36_useradd_default_GROUP_invalid_GID/config/etc/gshadow rename to tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/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/36_useradd_default_GROUP_invalid_GID/config/etc/passwd rename to tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/config/etc/passwd diff --git a/tests/tests/usertools/useradd/36_useradd_default_GROUP_invalid_GID/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/36_useradd_default_GROUP_invalid_GID/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/37_useradd_default_GROUP_invalid_name/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/37_useradd_default_GROUP_invalid_name/config/etc/group rename to tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/group diff --git a/tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/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/37_useradd_default_GROUP_invalid_name/config/etc/gshadow rename to tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/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/37_useradd_default_GROUP_invalid_name/config/etc/passwd rename to tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/config/etc/passwd diff --git a/tests/tests/usertools/useradd/37_useradd_default_GROUP_invalid_name/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/37_useradd_default_GROUP_invalid_name/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/38_useradd_default_INACTIVE/config/etc/group b/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/group similarity index 100% rename from tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/group rename to tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/group diff --git a/tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/gshadow b/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/gshadow rename to tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/passwd b/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/passwd similarity index 100% rename from tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/passwd rename to tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/passwd diff --git a/tests/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/shadow b/tests/usertools/useradd/38_useradd_default_INACTIVE/config/etc/shadow similarity index 100% rename from tests/tests/usertools/useradd/38_useradd_default_INACTIVE/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/39_useradd_default_INACTIVE_invalid1/config/etc/group b/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/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/39_useradd_default_INACTIVE_invalid1/config/etc/group diff --git a/tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/gshadow b/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/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/39_useradd_default_INACTIVE_invalid1/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/passwd b/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/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/39_useradd_default_INACTIVE_invalid1/config/etc/passwd diff --git a/tests/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/config/etc/shadow b/tests/usertools/useradd/39_useradd_default_INACTIVE_invalid1/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/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/40_useradd_default_INACTIVE_invalid2/config/etc/group b/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/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/40_useradd_default_INACTIVE_invalid2/config/etc/group diff --git a/tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/gshadow b/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/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/40_useradd_default_INACTIVE_invalid2/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/passwd b/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/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/40_useradd_default_INACTIVE_invalid2/config/etc/passwd diff --git a/tests/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/config/etc/shadow b/tests/usertools/useradd/40_useradd_default_INACTIVE_invalid2/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/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/41_useradd_default_default_SKEL/config/etc/group b/tests/usertools/useradd/41_useradd_default_default_SKEL/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/41_useradd_default_default_SKEL/config/etc/group diff --git a/tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/gshadow b/tests/usertools/useradd/41_useradd_default_default_SKEL/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/41_useradd_default_default_SKEL/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/passwd b/tests/usertools/useradd/41_useradd_default_default_SKEL/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/41_useradd_default_default_SKEL/config/etc/passwd diff --git a/tests/tests/usertools/useradd/41_useradd_default_default_SKEL/config/etc/shadow b/tests/usertools/useradd/41_useradd_default_default_SKEL/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/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/42_useradd_default_default_CREATE_MAIL_SPOOL/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/42_useradd_default_default_CREATE_MAIL_SPOOL/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/42_useradd_default_default_CREATE_MAIL_SPOOL/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/42_useradd_default_default_CREATE_MAIL_SPOOL/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/42_useradd_default_default_CREATE_MAIL_SPOOL/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/42_useradd_default_default_CREATE_MAIL_SPOOL/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/42_useradd_default_default_CREATE_MAIL_SPOOL/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/42_useradd_default_default_CREATE_MAIL_SPOOL/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/43_useradd_default_no_final_eol/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/43_useradd_default_no_final_eol/config/etc/group rename to tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/group diff --git a/tests/tests/usertools/useradd/43_useradd_default_no_final_eol/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/43_useradd_default_no_final_eol/config/etc/gshadow rename to tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/43_useradd_default_no_final_eol/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/43_useradd_default_no_final_eol/config/etc/passwd rename to tests/usertools/useradd/43_useradd_default_no_final_eol/config/etc/passwd diff --git a/tests/tests/usertools/useradd/43_useradd_default_no_final_eol/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/43_useradd_default_no_final_eol/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/44_useradd_default_no_file/config/etc/group b/tests/usertools/useradd/44_useradd_default_no_file/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/44_useradd_default_no_file/config/etc/group diff --git a/tests/tests/usertools/useradd/44_useradd_default_no_file/config/etc/gshadow b/tests/usertools/useradd/44_useradd_default_no_file/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/44_useradd_default_no_file/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/44_useradd_default_no_file/config/etc/passwd b/tests/usertools/useradd/44_useradd_default_no_file/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/44_useradd_default_no_file/config/etc/passwd diff --git a/tests/tests/usertools/useradd/44_useradd_default_no_file/config/etc/shadow b/tests/usertools/useradd/44_useradd_default_no_file/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/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/45_useradd-G_UID_name/config/etc/group b/tests/usertools/useradd/45_useradd-G_UID_name/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/45_useradd-G_UID_name/config/etc/group diff --git a/tests/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/gshadow b/tests/usertools/useradd/45_useradd-G_UID_name/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/45_useradd-G_UID_name/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/passwd b/tests/usertools/useradd/45_useradd-G_UID_name/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/45_useradd-G_UID_name/config/etc/passwd diff --git a/tests/tests/usertools/useradd/45_useradd-G_UID_name/config/etc/shadow b/tests/usertools/useradd/45_useradd-G_UID_name/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/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/46_useradd-G_UID_duplicate/config/etc/group b/tests/usertools/useradd/46_useradd-G_UID_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/46_useradd-G_UID_duplicate/config/etc/group diff --git a/tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/gshadow b/tests/usertools/useradd/46_useradd-G_UID_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/46_useradd-G_UID_duplicate/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/passwd b/tests/usertools/useradd/46_useradd-G_UID_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/46_useradd-G_UID_duplicate/config/etc/passwd diff --git a/tests/tests/usertools/useradd/46_useradd-G_UID_duplicate/config/etc/shadow b/tests/usertools/useradd/46_useradd-G_UID_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/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/47_useradd-G_UID_name_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/47_useradd-G_UID_name_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/47_useradd-G_UID_name_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/47_useradd-G_UID_name_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/47_useradd-G_UID_name_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/47_useradd-G_UID_name_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/47_useradd-G_UID_name_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/47_useradd-G_UID_name_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/48_useradd-G_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/48_useradd-G_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/48_useradd-G_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/48_useradd-G_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/48_useradd-G_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/48_useradd-G_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/48_useradd-G_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/48_useradd-G_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/49_useradd-G_invalid_group/config/etc/group b/tests/usertools/useradd/49_useradd-G_invalid_group/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/49_useradd-G_invalid_group/config/etc/group diff --git a/tests/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/gshadow b/tests/usertools/useradd/49_useradd-G_invalid_group/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/49_useradd-G_invalid_group/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/passwd b/tests/usertools/useradd/49_useradd-G_invalid_group/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/49_useradd-G_invalid_group/config/etc/passwd diff --git a/tests/tests/usertools/useradd/49_useradd-G_invalid_group/config/etc/shadow b/tests/usertools/useradd/49_useradd-G_invalid_group/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/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/50_useradd-r/config/etc/group b/tests/usertools/useradd/50_useradd-r/config/etc/group similarity index 100% rename from tests/tests/usertools/useradd/50_useradd-r/config/etc/group rename to tests/usertools/useradd/50_useradd-r/config/etc/group diff --git a/tests/tests/usertools/useradd/50_useradd-r/config/etc/gshadow b/tests/usertools/useradd/50_useradd-r/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/useradd/50_useradd-r/config/etc/gshadow rename to tests/usertools/useradd/50_useradd-r/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/50_useradd-r/config/etc/passwd b/tests/usertools/useradd/50_useradd-r/config/etc/passwd similarity index 100% rename from tests/tests/usertools/useradd/50_useradd-r/config/etc/passwd rename to tests/usertools/useradd/50_useradd-r/config/etc/passwd diff --git a/tests/tests/usertools/useradd/50_useradd-r/config/etc/shadow b/tests/usertools/useradd/50_useradd-r/config/etc/shadow similarity index 100% rename from tests/tests/usertools/useradd/50_useradd-r/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/useradd/51_useradd_already_exist/config/etc/group b/tests/usertools/useradd/51_useradd_already_exist/config/etc/group similarity index 100% rename from tests/tests/usertools/useradd/51_useradd_already_exist/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/51_useradd_already_exist/config/etc/passwd b/tests/usertools/useradd/51_useradd_already_exist/config/etc/passwd similarity index 100% rename from tests/tests/usertools/useradd/51_useradd_already_exist/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/useradd/52_useradd-U_group_already_exist/config/etc/group b/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/group similarity index 100% rename from tests/tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/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/52_useradd-U_group_already_exist/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/52_useradd-U_group_already_exist/config/etc/passwd rename to tests/usertools/useradd/52_useradd-U_group_already_exist/config/etc/passwd diff --git a/tests/tests/usertools/useradd/52_useradd-U_group_already_exist/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/52_useradd-U_group_already_exist/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/53_useradd-G_empty/config/etc/group b/tests/usertools/useradd/53_useradd-G_empty/config/etc/group similarity index 100% rename from tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/group rename to tests/usertools/useradd/53_useradd-G_empty/config/etc/group diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/gshadow b/tests/usertools/useradd/53_useradd-G_empty/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/gshadow rename to tests/usertools/useradd/53_useradd-G_empty/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/passwd b/tests/usertools/useradd/53_useradd-G_empty/config/etc/passwd similarity index 100% rename from tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/passwd rename to tests/usertools/useradd/53_useradd-G_empty/config/etc/passwd diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/shadow b/tests/usertools/useradd/53_useradd-G_empty/config/etc/shadow similarity index 100% rename from tests/tests/usertools/useradd/53_useradd-G_empty/config/etc/shadow rename to tests/usertools/useradd/53_useradd-G_empty/config/etc/shadow diff --git a/tests/tests/usertools/useradd/53_useradd-G_empty/data/group b/tests/usertools/useradd/53_useradd-G_empty/data/group similarity index 100% rename from tests/tests/usertools/useradd/53_useradd-G_empty/data/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/54_useradd_no_shadow_file/config/etc/group b/tests/usertools/useradd/54_useradd_no_shadow_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/54_useradd_no_shadow_file/config/etc/group diff --git a/tests/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/gshadow b/tests/usertools/useradd/54_useradd_no_shadow_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/54_useradd_no_shadow_file/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/passwd b/tests/usertools/useradd/54_useradd_no_shadow_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/54_useradd_no_shadow_file/config/etc/passwd diff --git a/tests/tests/usertools/useradd/54_useradd_no_shadow_file/config/etc/shadow b/tests/usertools/useradd/54_useradd_no_shadow_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/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/55_useradd_no_gshadow_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/55_useradd_no_gshadow_file/config/etc/group rename to tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/group diff --git a/tests/tests/usertools/useradd/55_useradd_no_gshadow_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/55_useradd_no_gshadow_file/config/etc/gshadow rename to tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/55_useradd_no_gshadow_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/55_useradd_no_gshadow_file/config/etc/passwd rename to tests/usertools/useradd/55_useradd_no_gshadow_file/config/etc/passwd diff --git a/tests/tests/usertools/useradd/55_useradd_no_gshadow_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/55_useradd_no_gshadow_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/56_useradd_gshadow_entry_without_group_entry/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/56_useradd_gshadow_entry_without_group_entry/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/56_useradd_gshadow_entry_without_group_entry/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/56_useradd_gshadow_entry_without_group_entry/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/56_useradd_gshadow_entry_without_group_entry/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/56_useradd_gshadow_entry_without_group_entry/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/57_useradd_usage-D_not_first_option/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/57_useradd_usage-D_not_first_option/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/57_useradd_usage-D_not_first_option/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/57_useradd_usage-D_not_first_option/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/57_useradd_usage-D_not_first_option/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/57_useradd_usage-D_not_first_option/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/57_useradd_usage-D_not_first_option/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/57_useradd_usage-D_not_first_option/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/58_useradd-e_empty/config/etc/group b/tests/usertools/useradd/58_useradd-e_empty/config/etc/group similarity index 100% rename from tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/group rename to tests/usertools/useradd/58_useradd-e_empty/config/etc/group diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/gshadow b/tests/usertools/useradd/58_useradd-e_empty/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/gshadow rename to tests/usertools/useradd/58_useradd-e_empty/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/passwd b/tests/usertools/useradd/58_useradd-e_empty/config/etc/passwd similarity index 100% rename from tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/passwd rename to tests/usertools/useradd/58_useradd-e_empty/config/etc/passwd diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/shadow b/tests/usertools/useradd/58_useradd-e_empty/config/etc/shadow similarity index 100% rename from tests/tests/usertools/useradd/58_useradd-e_empty/config/etc/shadow rename to tests/usertools/useradd/58_useradd-e_empty/config/etc/shadow diff --git a/tests/tests/usertools/useradd/58_useradd-e_empty/data/group b/tests/usertools/useradd/58_useradd-e_empty/data/group similarity index 100% rename from tests/tests/usertools/useradd/58_useradd-e_empty/data/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/59_useradd-e-1-f-1/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/59_useradd-e-1-f-1/config/etc/group rename to tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/group diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/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/59_useradd-e-1-f-1/config/etc/gshadow rename to tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/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/59_useradd-e-1-f-1/config/etc/passwd rename to tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/passwd diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/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/59_useradd-e-1-f-1/config/etc/shadow rename to tests/usertools/useradd/59_useradd-e-1-f-1/config/etc/shadow diff --git a/tests/tests/usertools/useradd/59_useradd-e-1-f-1/data/group b/tests/usertools/useradd/59_useradd-e-1-f-1/data/group similarity index 100% rename from tests/tests/usertools/useradd/59_useradd-e-1-f-1/data/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/60_useradd-e-1-f-1_no_shadow_file/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/60_useradd-e-1-f-1_no_shadow_file/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/60_useradd-e-1-f-1_no_shadow_file/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/60_useradd-e-1-f-1_no_shadow_file/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/60_useradd-e-1-f-1_no_shadow_file/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/60_useradd-e-1-f-1_no_shadow_file/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/60_useradd-e-1-f-1_no_shadow_file/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/60_useradd-e-1-f-1_no_shadow_file/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/60_useradd-e-1-f-1_no_shadow_file/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/60_useradd-e-1-f-1_no_shadow_file/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/61_useradd-K/config/etc/group b/tests/usertools/useradd/61_useradd-K/config/etc/group similarity index 100% rename from tests/tests/usertools/useradd/61_useradd-K/config/etc/group rename to tests/usertools/useradd/61_useradd-K/config/etc/group diff --git a/tests/tests/usertools/useradd/61_useradd-K/config/etc/gshadow b/tests/usertools/useradd/61_useradd-K/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/useradd/61_useradd-K/config/etc/gshadow rename to tests/usertools/useradd/61_useradd-K/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/61_useradd-K/config/etc/passwd b/tests/usertools/useradd/61_useradd-K/config/etc/passwd similarity index 100% rename from tests/tests/usertools/useradd/61_useradd-K/config/etc/passwd rename to tests/usertools/useradd/61_useradd-K/config/etc/passwd diff --git a/tests/tests/usertools/useradd/61_useradd-K/config/etc/shadow b/tests/usertools/useradd/61_useradd-K/config/etc/shadow similarity index 100% rename from tests/tests/usertools/useradd/61_useradd-K/config/etc/shadow rename to tests/usertools/useradd/61_useradd-K/config/etc/shadow diff --git a/tests/tests/usertools/useradd/61_useradd-K/data/group b/tests/usertools/useradd/61_useradd-K/data/group similarity index 100% rename from tests/tests/usertools/useradd/61_useradd-K/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/62_useradd-p/config/etc/group b/tests/usertools/useradd/62_useradd-p/config/etc/group similarity index 100% rename from tests/tests/usertools/useradd/62_useradd-p/config/etc/group rename to tests/usertools/useradd/62_useradd-p/config/etc/group diff --git a/tests/tests/usertools/useradd/62_useradd-p/config/etc/gshadow b/tests/usertools/useradd/62_useradd-p/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/useradd/62_useradd-p/config/etc/gshadow rename to tests/usertools/useradd/62_useradd-p/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/62_useradd-p/config/etc/passwd b/tests/usertools/useradd/62_useradd-p/config/etc/passwd similarity index 100% rename from tests/tests/usertools/useradd/62_useradd-p/config/etc/passwd rename to tests/usertools/useradd/62_useradd-p/config/etc/passwd diff --git a/tests/tests/usertools/useradd/62_useradd-p/config/etc/shadow b/tests/usertools/useradd/62_useradd-p/config/etc/shadow similarity index 100% rename from tests/tests/usertools/useradd/62_useradd-p/config/etc/shadow rename to tests/usertools/useradd/62_useradd-p/config/etc/shadow diff --git a/tests/tests/usertools/useradd/62_useradd-p/data/group b/tests/usertools/useradd/62_useradd-p/data/group similarity index 100% rename from tests/tests/usertools/useradd/62_useradd-p/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/63_useradd-s/config/etc/group b/tests/usertools/useradd/63_useradd-s/config/etc/group similarity index 100% rename from tests/tests/usertools/useradd/63_useradd-s/config/etc/group rename to tests/usertools/useradd/63_useradd-s/config/etc/group diff --git a/tests/tests/usertools/useradd/63_useradd-s/config/etc/gshadow b/tests/usertools/useradd/63_useradd-s/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/useradd/63_useradd-s/config/etc/gshadow rename to tests/usertools/useradd/63_useradd-s/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/63_useradd-s/config/etc/passwd b/tests/usertools/useradd/63_useradd-s/config/etc/passwd similarity index 100% rename from tests/tests/usertools/useradd/63_useradd-s/config/etc/passwd rename to tests/usertools/useradd/63_useradd-s/config/etc/passwd diff --git a/tests/tests/usertools/useradd/63_useradd-s/config/etc/shadow b/tests/usertools/useradd/63_useradd-s/config/etc/shadow similarity index 100% rename from tests/tests/usertools/useradd/63_useradd-s/config/etc/shadow rename to tests/usertools/useradd/63_useradd-s/config/etc/shadow diff --git a/tests/tests/usertools/useradd/63_useradd-s/data/group b/tests/usertools/useradd/63_useradd-s/data/group similarity index 100% rename from tests/tests/usertools/useradd/63_useradd-s/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/useradd/64_useradd_locked_passwd/config.txt b/tests/usertools/useradd/64_useradd_locked_passwd/config.txt similarity index 100% rename from tests/tests/usertools/useradd/64_useradd_locked_passwd/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/64_useradd_locked_passwd/config/etc/passwd b/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/passwd similarity index 100% rename from tests/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/passwd rename to tests/usertools/useradd/64_useradd_locked_passwd/config/etc/passwd diff --git a/tests/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/shadow b/tests/usertools/useradd/64_useradd_locked_passwd/config/etc/shadow similarity index 100% rename from tests/tests/usertools/useradd/64_useradd_locked_passwd/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/useradd/65_useradd_locked_group/config.txt b/tests/usertools/useradd/65_useradd_locked_group/config.txt similarity index 100% rename from tests/tests/usertools/useradd/65_useradd_locked_group/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/65_useradd_locked_group/config/etc/passwd b/tests/usertools/useradd/65_useradd_locked_group/config/etc/passwd similarity index 100% rename from tests/tests/usertools/useradd/65_useradd_locked_group/config/etc/passwd rename to tests/usertools/useradd/65_useradd_locked_group/config/etc/passwd diff --git a/tests/tests/usertools/useradd/65_useradd_locked_group/config/etc/shadow b/tests/usertools/useradd/65_useradd_locked_group/config/etc/shadow similarity index 100% rename from tests/tests/usertools/useradd/65_useradd_locked_group/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/useradd/66_useradd_locked_shadow/config.txt b/tests/usertools/useradd/66_useradd_locked_shadow/config.txt similarity index 100% rename from tests/tests/usertools/useradd/66_useradd_locked_shadow/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/66_useradd_locked_shadow/config/etc/passwd b/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/passwd similarity index 100% rename from tests/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/passwd rename to tests/usertools/useradd/66_useradd_locked_shadow/config/etc/passwd diff --git a/tests/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/shadow b/tests/usertools/useradd/66_useradd_locked_shadow/config/etc/shadow similarity index 100% rename from tests/tests/usertools/useradd/66_useradd_locked_shadow/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/useradd/67_useradd_locked_gshadow/config.txt b/tests/usertools/useradd/67_useradd_locked_gshadow/config.txt similarity index 100% rename from tests/tests/usertools/useradd/67_useradd_locked_gshadow/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/67_useradd_locked_gshadow/config/etc/passwd b/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/passwd similarity index 100% rename from tests/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/passwd rename to tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/passwd diff --git a/tests/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/shadow b/tests/usertools/useradd/67_useradd_locked_gshadow/config/etc/shadow similarity index 100% rename from tests/tests/usertools/useradd/67_useradd_locked_gshadow/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/68_useradd-s_empty/config/etc/group b/tests/usertools/useradd/68_useradd-s_empty/config/etc/group similarity index 100% rename from tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/group rename to tests/usertools/useradd/68_useradd-s_empty/config/etc/group diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/gshadow b/tests/usertools/useradd/68_useradd-s_empty/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/gshadow rename to tests/usertools/useradd/68_useradd-s_empty/config/etc/gshadow diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/passwd b/tests/usertools/useradd/68_useradd-s_empty/config/etc/passwd similarity index 100% rename from tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/passwd rename to tests/usertools/useradd/68_useradd-s_empty/config/etc/passwd diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/shadow b/tests/usertools/useradd/68_useradd-s_empty/config/etc/shadow similarity index 100% rename from tests/tests/usertools/useradd/68_useradd-s_empty/config/etc/shadow rename to tests/usertools/useradd/68_useradd-s_empty/config/etc/shadow diff --git a/tests/tests/usertools/useradd/68_useradd-s_empty/data/group b/tests/usertools/useradd/68_useradd-s_empty/data/group similarity index 100% rename from tests/tests/usertools/useradd/68_useradd-s_empty/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/userdel/01_userdel_usage/config/etc/group b/tests/usertools/userdel/01_userdel_usage/config/etc/group similarity index 100% rename from tests/tests/usertools/userdel/01_userdel_usage/config/etc/group rename to tests/usertools/userdel/01_userdel_usage/config/etc/group diff --git a/tests/tests/usertools/userdel/01_userdel_usage/config/etc/gshadow b/tests/usertools/userdel/01_userdel_usage/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/userdel/01_userdel_usage/config/etc/gshadow rename to tests/usertools/userdel/01_userdel_usage/config/etc/gshadow diff --git a/tests/tests/usertools/userdel/01_userdel_usage/config/etc/passwd b/tests/usertools/userdel/01_userdel_usage/config/etc/passwd similarity index 100% rename from tests/tests/usertools/userdel/01_userdel_usage/config/etc/passwd rename to tests/usertools/userdel/01_userdel_usage/config/etc/passwd diff --git a/tests/tests/usertools/userdel/01_userdel_usage/config/etc/shadow b/tests/usertools/userdel/01_userdel_usage/config/etc/shadow similarity index 100% rename from tests/tests/usertools/userdel/01_userdel_usage/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/02_userdel_usage_invalid_option/config/etc/group b/tests/usertools/userdel/02_userdel_usage_invalid_option/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/02_userdel_usage_invalid_option/config/etc/group diff --git a/tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/gshadow b/tests/usertools/userdel/02_userdel_usage_invalid_option/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/02_userdel_usage_invalid_option/config/etc/gshadow diff --git a/tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/passwd b/tests/usertools/userdel/02_userdel_usage_invalid_option/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/02_userdel_usage_invalid_option/config/etc/passwd diff --git a/tests/tests/usertools/userdel/02_userdel_usage_invalid_option/config/etc/shadow b/tests/usertools/userdel/02_userdel_usage_invalid_option/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/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/03_userdel_usage_no_users/config/etc/group b/tests/usertools/userdel/03_userdel_usage_no_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/03_userdel_usage_no_users/config/etc/group diff --git a/tests/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/gshadow b/tests/usertools/userdel/03_userdel_usage_no_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/03_userdel_usage_no_users/config/etc/gshadow diff --git a/tests/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/passwd b/tests/usertools/userdel/03_userdel_usage_no_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/03_userdel_usage_no_users/config/etc/passwd diff --git a/tests/tests/usertools/userdel/03_userdel_usage_no_users/config/etc/shadow b/tests/usertools/userdel/03_userdel_usage_no_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/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/04_userdel_usage_2_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/04_userdel_usage_2_users/config/etc/group rename to tests/usertools/userdel/04_userdel_usage_2_users/config/etc/group diff --git a/tests/tests/usertools/userdel/04_userdel_usage_2_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/04_userdel_usage_2_users/config/etc/gshadow rename to tests/usertools/userdel/04_userdel_usage_2_users/config/etc/gshadow diff --git a/tests/tests/usertools/userdel/04_userdel_usage_2_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/04_userdel_usage_2_users/config/etc/passwd rename to tests/usertools/userdel/04_userdel_usage_2_users/config/etc/passwd diff --git a/tests/tests/usertools/userdel/04_userdel_usage_2_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/04_userdel_usage_2_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/userdel/10_userdel_del_homedir_symlink/config/etc/gshadow b/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/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/userdel/10_userdel_del_homedir_symlink/config/etc/shadow b/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/shadow similarity index 100% rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/shadow rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/config/etc/shadow diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/group b/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/group similarity index 100% rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/group rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/data/group diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/gshadow b/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/gshadow similarity index 100% rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/gshadow rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/data/gshadow diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/passwd b/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/passwd similarity index 100% rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/passwd rename to tests/usertools/userdel/10_userdel_del_homedir_symlink/data/passwd diff --git a/tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/shadow b/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/shadow similarity index 100% rename from tests/tests/usertools/userdel/10_userdel_del_homedir_symlink/data/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/usermod/01_usermod-p_no_shadow_file/config/etc/group b/tests/usertools/usermod/01_usermod-p_no_shadow_file/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/01_usermod-p_no_shadow_file/config/etc/group diff --git a/tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/gshadow b/tests/usertools/usermod/01_usermod-p_no_shadow_file/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/01_usermod-p_no_shadow_file/config/etc/gshadow diff --git a/tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/passwd b/tests/usertools/usermod/01_usermod-p_no_shadow_file/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/01_usermod-p_no_shadow_file/config/etc/passwd diff --git a/tests/tests/usertools/usermod/01_usermod-p_no_shadow_file/config/etc/shadow b/tests/usertools/usermod/01_usermod-p_no_shadow_file/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/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/usermod/02_usermod-p_no_shadow_entry/config/etc/group b/tests/usertools/usermod/02_usermod-p_no_shadow_entry/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/02_usermod-p_no_shadow_entry/config/etc/group diff --git a/tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/gshadow b/tests/usertools/usermod/02_usermod-p_no_shadow_entry/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/02_usermod-p_no_shadow_entry/config/etc/gshadow diff --git a/tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/passwd b/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/passwd similarity index 100% rename from tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/passwd rename to tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/passwd diff --git a/tests/tests/usertools/usermod/02_usermod-p_no_shadow_entry/config/etc/shadow b/tests/usertools/usermod/02_usermod-p_no_shadow_entry/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/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/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/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/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/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/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/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/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/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/03_usermod-p_no_shadow_entry_but_shadow_enabled/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/03_usermod-p_no_shadow_entry_but_shadow_enabled/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/04_usermod_lock_already_locked_password1/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/04_usermod_lock_already_locked_password1/config/etc/group rename to tests/usertools/usermod/04_usermod_lock_already_locked_password1/config/etc/group diff --git a/tests/tests/usertools/usermod/04_usermod_lock_already_locked_password1/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/04_usermod_lock_already_locked_password1/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/05_usermod_lock_already_locked_password2/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/05_usermod_lock_already_locked_password2/config/etc/group rename to tests/usertools/usermod/05_usermod_lock_already_locked_password2/config/etc/group diff --git a/tests/tests/usertools/usermod/05_usermod_lock_already_locked_password2/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/05_usermod_lock_already_locked_password2/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/06_usermod_lock_already_locked_password3/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/06_usermod_lock_already_locked_password3/config/etc/group rename to tests/usertools/usermod/06_usermod_lock_already_locked_password3/config/etc/group diff --git a/tests/tests/usertools/usermod/06_usermod_lock_already_locked_password3/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/06_usermod_lock_already_locked_password3/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/06_usermod_lock_already_locked_password3/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/06_usermod_lock_already_locked_password3/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/07_usermod_unlock_already_unlocked_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/07_usermod_unlock_already_unlocked_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/07_usermod_unlock_already_unlocked_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/07_usermod_unlock_already_unlocked_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/08_usermod_unlock_already_unlocked_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/08_usermod_unlock_already_unlocked_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/08_usermod_unlock_already_unlocked_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/08_usermod_unlock_already_unlocked_password2/config/etc/gshadow rename to tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/gshadow diff --git a/tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/passwd b/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/config/etc/passwd similarity index 100% rename from tests/tests/usertools/usermod/08_usermod_unlock_already_unlocked_password2/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/09_usermod_unlock_already_unlocked_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/09_usermod_unlock_already_unlocked_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/09_usermod_unlock_already_unlocked_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/09_usermod_unlock_already_unlocked_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/09_usermod_unlock_already_unlocked_password3/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/09_usermod_unlock_already_unlocked_password3/config/etc/passwd rename to tests/usertools/usermod/09_usermod_unlock_already_unlocked_password3/config/etc/passwd diff --git a/tests/tests/usertools/usermod/09_usermod_unlock_already_unlocked_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/09_usermod_unlock_already_unlocked_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/usermod/10_usermod_usage/config/etc/group b/tests/usertools/usermod/10_usermod_usage/config/etc/group similarity index 100% rename from tests/tests/usertools/usermod/10_usermod_usage/config/etc/group rename to tests/usertools/usermod/10_usermod_usage/config/etc/group diff --git a/tests/tests/usertools/usermod/10_usermod_usage/config/etc/gshadow b/tests/usertools/usermod/10_usermod_usage/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/usermod/10_usermod_usage/config/etc/gshadow rename to tests/usertools/usermod/10_usermod_usage/config/etc/gshadow diff --git a/tests/tests/usertools/usermod/10_usermod_usage/config/etc/passwd b/tests/usertools/usermod/10_usermod_usage/config/etc/passwd similarity index 100% rename from tests/tests/usertools/usermod/10_usermod_usage/config/etc/passwd rename to tests/usertools/usermod/10_usermod_usage/config/etc/passwd diff --git a/tests/tests/usertools/usermod/10_usermod_usage/config/etc/shadow b/tests/usertools/usermod/10_usermod_usage/config/etc/shadow similarity index 100% rename from tests/tests/usertools/usermod/10_usermod_usage/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/11_usermod_usage_bad_option/config/etc/group b/tests/usertools/usermod/11_usermod_usage_bad_option/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/11_usermod_usage_bad_option/config/etc/group diff --git a/tests/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/gshadow b/tests/usertools/usermod/11_usermod_usage_bad_option/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/11_usermod_usage_bad_option/config/etc/gshadow diff --git a/tests/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/passwd b/tests/usertools/usermod/11_usermod_usage_bad_option/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/11_usermod_usage_bad_option/config/etc/passwd diff --git a/tests/tests/usertools/usermod/11_usermod_usage_bad_option/config/etc/shadow b/tests/usertools/usermod/11_usermod_usage_bad_option/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/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/12_usermod_usage_bad-f/config/etc/group b/tests/usertools/usermod/12_usermod_usage_bad-f/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/12_usermod_usage_bad-f/config/etc/group diff --git a/tests/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/gshadow b/tests/usertools/usermod/12_usermod_usage_bad-f/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/12_usermod_usage_bad-f/config/etc/gshadow diff --git a/tests/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/passwd b/tests/usertools/usermod/12_usermod_usage_bad-f/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/12_usermod_usage_bad-f/config/etc/passwd diff --git a/tests/tests/usertools/usermod/12_usermod_usage_bad-f/config/etc/shadow b/tests/usertools/usermod/12_usermod_usage_bad-f/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/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/13_usermod_usage_bad-f_negativ/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/13_usermod_usage_bad-f_negativ/config/etc/group rename to tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/group diff --git a/tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/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/13_usermod_usage_bad-f_negativ/config/etc/gshadow rename to tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/gshadow diff --git a/tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/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/13_usermod_usage_bad-f_negativ/config/etc/passwd rename to tests/usertools/usermod/13_usermod_usage_bad-f_negativ/config/etc/passwd diff --git a/tests/tests/usertools/usermod/13_usermod_usage_bad-f_negativ/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/13_usermod_usage_bad-f_negativ/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/14_usermod_usage_no_options/config/etc/group b/tests/usertools/usermod/14_usermod_usage_no_options/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/14_usermod_usage_no_options/config/etc/group diff --git a/tests/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/gshadow b/tests/usertools/usermod/14_usermod_usage_no_options/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/14_usermod_usage_no_options/config/etc/gshadow diff --git a/tests/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/passwd b/tests/usertools/usermod/14_usermod_usage_no_options/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/14_usermod_usage_no_options/config/etc/passwd diff --git a/tests/tests/usertools/usermod/14_usermod_usage_no_options/config/etc/shadow b/tests/usertools/usermod/14_usermod_usage_no_options/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/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/15_usermod_usage_no_user/config/etc/group b/tests/usertools/usermod/15_usermod_usage_no_user/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/15_usermod_usage_no_user/config/etc/group diff --git a/tests/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/gshadow b/tests/usertools/usermod/15_usermod_usage_no_user/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/15_usermod_usage_no_user/config/etc/gshadow diff --git a/tests/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/passwd b/tests/usertools/usermod/15_usermod_usage_no_user/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/15_usermod_usage_no_user/config/etc/passwd diff --git a/tests/tests/usertools/usermod/15_usermod_usage_no_user/config/etc/shadow b/tests/usertools/usermod/15_usermod_usage_no_user/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/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/16_usermod_usage_-e_no_shadow_file/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/16_usermod_usage_-e_no_shadow_file/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/16_usermod_usage_-e_no_shadow_file/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/16_usermod_usage_-e_no_shadow_file/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/16_usermod_usage_-e_no_shadow_file/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/16_usermod_usage_-e_no_shadow_file/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/16_usermod_usage_-e_no_shadow_file/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/16_usermod_usage_-e_no_shadow_file/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/17_usermod_usage_-f_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/17_usermod_usage_-f_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/17_usermod_usage_-f_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/17_usermod_usage_-f_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/17_usermod_usage_-f_no_shadow_file/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/17_usermod_usage_-f_no_shadow_file/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/17_usermod_usage_-f_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/17_usermod_usage_-f_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/18_usermod_usage-L-p_exclusive/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/18_usermod_usage-L-p_exclusive/config/etc/group rename to tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/group diff --git a/tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/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/18_usermod_usage-L-p_exclusive/config/etc/gshadow rename to tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/gshadow diff --git a/tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/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/18_usermod_usage-L-p_exclusive/config/etc/passwd rename to tests/usertools/usermod/18_usermod_usage-L-p_exclusive/config/etc/passwd diff --git a/tests/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/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/18_usermod_usage-L-p_exclusive/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/19_usermod_usage-L-U_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/19_usermod_usage-L-U_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/19_usermod_usage-L-U_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/19_usermod_usage-L-U_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/19_usermod_usage-L-U_exclusive/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/19_usermod_usage-L-U_exclusive/config/etc/passwd rename to tests/usertools/usermod/19_usermod_usage-L-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/19_usermod_usage-L-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/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/20_usermod_usage-p-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/20_usermod_usage-p-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/20_usermod_usage-p-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/20_usermod_usage-p-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/20_usermod_usage-p-U_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/20_usermod_usage-p-U_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/20_usermod_usage-p-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/20_usermod_usage-p-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/21_usermod_rename_user_no_gshadow_file/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/21_usermod_rename_user_no_gshadow_file/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/21_usermod_rename_user_no_gshadow_file/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/21_usermod_rename_user_no_gshadow_file/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/usermod/21_usermod_rename_user_no_gshadow_file/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/usermod/21_usermod_rename_user_no_gshadow_file/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/22_usermod_usage_rename_invalid_username/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/22_usermod_usage_rename_invalid_username/config/etc/group rename to tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/group diff --git a/tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/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/22_usermod_usage_rename_invalid_username/config/etc/gshadow rename to tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/gshadow diff --git a/tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/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/22_usermod_usage_rename_invalid_username/config/etc/passwd rename to tests/usertools/usermod/22_usermod_usage_rename_invalid_username/config/etc/passwd diff --git a/tests/tests/usertools/usermod/22_usermod_usage_rename_invalid_username/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/22_usermod_usage_rename_invalid_username/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/23_usermod-e_date/config/etc/group b/tests/usertools/usermod/23_usermod-e_date/config/etc/group similarity index 100% rename from tests/tests/usertools/usermod/23_usermod-e_date/config/etc/group rename to tests/usertools/usermod/23_usermod-e_date/config/etc/group diff --git a/tests/tests/usertools/usermod/23_usermod-e_date/config/etc/gshadow b/tests/usertools/usermod/23_usermod-e_date/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/usermod/23_usermod-e_date/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/24_usermod-e_date/config/etc/group b/tests/usertools/usermod/24_usermod-e_date/config/etc/group similarity index 100% rename from tests/tests/usertools/usermod/24_usermod-e_date/config/etc/group rename to tests/usertools/usermod/24_usermod-e_date/config/etc/group diff --git a/tests/tests/usertools/usermod/24_usermod-e_date/config/etc/gshadow b/tests/usertools/usermod/24_usermod-e_date/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/usermod/24_usermod-e_date/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/25_usermod-e_empty_arg/config/etc/group b/tests/usertools/usermod/25_usermod-e_empty_arg/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/25_usermod-e_empty_arg/config/etc/group diff --git a/tests/tests/usertools/usermod/25_usermod-e_empty_arg/config/etc/gshadow b/tests/usertools/usermod/25_usermod-e_empty_arg/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/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/26_usermod-e-1/config/etc/group b/tests/usertools/usermod/26_usermod-e-1/config/etc/group similarity index 100% rename from tests/tests/usertools/usermod/26_usermod-e-1/config/etc/group rename to tests/usertools/usermod/26_usermod-e-1/config/etc/group diff --git a/tests/tests/usertools/usermod/26_usermod-e-1/config/etc/gshadow b/tests/usertools/usermod/26_usermod-e-1/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/usermod/26_usermod-e-1/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/27_usermod-e_invalid1/config/etc/group b/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/group similarity index 100% rename from tests/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/group rename to tests/usertools/usermod/27_usermod-e_invalid1/config/etc/group diff --git a/tests/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/gshadow b/tests/usertools/usermod/27_usermod-e_invalid1/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/usermod/27_usermod-e_invalid1/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/28_usermod-e_invalid2/config/etc/group b/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/group similarity index 100% rename from tests/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/group rename to tests/usertools/usermod/28_usermod-e_invalid2/config/etc/group diff --git a/tests/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/gshadow b/tests/usertools/usermod/28_usermod-e_invalid2/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/usermod/28_usermod-e_invalid2/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/29_usermod_no_changes/config/etc/group b/tests/usertools/usermod/29_usermod_no_changes/config/etc/group similarity index 100% rename from tests/tests/usertools/usermod/29_usermod_no_changes/config/etc/group rename to tests/usertools/usermod/29_usermod_no_changes/config/etc/group diff --git a/tests/tests/usertools/usermod/29_usermod_no_changes/config/etc/gshadow b/tests/usertools/usermod/29_usermod_no_changes/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/usermod/29_usermod_no_changes/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/30_usermod_usage-a_without-G/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/30_usermod_usage-a_without-G/config/etc/group rename to tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/group diff --git a/tests/tests/usertools/usermod/30_usermod_usage-a_without-G/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/30_usermod_usage-a_without-G/config/etc/gshadow rename to tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/gshadow diff --git a/tests/tests/usertools/usermod/30_usermod_usage-a_without-G/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/30_usermod_usage-a_without-G/config/etc/passwd rename to tests/usertools/usermod/30_usermod_usage-a_without-G/config/etc/passwd diff --git a/tests/tests/usertools/usermod/30_usermod_usage-a_without-G/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/30_usermod_usage-a_without-G/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/31_usermod_usage-o_without-u/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/31_usermod_usage-o_without-u/config/etc/group rename to tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/group diff --git a/tests/tests/usertools/usermod/31_usermod_usage-o_without-u/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/31_usermod_usage-o_without-u/config/etc/gshadow rename to tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/gshadow diff --git a/tests/tests/usertools/usermod/31_usermod_usage-o_without-u/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/31_usermod_usage-o_without-u/config/etc/passwd rename to tests/usertools/usermod/31_usermod_usage-o_without-u/config/etc/passwd diff --git a/tests/tests/usertools/usermod/31_usermod_usage-o_without-u/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/31_usermod_usage-o_without-u/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/32_usermod_usage-m_without-d/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/32_usermod_usage-m_without-d/config/etc/group rename to tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/group diff --git a/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/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/32_usermod_usage-m_without-d/config/etc/gshadow rename to tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/gshadow diff --git a/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/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/32_usermod_usage-m_without-d/config/etc/passwd rename to tests/usertools/usermod/32_usermod_usage-m_without-d/config/etc/passwd diff --git a/tests/tests/usertools/usermod/32_usermod_usage-m_without-d/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/32_usermod_usage-m_without-d/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/33_usermod_change_shell/config/etc/group b/tests/usertools/usermod/33_usermod_change_shell/config/etc/group similarity index 100% rename from tests/tests/usertools/usermod/33_usermod_change_shell/config/etc/group rename to tests/usertools/usermod/33_usermod_change_shell/config/etc/group diff --git a/tests/tests/usertools/usermod/33_usermod_change_shell/config/etc/gshadow b/tests/usertools/usermod/33_usermod_change_shell/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/usermod/33_usermod_change_shell/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/34_usermod-e_date_no_shadow_entry/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/34_usermod-e_date_no_shadow_entry/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/34_usermod-e_date_no_shadow_entry/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/34_usermod-e_date_no_shadow_entry/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/34_usermod-e_date_no_shadow_entry/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/34_usermod-e_date_no_shadow_entry/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/35_usermod-f_no_shadow_entry/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/35_usermod-f_no_shadow_entry/config/etc/group rename to tests/usertools/usermod/35_usermod-f_no_shadow_entry/config/etc/group diff --git a/tests/tests/usertools/usermod/35_usermod-f_no_shadow_entry/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/35_usermod-f_no_shadow_entry/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/35_usermod-f_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/35_usermod-f_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/usermod/36_usermod_move_homedir_existing_dir/config/etc/gshadow b/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/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/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/usermod/36_usermod_move_homedir_existing_dir/config/etc/shadow b/tests/usertools/usermod/36_usermod_move_homedir_existing_dir/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/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/usermod/37_usermod_move_nonexistent_homedir/config/etc/gshadow b/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/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/usermod/37_usermod_move_nonexistent_homedir/config/etc/shadow b/tests/usertools/usermod/37_usermod_move_nonexistent_homedir/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/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/38_usermod-u_lastlog_not_created/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/38_usermod-u_lastlog_not_created/config/etc/group rename to tests/usertools/usermod/38_usermod-u_lastlog_not_created/config/etc/group diff --git a/tests/tests/usertools/usermod/38_usermod-u_lastlog_not_created/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/38_usermod-u_lastlog_not_created/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/usermod/38_usermod-u_lastlog_not_created/config/etc/shadow b/tests/usertools/usermod/38_usermod-u_lastlog_not_created/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/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/39_usermod-u_copy_lastlog_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/39_usermod-u_copy_lastlog_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/39_usermod-u_copy_lastlog_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/39_usermod-u_copy_lastlog_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/usermod/39_usermod-u_copy_lastlog_entry/config/etc/shadow b/tests/usertools/usermod/39_usermod-u_copy_lastlog_entry/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/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/41_usermod-u_faillog_not_created/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/41_usermod-u_faillog_not_created/config/etc/group rename to tests/usertools/usermod/41_usermod-u_faillog_not_created/config/etc/group diff --git a/tests/tests/usertools/usermod/41_usermod-u_faillog_not_created/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/41_usermod-u_faillog_not_created/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/41_usermod-u_faillog_not_created/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/41_usermod-u_faillog_not_created/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/42_usermod-u_copy_faillog_entry/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/42_usermod-u_copy_faillog_entry/config/etc/group rename to tests/usertools/usermod/42_usermod-u_copy_faillog_entry/config/etc/group diff --git a/tests/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/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/42_usermod-u_copy_faillog_entry/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/44_usermod-l_move_mailbox/config/etc/shadow b/tests/usertools/usermod/44_usermod-l_move_mailbox/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/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/45_usermod-u_change_mailbox_owner/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/45_usermod-u_change_mailbox_owner/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/47_usermod-u_default_maildir/config/etc/shadow b/tests/usertools/usermod/47_usermod-u_default_maildir/config/etc/shadow similarity index 100% rename from tests/tests/usertools/usermod/47_usermod-u_default_maildir/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/48_usermod-u_MAIL_FILE/config/etc/shadow b/tests/usertools/usermod/48_usermod-u_MAIL_FILE/config/etc/shadow similarity index 100% rename from tests/tests/usertools/usermod/48_usermod-u_MAIL_FILE/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/49_usermod_change_gid+move_homedir_other_device/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/49_usermod_change_gid+move_homedir_other_device/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/usermod/50_usermod_change_uid+move_homedir/config/etc/gshadow b/tests/usertools/usermod/50_usermod_change_uid+move_homedir/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/usermod/50_usermod_change_uid+move_homedir/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/50_usermod_change_uid+move_homedir/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/50_usermod_change_uid+move_homedir/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/51_usermod_change_gid+move_homedir/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/51_usermod_change_gid+move_homedir/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/52_usermod_move_homedir_symlink/config/etc/gshadow b/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/gshadow similarity index 100% rename from tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/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/52_usermod_move_homedir_symlink/config/etc/shadow b/tests/usertools/usermod/52_usermod_move_homedir_symlink/config/etc/shadow similarity index 100% rename from tests/tests/usertools/usermod/52_usermod_move_homedir_symlink/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