diff --git a/pungi/scripts/create_extra_repo.py b/pungi/scripts/create_extra_repo.py
index 34f36f6f..e7133fe7 100644
--- a/pungi/scripts/create_extra_repo.py
+++ b/pungi/scripts/create_extra_repo.py
@@ -216,7 +216,7 @@ class CreateExtraRepo(PackagesGenerator):
     ):
         """
         Download all defined packages from a remote repo
-        :param packages: information about all of packages (including
+        :param packages: information about all packages (including
                          modularity) in a remote repo
         :param repo_info: information about a remote repo
         """
@@ -289,6 +289,18 @@ class CreateExtraRepo(PackagesGenerator):
             repomd_records = self._get_repomd_records(
                 repo_info=repo_info,
             )
+            repomd_records_dict = {}  # type: Dict[str, str]
+            self._download_repomd_records(
+                repo_info=repo_info,
+                repomd_records=repomd_records,
+                repomd_records_dict=repomd_records_dict,
+            )
+            packages_iterator = cr.PackageIterator(
+                primary_path=repomd_records_dict['primary'],
+                filelists_path=repomd_records_dict['filelists'],
+                other_path=repomd_records_dict['other'],
+                warningcb=self._warning_callback,
+            )
             # parse the repodata (including modules.yaml.gz)
             modules_data = self._parse_module_repomd_record(
                 repo_info=repo_info,
@@ -300,7 +312,7 @@ class CreateExtraRepo(PackagesGenerator):
             packages = {
                 f'{package.name}-{package.epoch}:{package.version}-'
                 f'{package.release}.{package.arch}':
-                    package for package in packages.values()
+                    package for package in packages_iterator
             }
             self._download_modules(
                 modules_data=modules_data,
diff --git a/pungi/scripts/create_packages_json.py b/pungi/scripts/create_packages_json.py
index 6fb3e3ff..8aad90c6 100644
--- a/pungi/scripts/create_packages_json.py
+++ b/pungi/scripts/create_packages_json.py
@@ -325,9 +325,11 @@ class PackagesGenerator:
                 repo_info=repo_info,
             )
             repomd_records_dict = {}  # type: Dict[str, str]
-            self._download_repomd_records(repo_info=repo_info,
-                                          repomd_records=repomd_records,
-                                          repomd_records_dict=repomd_records_dict)
+            self._download_repomd_records(
+                repo_info=repo_info,
+                repomd_records=repomd_records,
+                repomd_records_dict=repomd_records_dict,
+            )
             packages_iterator = PackageIterator(
                 primary_path=repomd_records_dict['primary'],
                 filelists_path=repomd_records_dict['filelists'],
diff --git a/tests/data/test_create_packages_json/test_repo/repodata/01b82e9eb7ee9151f283c6e761ae450de18ed2d64b5e32de88689eaf95216a80-other.sqlite.bz2 b/tests/data/test_create_packages_json/test_repo/repodata/01b82e9eb7ee9151f283c6e761ae450de18ed2d64b5e32de88689eaf95216a80-other.sqlite.bz2
new file mode 100644
index 00000000..cdb1b024
Binary files /dev/null and b/tests/data/test_create_packages_json/test_repo/repodata/01b82e9eb7ee9151f283c6e761ae450de18ed2d64b5e32de88689eaf95216a80-other.sqlite.bz2 differ
diff --git a/tests/data/test_create_packages_json/test_repo/repodata/89cb9cc1181635c9147864a7076d91fb81072641d481cd202832a2d257453576-primary.xml.gz b/tests/data/test_create_packages_json/test_repo/repodata/89cb9cc1181635c9147864a7076d91fb81072641d481cd202832a2d257453576-primary.xml.gz
new file mode 100644
index 00000000..2f2521c2
Binary files /dev/null and b/tests/data/test_create_packages_json/test_repo/repodata/89cb9cc1181635c9147864a7076d91fb81072641d481cd202832a2d257453576-primary.xml.gz differ
diff --git a/tests/data/test_create_packages_json/test_repo/repodata/8bcf6d40db4e922934ac47e8ac7fb8d15bdacf579af8c819d2134ed54d30550b-filelists.sqlite.bz2 b/tests/data/test_create_packages_json/test_repo/repodata/8bcf6d40db4e922934ac47e8ac7fb8d15bdacf579af8c819d2134ed54d30550b-filelists.sqlite.bz2
new file mode 100644
index 00000000..35141bcc
Binary files /dev/null and b/tests/data/test_create_packages_json/test_repo/repodata/8bcf6d40db4e922934ac47e8ac7fb8d15bdacf579af8c819d2134ed54d30550b-filelists.sqlite.bz2 differ
diff --git a/tests/data/test_create_packages_json/test_repo/repodata/ab8df35061dfa0285069b843f24a7076e31266d9a8abe8282340bcb936aa61d7-primary.sqlite.bz2 b/tests/data/test_create_packages_json/test_repo/repodata/ab8df35061dfa0285069b843f24a7076e31266d9a8abe8282340bcb936aa61d7-primary.sqlite.bz2
new file mode 100644
index 00000000..1e31fb33
Binary files /dev/null and b/tests/data/test_create_packages_json/test_repo/repodata/ab8df35061dfa0285069b843f24a7076e31266d9a8abe8282340bcb936aa61d7-primary.sqlite.bz2 differ
diff --git a/tests/data/test_create_packages_json/test_repo/repodata/b3827bd6c9ea67ffa3912002515c64e4d9fe5c4dacbf7c46b0d8768b7abbb84f-other.xml.gz b/tests/data/test_create_packages_json/test_repo/repodata/b3827bd6c9ea67ffa3912002515c64e4d9fe5c4dacbf7c46b0d8768b7abbb84f-other.xml.gz
new file mode 100644
index 00000000..447f87e8
Binary files /dev/null and b/tests/data/test_create_packages_json/test_repo/repodata/b3827bd6c9ea67ffa3912002515c64e4d9fe5c4dacbf7c46b0d8768b7abbb84f-other.xml.gz differ
diff --git a/tests/data/test_create_packages_json/test_repo/repodata/f69ca03957574729fd5150335b0d87afddcfb37a97aed5b06272212854f1773d-filelists.xml.gz b/tests/data/test_create_packages_json/test_repo/repodata/f69ca03957574729fd5150335b0d87afddcfb37a97aed5b06272212854f1773d-filelists.xml.gz
new file mode 100644
index 00000000..f74b009b
Binary files /dev/null and b/tests/data/test_create_packages_json/test_repo/repodata/f69ca03957574729fd5150335b0d87afddcfb37a97aed5b06272212854f1773d-filelists.xml.gz differ
diff --git a/tests/data/test_create_packages_json/test_repo/repodata/filelists.xml.gz b/tests/data/test_create_packages_json/test_repo/repodata/filelists.xml.gz
deleted file mode 100755
index 920e8153..00000000
Binary files a/tests/data/test_create_packages_json/test_repo/repodata/filelists.xml.gz and /dev/null differ
diff --git a/tests/data/test_create_packages_json/test_repo/repodata/other.xml.gz b/tests/data/test_create_packages_json/test_repo/repodata/other.xml.gz
deleted file mode 100755
index 18085e5c..00000000
Binary files a/tests/data/test_create_packages_json/test_repo/repodata/other.xml.gz and /dev/null differ
diff --git a/tests/data/test_create_packages_json/test_repo/repodata/primary.xml b/tests/data/test_create_packages_json/test_repo/repodata/primary.xml
deleted file mode 100644
index f95638eb..00000000
--- a/tests/data/test_create_packages_json/test_repo/repodata/primary.xml
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://linux.duke.edu/metadata/common" xmlns:rpm="http://linux.duke.edu/metadata/rpm" packages="15328">
-<package type="rpm">
-  <name>389-ds-base</name>
-  <arch>x86_64</arch>
-  <version epoch="0" ver="1.4.0.20" rel="10.module+el8.0.0+3096+101825d5"/>
-  <checksum type="sha256" pkgid="YES">12505e39ee5a8ce6e954a3cabd4a92165711b4961bfc74a50c938250eeb56356</checksum>
-  <summary>389 Directory Server (base)</summary>
-  <description>389 Directory Server is an LDAPv3 compliant server.  The base package includes
-the LDAP server and command line utilities for server administration.</description>
-  <packager>Red Hat, Inc. &lt;http://bugzilla.redhat.com/bugzilla&gt;</packager>
-  <url>https://www.port389.org</url>
-  <time file="1556198014" build="1556120826"/>
-  <size package="1980164" installed="5866004" archive="5911516"/>
-  <location href="Packages/3/389-ds-base-1.4.0.20-10.module+el8.0.0+3096+101825d5.x86_64.rpm"/>
-  <format>
-    <rpm:license>GPLv3+</rpm:license>
-    <rpm:vendor>Red Hat, Inc.</rpm:vendor>
-    <rpm:group>System Environment/Daemons</rpm:group>
-    <rpm:buildhost>x86-vm-06.build.eng.bos.redhat.com</rpm:buildhost>
-    <rpm:sourcerpm>389-ds-base-1.4.0.20-10.module+el8.0.0+3096+101825d5.src.rpm</rpm:sourcerpm>
-    <rpm:header-range start="5608" end="273796"/>
-    <rpm:provides>
-      <rpm:entry name="389-ds-base" flags="EQ" epoch="0" ver="1.4.0.20" rel="10.module+el8.0.0+3096+101825d5"/>
-      <rpm:entry name="389-ds-base(x86-64)" flags="EQ" epoch="0" ver="1.4.0.20" rel="10.module+el8.0.0+3096+101825d5"/>
-      <rpm:entry name="config(389-ds-base)" flags="EQ" epoch="0" ver="1.4.0.20" rel="10.module+el8.0.0+3096+101825d5"/>
-      <rpm:entry name="ldif2ldbm" flags="GE" epoch="0" ver="0"/>
-      <rpm:entry name="libacctpolicy-plugin.so()(64bit)"/>
-      <rpm:entry name="libacctusability-plugin.so()(64bit)"/>
-      <rpm:entry name="libacl-plugin.so()(64bit)"/>
-      <rpm:entry name="libaddn-plugin.so()(64bit)"/>
-      <rpm:entry name="libattr-unique-plugin.so()(64bit)"/>
-      <rpm:entry name="libautomember-plugin.so()(64bit)"/>
-      <rpm:entry name="libback-ldbm.so()(64bit)"/>
-      <rpm:entry name="libbitwise-plugin.so()(64bit)"/>
-      <rpm:entry name="libchainingdb-plugin.so()(64bit)"/>
-      <rpm:entry name="libcollation-plugin.so()(64bit)"/>
-      <rpm:entry name="libcontentsync-plugin.so()(64bit)"/>
-      <rpm:entry name="libcos-plugin.so()(64bit)"/>
-      <rpm:entry name="libderef-plugin.so()(64bit)"/>
-      <rpm:entry name="libdistrib-plugin.so()(64bit)"/>
-      <rpm:entry name="libdna-plugin.so()(64bit)"/>
-      <rpm:entry name="libhttp-client-plugin.so()(64bit)"/>
-      <rpm:entry name="liblinkedattrs-plugin.so()(64bit)"/>
-      <rpm:entry name="libmanagedentries-plugin.so()(64bit)"/>
-      <rpm:entry name="libmemberof-plugin.so()(64bit)"/>
-      <rpm:entry name="libpam-passthru-plugin.so()(64bit)"/>
-      <rpm:entry name="libpassthru-plugin.so()(64bit)"/>
-      <rpm:entry name="libpbe-plugin.so()(64bit)"/>
-      <rpm:entry name="libposix-winsync-plugin.so()(64bit)"/>
-      <rpm:entry name="libpwdstorage-plugin.so()(64bit)"/>
-      <rpm:entry name="libreferint-plugin.so()(64bit)"/>
-      <rpm:entry name="libreplication-plugin.so()(64bit)"/>
-      <rpm:entry name="libretrocl-plugin.so()(64bit)"/>
-      <rpm:entry name="libroles-plugin.so()(64bit)"/>
-      <rpm:entry name="librootdn-access-plugin.so()(64bit)"/>
-      <rpm:entry name="libschemareload-plugin.so()(64bit)"/>
-      <rpm:entry name="libstatechange-plugin.so()(64bit)"/>
-      <rpm:entry name="libsyntax-plugin.so()(64bit)"/>
-      <rpm:entry name="libusn-plugin.so()(64bit)"/>
-      <rpm:entry name="libviews-plugin.so()(64bit)"/>
-      <rpm:entry name="libwhoami-plugin.so()(64bit)"/>
-    </rpm:provides>
-    <rpm:requires>
-      <rpm:entry name="/bin/sh" pre="1"/>
-      <rpm:entry name="/bin/sh"/>
-      <rpm:entry name="/usr/bin/perl"/>
-      <rpm:entry name="/usr/libexec/platform-python"/>
-      <rpm:entry name="/usr/sbin/semanage"/>
-      <rpm:entry name="389-ds-base-libs" flags="EQ" epoch="0" ver="1.4.0.20" rel="10.module+el8.0.0+3096+101825d5"/>
-      <rpm:entry name="cyrus-sasl-gssapi"/>
-      <rpm:entry name="cyrus-sasl-md5"/>
-      <rpm:entry name="cyrus-sasl-plain"/>
-      <rpm:entry name="ld-linux-x86-64.so.2()(64bit)"/>
-      <rpm:entry name="ld-linux-x86-64.so.2(GLIBC_2.3)(64bit)"/>
-      <rpm:entry name="libcom_err.so.2()(64bit)"/>
-      <rpm:entry name="libcrack.so.2()(64bit)"/>
-      <rpm:entry name="libcrypt.so.1()(64bit)"/>
-      <rpm:entry name="libcrypt.so.1(XCRYPT_2.0)(64bit)"/>
-      <rpm:entry name="libdb-5.3.so()(64bit)"/>
-      <rpm:entry name="libdb-utils"/>
-      <rpm:entry name="libdl.so.2()(64bit)"/>
-      <rpm:entry name="libdl.so.2(GLIBC_2.2.5)(64bit)"/>
-      <rpm:entry name="libevent-2.1.so.6()(64bit)"/>
-      <rpm:entry name="libgcc_s.so.1()(64bit)"/>
-      <rpm:entry name="libgcc_s.so.1(GCC_3.0)(64bit)"/>
-      <rpm:entry name="libicudata.so.60()(64bit)"/>
-      <rpm:entry name="libicui18n.so.60()(64bit)"/>
-      <rpm:entry name="libicuuc.so.60()(64bit)"/>
-      <rpm:entry name="libk5crypto.so.3()(64bit)"/>
-      <rpm:entry name="libkrb5.so.3()(64bit)"/>
-      <rpm:entry name="liblber-2.4.so.2()(64bit)"/>
-      <rpm:entry name="libldap_r-2.4.so.2()(64bit)"/>
-      <rpm:entry name="libldaputil.so.0()(64bit)"/>
-      <rpm:entry name="libm.so.6()(64bit)"/>
-      <rpm:entry name="libns-dshttpd-1.4.0.2010.so()(64bit)"/>
-      <rpm:entry name="libnspr4.so()(64bit)"/>
-      <rpm:entry name="libnss3.so()(64bit)"/>
-      <rpm:entry name="libnss3.so(NSS_3.12)(64bit)"/>
-      <rpm:entry name="libnss3.so(NSS_3.2)(64bit)"/>
-      <rpm:entry name="libnss3.so(NSS_3.3)(64bit)"/>
-      <rpm:entry name="libnss3.so(NSS_3.4)(64bit)"/>
-      <rpm:entry name="libnss3.so(NSS_3.9.2)(64bit)"/>
-      <rpm:entry name="libnunc-stans.so.0()(64bit)"/>
-      <rpm:entry name="libpam.so.0()(64bit)"/>
-      <rpm:entry name="libpam.so.0(LIBPAM_1.0)(64bit)"/>
-      <rpm:entry name="libpcre.so.1()(64bit)"/>
-      <rpm:entry name="libplc4.so()(64bit)"/>
-      <rpm:entry name="libplds4.so()(64bit)"/>
-      <rpm:entry name="libpthread.so.0()(64bit)"/>
-      <rpm:entry name="libpthread.so.0(GLIBC_2.12)(64bit)"/>
-      <rpm:entry name="libpthread.so.0(GLIBC_2.2.5)(64bit)"/>
-      <rpm:entry name="libpthread.so.0(GLIBC_2.3.2)(64bit)"/>
-      <rpm:entry name="libpthread.so.0(GLIBC_2.3.4)(64bit)"/>
-      <rpm:entry name="libsasl2.so.3()(64bit)"/>
-      <rpm:entry name="libsds.so.0()(64bit)"/>
-      <rpm:entry name="libsemanage-python3"/>
-      <rpm:entry name="libslapd.so.0()(64bit)"/>
-      <rpm:entry name="libssl3.so()(64bit)"/>
-      <rpm:entry name="libssl3.so(NSS_3.14)(64bit)"/>
-      <rpm:entry name="libssl3.so(NSS_3.2)(64bit)"/>
-      <rpm:entry name="libssl3.so(NSS_3.7.4)(64bit)"/>
-      <rpm:entry name="libstdc++.so.6()(64bit)"/>
-      <rpm:entry name="libstdc++.so.6(CXXABI_1.3)(64bit)"/>
-      <rpm:entry name="libstdc++.so.6(GLIBCXX_3.4)(64bit)"/>
-      <rpm:entry name="libstdc++.so.6(GLIBCXX_3.4.11)(64bit)"/>
-      <rpm:entry name="libsvrcore.so.0()(64bit)"/>
-      <rpm:entry name="libsystemd.so.0()(64bit)"/>
-      <rpm:entry name="libsystemd.so.0(LIBSYSTEMD_209)(64bit)"/>
-      <rpm:entry name="nss" flags="GE" epoch="0" ver="3.34"/>
-      <rpm:entry name="nss-tools"/>
-      <rpm:entry name="openldap-clients"/>
-      <rpm:entry name="openssl-perl"/>
-      <rpm:entry name="perl(:MODULE_COMPAT_5.26.3)"/>
-      <rpm:entry name="perl(Archive::Tar)"/>
-      <rpm:entry name="perl(Cwd)"/>
-      <rpm:entry name="perl(DB)"/>
-      <rpm:entry name="perl(DB_File)"/>
-      <rpm:entry name="perl(Getopt::Long)"/>
-      <rpm:entry name="perl(IO::File)"/>
-      <rpm:entry name="perl(IO::Uncompress::AnyUncompress)"/>
-      <rpm:entry name="perl(Scalar::Util)"/>
-      <rpm:entry name="perl(Time::Local)"/>
-      <rpm:entry name="perl(sigtrap)"/>
-      <rpm:entry name="perl(strict)"/>
-      <rpm:entry name="perl(warnings)"/>
-      <rpm:entry name="perl-Archive-Tar"/>
-      <rpm:entry name="perl-DB_File"/>
-      <rpm:entry name="perl-Errno" flags="GE" epoch="0" ver="1.23" rel="360"/>
-      <rpm:entry name="policycoreutils-python-utils"/>
-      <rpm:entry name="python3-ldap"/>
-      <rpm:entry name="python3-lib389" flags="EQ" epoch="0" ver="1.4.0.20" rel="10.module+el8.0.0+3096+101825d5"/>
-      <rpm:entry name="rtld(GNU_HASH)"/>
-      <rpm:entry name="selinux-policy" flags="GE" epoch="0" ver="3.14.1" rel="29"/>
-      <rpm:entry name="systemd" pre="1"/>
-      <rpm:entry name="systemd"/>
-      <rpm:entry name="libc.so.6(GLIBC_2.17)(64bit)"/>
-    </rpm:requires>
-    <rpm:conflicts>
-      <rpm:entry name="freeipa-server" flags="LT" epoch="0" ver="4.0.3"/>
-      <rpm:entry name="selinux-policy-base" flags="LT" epoch="0" ver="3.9.8"/>
-    </rpm:conflicts>
-    <rpm:obsoletes>
-      <rpm:entry name="389-ds-base" flags="LE" epoch="0" ver="1.3.5.4"/>
-      <rpm:entry name="389-ds-base" flags="LE" epoch="0" ver="1.4.0.9"/>
-    </rpm:obsoletes>
-    <file type="dir">/etc/dirsrv</file>
-    <file type="dir">/etc/dirsrv/config</file>
-    <file>/etc/dirsrv/config/certmap.conf</file>
-    <file>/etc/dirsrv/config/slapd-collations.conf</file>
-    <file>/etc/dirsrv/config/template-initconfig</file>
-    <file type="dir">/etc/dirsrv/schema</file>
-    <file>/etc/dirsrv/schema/99user.ldif</file>
-    <file>/etc/sysconfig/dirsrv</file>
-    <file>/etc/sysconfig/dirsrv.systemd</file>
-    <file type="dir">/etc/systemd/system/dirsrv.target.wants</file>
-    <file>/usr/bin/dbscan</file>
-    <file>/usr/bin/ds-logpipe.py</file>
-    <file>/usr/bin/ds-replcheck</file>
-    <file>/usr/bin/ldclt</file>
-    <file>/usr/bin/logconv.pl</file>
-    <file>/usr/bin/pwdhash</file>
-    <file>/usr/bin/readnsstate</file>
-    <file>/usr/lib64/dirsrv/bin/jeprof</file>
-    <file>/usr/sbin/bak2db</file>
-    <file>/usr/sbin/db2bak</file>
-    <file>/usr/sbin/db2index</file>
-    <file>/usr/sbin/db2ldif</file>
-    <file>/usr/sbin/dbverify</file>
-    <file>/usr/sbin/ldif2db</file>
-    <file>/usr/sbin/ldif2ldap</file>
-    <file>/usr/sbin/ns-slapd</file>
-    <file>/usr/sbin/restart-dirsrv</file>
-    <file>/usr/sbin/start-dirsrv</file>
-    <file>/usr/sbin/status-dirsrv</file>
-    <file>/usr/sbin/stop-dirsrv</file>
-    <file>/usr/sbin/upgradedb</file>
-    <file>/usr/sbin/vlvindex</file>
-    <file>/usr/share/gdb/auto-load/usr/sbin/ns-slapd-gdb.py</file>
-  </format>
-</package>
-<package type="rpm">
-  <name>zziplib-utils</name>
-  <arch>x86_64</arch>
-  <version epoch="0" ver="0.13.68" rel="8.el8"/>
-  <checksum type="sha256" pkgid="YES">26d838b257f0890c3abf408bc200ebcf53ff1e40f16654cad9b1cb4c059f0d42</checksum>
-  <summary>Utilities for the zziplib library</summary>
-  <description>The zziplib library is intentionally lightweight, it offers the ability to
-easily extract data from files archived in a single zip file. Applications
-can bundle files into a single zip archive and access them. The implementation
-is based only on the (free) subset of compression with the zlib algorithm
-which is actually used by the zip/unzip tools.
-
-This packages contains all the utilities that come with the zziplib library.</description>
-  <packager>Red Hat, Inc. &lt;http://bugzilla.redhat.com/bugzilla&gt;</packager>
-  <url>http://zziplib.sourceforge.net/</url>
-  <time file="1579047155" build="1574175461"/>
-  <size package="48588" installed="147600" archive="152544"/>
-  <location href="Packages/z/zziplib-utils-0.13.68-8.el8.x86_64.rpm"/>
-  <format>
-    <rpm:license>LGPLv2+ or MPLv1.1</rpm:license>
-    <rpm:vendor>Red Hat, Inc.</rpm:vendor>
-    <rpm:group>Applications/Archiving</rpm:group>
-    <rpm:buildhost>x86-vm-09.build.eng.bos.redhat.com</rpm:buildhost>
-    <rpm:sourcerpm>zziplib-0.13.68-8.el8.src.rpm</rpm:sourcerpm>
-    <rpm:header-range start="5608" end="19832"/>
-    <rpm:provides>
-      <rpm:entry name="zziplib-utils" flags="EQ" epoch="0" ver="0.13.68" rel="8.el8"/>
-      <rpm:entry name="zziplib-utils(x86-64)" flags="EQ" epoch="0" ver="0.13.68" rel="8.el8"/>
-    </rpm:provides>
-    <rpm:requires>
-      <rpm:entry name="libz.so.1()(64bit)"/>
-      <rpm:entry name="libzzip-0.so.13()(64bit)"/>
-      <rpm:entry name="libzzipfseeko-0.so.13()(64bit)"/>
-      <rpm:entry name="libzzipmmapped-0.so.13()(64bit)"/>
-      <rpm:entry name="rtld(GNU_HASH)"/>
-      <rpm:entry name="zziplib(x86-64)" flags="EQ" epoch="0" ver="0.13.68" rel="8.el8"/>
-      <rpm:entry name="libc.so.6(GLIBC_2.14)(64bit)"/>
-    </rpm:requires>
-    <file>/usr/bin/unzip-mem</file>
-    <file>/usr/bin/unzzip</file>
-    <file>/usr/bin/unzzip-big</file>
-    <file>/usr/bin/unzzip-mem</file>
-    <file>/usr/bin/unzzip-mix</file>
-    <file>/usr/bin/zzcat</file>
-    <file>/usr/bin/zzdir</file>
-    <file>/usr/bin/zzxorcat</file>
-    <file>/usr/bin/zzxorcopy</file>
-    <file>/usr/bin/zzxordir</file>
-  </format>
-</package>
-<package type="rpm">
-  <name>zziplib</name>
-  <arch>i686</arch>
-  <version epoch="0" ver="0.13.68" rel="8.el8"/>
-  <checksum type="sha256" pkgid="YES">207d3ba8e031d11bd13923e6027e17e5db12d76e915a28e9cd1589ef796a6e6b</checksum>
-  <summary>Lightweight library to easily extract data from zip files</summary>
-  <description>The zziplib library is intentionally lightweight, it offers the ability to
-easily extract data from files archived in a single zip file. Applications
-can bundle files into a single zip archive and access them. The implementation
-is based only on the (free) subset of compression with the zlib algorithm
-which is actually used by the zip/unzip tools.</description>
-  <packager>Red Hat, Inc. &lt;http://bugzilla.redhat.com/bugzilla&gt;</packager>
-  <url>http://zziplib.sourceforge.net/</url>
-  <time file="1579042443" build="1574175462"/>
-  <size package="95172" installed="217669" archive="223072"/>
-  <location href="Packages/z/zziplib-0.13.68-8.el8.i686.rpm"/>
-  <format>
-    <rpm:license>LGPLv2+ or MPLv1.1</rpm:license>
-    <rpm:vendor>Red Hat, Inc.</rpm:vendor>
-    <rpm:group>Applications/Archiving</rpm:group>
-    <rpm:buildhost>x86-vm-09.build.eng.bos.redhat.com</rpm:buildhost>
-    <rpm:sourcerpm>zziplib-0.13.68-8.el8.src.rpm</rpm:sourcerpm>
-    <rpm:header-range start="5608" end="18592"/>
-    <rpm:provides>
-      <rpm:entry name="libzzip-0.so.13"/>
-      <rpm:entry name="libzzipfseeko-0.so.13"/>
-      <rpm:entry name="libzzipmmapped-0.so.13"/>
-      <rpm:entry name="libzzipwrap-0.so.13"/>
-      <rpm:entry name="zziplib" flags="EQ" epoch="0" ver="0.13.68" rel="8.el8"/>
-      <rpm:entry name="zziplib(x86-32)" flags="EQ" epoch="0" ver="0.13.68" rel="8.el8"/>
-    </rpm:provides>
-    <rpm:requires>
-      <rpm:entry name="/sbin/ldconfig" pre="1"/>
-      <rpm:entry name="/sbin/ldconfig"/>
-      <rpm:entry name="libz.so.1"/>
-      <rpm:entry name="rtld(GNU_HASH)"/>
-      <rpm:entry name="libc.so.6(GLIBC_2.7)"/>
-    </rpm:requires>
-  </format>
-</package>
-<package type="rpm">
-  <name>zziplib</name>
-  <arch>x86_64</arch>
-  <version epoch="0" ver="0.13.68" rel="8.el8"/>
-  <checksum type="sha256" pkgid="YES">30cee6c1adcaee7b24c1079072299ee55a9c3bbdcb91697544242c7567d18621</checksum>
-  <summary>Lightweight library to easily extract data from zip files</summary>
-  <description>The zziplib library is intentionally lightweight, it offers the ability to
-easily extract data from files archived in a single zip file. Applications
-can bundle files into a single zip archive and access them. The implementation
-is based only on the (free) subset of compression with the zlib algorithm
-which is actually used by the zip/unzip tools.</description>
-  <packager>Red Hat, Inc. &lt;http://bugzilla.redhat.com/bugzilla&gt;</packager>
-  <url>http://zziplib.sourceforge.net/</url>
-  <time file="1579041776" build="1574175461"/>
-  <size package="92904" installed="219993" archive="225452"/>
-  <location href="Packages/z/zziplib-0.13.68-8.el8.x86_64.rpm"/>
-  <format>
-    <rpm:license>LGPLv2+ or MPLv1.1</rpm:license>
-    <rpm:vendor>Red Hat, Inc.</rpm:vendor>
-    <rpm:group>Applications/Archiving</rpm:group>
-    <rpm:buildhost>x86-vm-09.build.eng.bos.redhat.com</rpm:buildhost>
-    <rpm:sourcerpm>zziplib-0.13.68-8.el8.src.rpm</rpm:sourcerpm>
-    <rpm:header-range start="5608" end="18620"/>
-    <rpm:provides>
-      <rpm:entry name="libzzip-0.so.13()(64bit)"/>
-      <rpm:entry name="libzzipfseeko-0.so.13()(64bit)"/>
-      <rpm:entry name="libzzipmmapped-0.so.13()(64bit)"/>
-      <rpm:entry name="libzzipwrap-0.so.13()(64bit)"/>
-      <rpm:entry name="zziplib" flags="EQ" epoch="0" ver="0.13.68" rel="8.el8"/>
-      <rpm:entry name="zziplib(x86-64)" flags="EQ" epoch="0" ver="0.13.68" rel="8.el8"/>
-    </rpm:provides>
-    <rpm:requires>
-      <rpm:entry name="/sbin/ldconfig" pre="1"/>
-      <rpm:entry name="/sbin/ldconfig"/>
-      <rpm:entry name="libz.so.1()(64bit)"/>
-      <rpm:entry name="rtld(GNU_HASH)"/>
-      <rpm:entry name="libc.so.6(GLIBC_2.14)(64bit)"/>
-    </rpm:requires>
-  </format>
-</package>
-</metadata>
diff --git a/tests/data/test_create_packages_json/test_repo/repodata/repomd.xml b/tests/data/test_create_packages_json/test_repo/repodata/repomd.xml
index faa24076..dadc686b 100644
--- a/tests/data/test_create_packages_json/test_repo/repodata/repomd.xml
+++ b/tests/data/test_create_packages_json/test_repo/repodata/repomd.xml
@@ -1,28 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
-    <revision>1610968727</revision>
-    <data type="primary">
-        <checksum type="sha256">2826d3f5dd3b03cfb5d2c079123f7add3a7d068e8dfd210873eb27eb32586a8e</checksum>
-        <open-checksum type="sha256">78efcf6b74f4c56aaab183336eab44fcbcc9cb6c25045fe5980ab83a85e48db7</open-checksum>
-        <location href="repodata/primary.xml"/>
-        <timestamp>1610968715</timestamp>
-        <size>3094</size>
-        <open-size>16878</open-size>
-    </data>
-    <data type="filelists">
-        <checksum type="sha256">e41805c927fc4ad1b9bde52509afb37e47acc153283b23da17560d4e250b3a3e</checksum>
-        <open-checksum type="sha256">5f659e8c05b7d056748bf809bec8aa9fa5f791c2b0546d6c49b02a7ebfb26ce2</open-checksum>
-        <location href="repodata/filelists.xml.gz"/>
-        <timestamp>1610968715</timestamp>
-        <size>3970</size>
-        <open-size>19897</open-size>
-    </data>
-    <data type="other">
-        <checksum type="sha256">db6d0d88abcaf06dc8ef09207fdbb9ba5e3ffb505a7dd2bf94fdbc953a6de11e</checksum>
-        <open-checksum type="sha256">3ae1b186b4c3037805e2cf28a78b2204c37b4dc04acbd8bef98a7b24ab5b52a8</open-checksum>
-        <location href="repodata/other.xml.gz"/>
-        <timestamp>1610968715</timestamp>
-        <size>2191</size>
-        <open-size>8337</open-size>
-    </data>
+  <revision>1666177486</revision>
+  <data type="primary">
+    <checksum type="sha256">89cb9cc1181635c9147864a7076d91fb81072641d481cd202832a2d257453576</checksum>
+    <open-checksum type="sha256">07255d9856f7531b52a6459f6fc7701c6d93c6d6c29d1382d83afcc53f13494a</open-checksum>
+    <location href="repodata/89cb9cc1181635c9147864a7076d91fb81072641d481cd202832a2d257453576-primary.xml.gz"/>
+    <timestamp>1666177486</timestamp>
+    <size>1387</size>
+    <open-size>6528</open-size>
+  </data>
+  <data type="filelists">
+    <checksum type="sha256">f69ca03957574729fd5150335b0d87afddcfb37a97aed5b06272212854f1773d</checksum>
+    <open-checksum type="sha256">c2e1e674d7d48bccaa16cae0a5f70cb55ef4cd7352b4d9d4fdaa619075d07dbc</open-checksum>
+    <location href="repodata/f69ca03957574729fd5150335b0d87afddcfb37a97aed5b06272212854f1773d-filelists.xml.gz"/>
+    <timestamp>1666177486</timestamp>
+    <size>1252</size>
+    <open-size>5594</open-size>
+  </data>
+  <data type="other">
+    <checksum type="sha256">b3827bd6c9ea67ffa3912002515c64e4d9fe5c4dacbf7c46b0d8768b7abbb84f</checksum>
+    <open-checksum type="sha256">9ce24c526239e349d023c577b2ae3872c8b0f1888aed1fb24b9b9aa12063fdf3</open-checksum>
+    <location href="repodata/b3827bd6c9ea67ffa3912002515c64e4d9fe5c4dacbf7c46b0d8768b7abbb84f-other.xml.gz"/>
+    <timestamp>1666177486</timestamp>
+    <size>999</size>
+    <open-size>6320</open-size>
+  </data>
+  <data type="primary_db">
+    <checksum type="sha256">ab8df35061dfa0285069b843f24a7076e31266d9a8abe8282340bcb936aa61d7</checksum>
+    <open-checksum type="sha256">2bce9554ce4496cef34b5cd69f186f7f3143c7cabae8fa384fc5c9eeab326f7f</open-checksum>
+    <location href="repodata/ab8df35061dfa0285069b843f24a7076e31266d9a8abe8282340bcb936aa61d7-primary.sqlite.bz2"/>
+    <timestamp>1666177486</timestamp>
+    <size>3558</size>
+    <open-size>106496</open-size>
+    <database_version>10</database_version>
+  </data>
+  <data type="filelists_db">
+    <checksum type="sha256">8bcf6d40db4e922934ac47e8ac7fb8d15bdacf579af8c819d2134ed54d30550b</checksum>
+    <open-checksum type="sha256">f7001d1df7f5f7e4898919b15710bea8ed9711ce42faf68e22b757e63169b1fb</open-checksum>
+    <location href="repodata/8bcf6d40db4e922934ac47e8ac7fb8d15bdacf579af8c819d2134ed54d30550b-filelists.sqlite.bz2"/>
+    <timestamp>1666177486</timestamp>
+    <size>2360</size>
+    <open-size>28672</open-size>
+    <database_version>10</database_version>
+  </data>
+  <data type="other_db">
+    <checksum type="sha256">01b82e9eb7ee9151f283c6e761ae450de18ed2d64b5e32de88689eaf95216a80</checksum>
+    <open-checksum type="sha256">07f5b9750af1e440d37ca216e719dd288149e79e9132f2fdccb6f73b2e5dd541</open-checksum>
+    <location href="repodata/01b82e9eb7ee9151f283c6e761ae450de18ed2d64b5e32de88689eaf95216a80-other.sqlite.bz2"/>
+    <timestamp>1666177486</timestamp>
+    <size>2196</size>
+    <open-size>32768</open-size>
+    <database_version>10</database_version>
+  </data>
 </repomd>
diff --git a/tests/data/test_create_packages_json/test_repo_2/repodata/35eff699131e0976429144c6f4514d21568177dc64bb4091c3ff62f76b293725-other.sqlite.bz2 b/tests/data/test_create_packages_json/test_repo_2/repodata/35eff699131e0976429144c6f4514d21568177dc64bb4091c3ff62f76b293725-other.sqlite.bz2
new file mode 100644
index 00000000..0346c4a1
Binary files /dev/null and b/tests/data/test_create_packages_json/test_repo_2/repodata/35eff699131e0976429144c6f4514d21568177dc64bb4091c3ff62f76b293725-other.sqlite.bz2 differ
diff --git a/tests/data/test_create_packages_json/test_repo_2/repodata/5a60d79d8bce6a805f4fdb22fd891524359dce8ccc665c0b54e7299e79debe84-other.xml.gz b/tests/data/test_create_packages_json/test_repo_2/repodata/5a60d79d8bce6a805f4fdb22fd891524359dce8ccc665c0b54e7299e79debe84-other.xml.gz
new file mode 100644
index 00000000..af1858f7
Binary files /dev/null and b/tests/data/test_create_packages_json/test_repo_2/repodata/5a60d79d8bce6a805f4fdb22fd891524359dce8ccc665c0b54e7299e79debe84-other.xml.gz differ
diff --git a/tests/data/test_create_packages_json/test_repo_2/repodata/6778922d5853d20f213ae7702699a76f1e87e55d6bfb5e4ac6a117d904d47b3c-filelists.xml.gz b/tests/data/test_create_packages_json/test_repo_2/repodata/6778922d5853d20f213ae7702699a76f1e87e55d6bfb5e4ac6a117d904d47b3c-filelists.xml.gz
new file mode 100644
index 00000000..d4a1ebf3
Binary files /dev/null and b/tests/data/test_create_packages_json/test_repo_2/repodata/6778922d5853d20f213ae7702699a76f1e87e55d6bfb5e4ac6a117d904d47b3c-filelists.xml.gz differ
diff --git a/tests/data/test_create_packages_json/test_repo_2/repodata/a1d342aa7cef3a2034fc3f9d6ee02d63572780bc76e61749a57e50b6b3ca9869-primary.xml.gz b/tests/data/test_create_packages_json/test_repo_2/repodata/a1d342aa7cef3a2034fc3f9d6ee02d63572780bc76e61749a57e50b6b3ca9869-primary.xml.gz
new file mode 100644
index 00000000..92c90f5f
Binary files /dev/null and b/tests/data/test_create_packages_json/test_repo_2/repodata/a1d342aa7cef3a2034fc3f9d6ee02d63572780bc76e61749a57e50b6b3ca9869-primary.xml.gz differ
diff --git a/tests/data/test_create_packages_json/test_repo_2/repodata/c27bc2ce947173aba305041552c3c6d8db71442c1a2e5dcaf35ff750fe0469fc-primary.sqlite.bz2 b/tests/data/test_create_packages_json/test_repo_2/repodata/c27bc2ce947173aba305041552c3c6d8db71442c1a2e5dcaf35ff750fe0469fc-primary.sqlite.bz2
new file mode 100644
index 00000000..4fe3194d
Binary files /dev/null and b/tests/data/test_create_packages_json/test_repo_2/repodata/c27bc2ce947173aba305041552c3c6d8db71442c1a2e5dcaf35ff750fe0469fc-primary.sqlite.bz2 differ
diff --git a/tests/data/test_create_packages_json/test_repo_2/repodata/ed350865982e7a1e45b144839b56eac888e5d8f680571dd2cd06b37dc83e0fd8-filelists.sqlite.bz2 b/tests/data/test_create_packages_json/test_repo_2/repodata/ed350865982e7a1e45b144839b56eac888e5d8f680571dd2cd06b37dc83e0fd8-filelists.sqlite.bz2
new file mode 100644
index 00000000..ab1e4de2
Binary files /dev/null and b/tests/data/test_create_packages_json/test_repo_2/repodata/ed350865982e7a1e45b144839b56eac888e5d8f680571dd2cd06b37dc83e0fd8-filelists.sqlite.bz2 differ
diff --git a/tests/data/test_create_packages_json/test_repo_2/repodata/filelists.xml.gz b/tests/data/test_create_packages_json/test_repo_2/repodata/filelists.xml.gz
deleted file mode 100755
index 920e8153..00000000
Binary files a/tests/data/test_create_packages_json/test_repo_2/repodata/filelists.xml.gz and /dev/null differ
diff --git a/tests/data/test_create_packages_json/test_repo_2/repodata/other.xml.gz b/tests/data/test_create_packages_json/test_repo_2/repodata/other.xml.gz
deleted file mode 100755
index 18085e5c..00000000
Binary files a/tests/data/test_create_packages_json/test_repo_2/repodata/other.xml.gz and /dev/null differ
diff --git a/tests/data/test_create_packages_json/test_repo_2/repodata/primary.xml b/tests/data/test_create_packages_json/test_repo_2/repodata/primary.xml
deleted file mode 100644
index 9edee311..00000000
--- a/tests/data/test_create_packages_json/test_repo_2/repodata/primary.xml
+++ /dev/null
@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata xmlns="http://linux.duke.edu/metadata/common" xmlns:rpm="http://linux.duke.edu/metadata/rpm" packages="15328">
-<package type="rpm">
-  <name>389-ds-base-new</name>
-  <arch>x86_64</arch>
-  <version epoch="0" ver="1.4.0.20" rel="10.module+el8.0.0+3096+101825d5"/>
-  <checksum type="sha256" pkgid="YES">12505e39ee5a8ce6e954a3cabd4a92165711b4961bfc74a50c938250eeb56356</checksum>
-  <summary>389 Directory Server (base)</summary>
-  <description>389 Directory Server is an LDAPv3 compliant server.  The base package includes
-the LDAP server and command line utilities for server administration.</description>
-  <packager>Red Hat, Inc. &lt;http://bugzilla.redhat.com/bugzilla&gt;</packager>
-  <url>https://www.port389.org</url>
-  <time file="1556198014" build="1556120826"/>
-  <size package="1980164" installed="5866004" archive="5911516"/>
-  <location href="Packages/3/389-ds-base-new-1.4.0.20-10.module+el8.0.0+3096+101825d5.x86_64.rpm"/>
-  <format>
-    <rpm:license>GPLv3+</rpm:license>
-    <rpm:vendor>Red Hat, Inc.</rpm:vendor>
-    <rpm:group>System Environment/Daemons</rpm:group>
-    <rpm:buildhost>x86-vm-06.build.eng.bos.redhat.com</rpm:buildhost>
-    <rpm:sourcerpm>389-ds-base-new-1.4.0.20-10.module+el8.0.0+3096+101825d5.src.rpm</rpm:sourcerpm>
-    <rpm:header-range start="5608" end="273796"/>
-    <rpm:provides>
-      <rpm:entry name="389-ds-base-new" flags="EQ" epoch="0" ver="1.4.0.20" rel="10.module+el8.0.0+3096+101825d5"/>
-      <rpm:entry name="389-ds-base-new(x86-64)" flags="EQ" epoch="0" ver="1.4.0.20" rel="10.module+el8.0.0+3096+101825d5"/>
-      <rpm:entry name="config(389-ds-base-new)" flags="EQ" epoch="0" ver="1.4.0.20" rel="10.module+el8.0.0+3096+101825d5"/>
-      <rpm:entry name="ldif2ldbm" flags="GE" epoch="0" ver="0"/>
-      <rpm:entry name="libacctpolicy-plugin.so()(64bit)"/>
-      <rpm:entry name="libacctusability-plugin.so()(64bit)"/>
-      <rpm:entry name="libacl-plugin.so()(64bit)"/>
-      <rpm:entry name="libaddn-plugin.so()(64bit)"/>
-      <rpm:entry name="libattr-unique-plugin.so()(64bit)"/>
-      <rpm:entry name="libautomember-plugin.so()(64bit)"/>
-      <rpm:entry name="libback-ldbm.so()(64bit)"/>
-      <rpm:entry name="libbitwise-plugin.so()(64bit)"/>
-      <rpm:entry name="libchainingdb-plugin.so()(64bit)"/>
-      <rpm:entry name="libcollation-plugin.so()(64bit)"/>
-      <rpm:entry name="libcontentsync-plugin.so()(64bit)"/>
-      <rpm:entry name="libcos-plugin.so()(64bit)"/>
-      <rpm:entry name="libderef-plugin.so()(64bit)"/>
-      <rpm:entry name="libdistrib-plugin.so()(64bit)"/>
-      <rpm:entry name="libdna-plugin.so()(64bit)"/>
-      <rpm:entry name="libhttp-client-plugin.so()(64bit)"/>
-      <rpm:entry name="liblinkedattrs-plugin.so()(64bit)"/>
-      <rpm:entry name="libmanagedentries-plugin.so()(64bit)"/>
-      <rpm:entry name="libmemberof-plugin.so()(64bit)"/>
-      <rpm:entry name="libpam-passthru-plugin.so()(64bit)"/>
-      <rpm:entry name="libpassthru-plugin.so()(64bit)"/>
-      <rpm:entry name="libpbe-plugin.so()(64bit)"/>
-      <rpm:entry name="libposix-winsync-plugin.so()(64bit)"/>
-      <rpm:entry name="libpwdstorage-plugin.so()(64bit)"/>
-      <rpm:entry name="libreferint-plugin.so()(64bit)"/>
-      <rpm:entry name="libreplication-plugin.so()(64bit)"/>
-      <rpm:entry name="libretrocl-plugin.so()(64bit)"/>
-      <rpm:entry name="libroles-plugin.so()(64bit)"/>
-      <rpm:entry name="librootdn-access-plugin.so()(64bit)"/>
-      <rpm:entry name="libschemareload-plugin.so()(64bit)"/>
-      <rpm:entry name="libstatechange-plugin.so()(64bit)"/>
-      <rpm:entry name="libsyntax-plugin.so()(64bit)"/>
-      <rpm:entry name="libusn-plugin.so()(64bit)"/>
-      <rpm:entry name="libviews-plugin.so()(64bit)"/>
-      <rpm:entry name="libwhoami-plugin.so()(64bit)"/>
-    </rpm:provides>
-    <rpm:requires>
-      <rpm:entry name="/bin/sh" pre="1"/>
-      <rpm:entry name="/bin/sh"/>
-      <rpm:entry name="/usr/bin/perl"/>
-      <rpm:entry name="/usr/libexec/platform-python"/>
-      <rpm:entry name="/usr/sbin/semanage"/>
-      <rpm:entry name="389-ds-base-new-libs" flags="EQ" epoch="0" ver="1.4.0.20" rel="10.module+el8.0.0+3096+101825d5"/>
-      <rpm:entry name="cyrus-sasl-gssapi"/>
-      <rpm:entry name="cyrus-sasl-md5"/>
-      <rpm:entry name="cyrus-sasl-plain"/>
-      <rpm:entry name="ld-linux-x86-64.so.2()(64bit)"/>
-      <rpm:entry name="ld-linux-x86-64.so.2(GLIBC_2.3)(64bit)"/>
-      <rpm:entry name="libcom_err.so.2()(64bit)"/>
-      <rpm:entry name="libcrack.so.2()(64bit)"/>
-      <rpm:entry name="libcrypt.so.1()(64bit)"/>
-      <rpm:entry name="libcrypt.so.1(XCRYPT_2.0)(64bit)"/>
-      <rpm:entry name="libdb-5.3.so()(64bit)"/>
-      <rpm:entry name="libdb-utils"/>
-      <rpm:entry name="libdl.so.2()(64bit)"/>
-      <rpm:entry name="libdl.so.2(GLIBC_2.2.5)(64bit)"/>
-      <rpm:entry name="libevent-2.1.so.6()(64bit)"/>
-      <rpm:entry name="libgcc_s.so.1()(64bit)"/>
-      <rpm:entry name="libgcc_s.so.1(GCC_3.0)(64bit)"/>
-      <rpm:entry name="libicudata.so.60()(64bit)"/>
-      <rpm:entry name="libicui18n.so.60()(64bit)"/>
-      <rpm:entry name="libicuuc.so.60()(64bit)"/>
-      <rpm:entry name="libk5crypto.so.3()(64bit)"/>
-      <rpm:entry name="libkrb5.so.3()(64bit)"/>
-      <rpm:entry name="liblber-2.4.so.2()(64bit)"/>
-      <rpm:entry name="libldap_r-2.4.so.2()(64bit)"/>
-      <rpm:entry name="libldaputil.so.0()(64bit)"/>
-      <rpm:entry name="libm.so.6()(64bit)"/>
-      <rpm:entry name="libns-dshttpd-1.4.0.2010.so()(64bit)"/>
-      <rpm:entry name="libnspr4.so()(64bit)"/>
-      <rpm:entry name="libnss3.so()(64bit)"/>
-      <rpm:entry name="libnss3.so(NSS_3.12)(64bit)"/>
-      <rpm:entry name="libnss3.so(NSS_3.2)(64bit)"/>
-      <rpm:entry name="libnss3.so(NSS_3.3)(64bit)"/>
-      <rpm:entry name="libnss3.so(NSS_3.4)(64bit)"/>
-      <rpm:entry name="libnss3.so(NSS_3.9.2)(64bit)"/>
-      <rpm:entry name="libnunc-stans.so.0()(64bit)"/>
-      <rpm:entry name="libpam.so.0()(64bit)"/>
-      <rpm:entry name="libpam.so.0(LIBPAM_1.0)(64bit)"/>
-      <rpm:entry name="libpcre.so.1()(64bit)"/>
-      <rpm:entry name="libplc4.so()(64bit)"/>
-      <rpm:entry name="libplds4.so()(64bit)"/>
-      <rpm:entry name="libpthread.so.0()(64bit)"/>
-      <rpm:entry name="libpthread.so.0(GLIBC_2.12)(64bit)"/>
-      <rpm:entry name="libpthread.so.0(GLIBC_2.2.5)(64bit)"/>
-      <rpm:entry name="libpthread.so.0(GLIBC_2.3.2)(64bit)"/>
-      <rpm:entry name="libpthread.so.0(GLIBC_2.3.4)(64bit)"/>
-      <rpm:entry name="libsasl2.so.3()(64bit)"/>
-      <rpm:entry name="libsds.so.0()(64bit)"/>
-      <rpm:entry name="libsemanage-python3"/>
-      <rpm:entry name="libslapd.so.0()(64bit)"/>
-      <rpm:entry name="libssl3.so()(64bit)"/>
-      <rpm:entry name="libssl3.so(NSS_3.14)(64bit)"/>
-      <rpm:entry name="libssl3.so(NSS_3.2)(64bit)"/>
-      <rpm:entry name="libssl3.so(NSS_3.7.4)(64bit)"/>
-      <rpm:entry name="libstdc++.so.6()(64bit)"/>
-      <rpm:entry name="libstdc++.so.6(CXXABI_1.3)(64bit)"/>
-      <rpm:entry name="libstdc++.so.6(GLIBCXX_3.4)(64bit)"/>
-      <rpm:entry name="libstdc++.so.6(GLIBCXX_3.4.11)(64bit)"/>
-      <rpm:entry name="libsvrcore.so.0()(64bit)"/>
-      <rpm:entry name="libsystemd.so.0()(64bit)"/>
-      <rpm:entry name="libsystemd.so.0(LIBSYSTEMD_209)(64bit)"/>
-      <rpm:entry name="nss" flags="GE" epoch="0" ver="3.34"/>
-      <rpm:entry name="nss-tools"/>
-      <rpm:entry name="openldap-clients"/>
-      <rpm:entry name="openssl-perl"/>
-      <rpm:entry name="perl(:MODULE_COMPAT_5.26.3)"/>
-      <rpm:entry name="perl(Archive::Tar)"/>
-      <rpm:entry name="perl(Cwd)"/>
-      <rpm:entry name="perl(DB)"/>
-      <rpm:entry name="perl(DB_File)"/>
-      <rpm:entry name="perl(Getopt::Long)"/>
-      <rpm:entry name="perl(IO::File)"/>
-      <rpm:entry name="perl(IO::Uncompress::AnyUncompress)"/>
-      <rpm:entry name="perl(Scalar::Util)"/>
-      <rpm:entry name="perl(Time::Local)"/>
-      <rpm:entry name="perl(sigtrap)"/>
-      <rpm:entry name="perl(strict)"/>
-      <rpm:entry name="perl(warnings)"/>
-      <rpm:entry name="perl-Archive-Tar"/>
-      <rpm:entry name="perl-DB_File"/>
-      <rpm:entry name="perl-Errno" flags="GE" epoch="0" ver="1.23" rel="360"/>
-      <rpm:entry name="policycoreutils-python-utils"/>
-      <rpm:entry name="python3-ldap"/>
-      <rpm:entry name="python3-lib389" flags="EQ" epoch="0" ver="1.4.0.20" rel="10.module+el8.0.0+3096+101825d5"/>
-      <rpm:entry name="rtld(GNU_HASH)"/>
-      <rpm:entry name="selinux-policy" flags="GE" epoch="0" ver="3.14.1" rel="29"/>
-      <rpm:entry name="systemd" pre="1"/>
-      <rpm:entry name="systemd"/>
-      <rpm:entry name="libc.so.6(GLIBC_2.17)(64bit)"/>
-    </rpm:requires>
-    <rpm:conflicts>
-      <rpm:entry name="freeipa-server" flags="LT" epoch="0" ver="4.0.3"/>
-      <rpm:entry name="selinux-policy-base" flags="LT" epoch="0" ver="3.9.8"/>
-    </rpm:conflicts>
-    <rpm:obsoletes>
-      <rpm:entry name="389-ds-base-new" flags="LE" epoch="0" ver="1.3.5.4"/>
-      <rpm:entry name="389-ds-base-new" flags="LE" epoch="0" ver="1.4.0.9"/>
-    </rpm:obsoletes>
-    <file type="dir">/etc/dirsrv</file>
-    <file type="dir">/etc/dirsrv/config</file>
-    <file>/etc/dirsrv/config/certmap.conf</file>
-    <file>/etc/dirsrv/config/slapd-collations.conf</file>
-    <file>/etc/dirsrv/config/template-initconfig</file>
-    <file type="dir">/etc/dirsrv/schema</file>
-    <file>/etc/dirsrv/schema/99user.ldif</file>
-    <file>/etc/sysconfig/dirsrv</file>
-    <file>/etc/sysconfig/dirsrv.systemd</file>
-    <file type="dir">/etc/systemd/system/dirsrv.target.wants</file>
-    <file>/usr/bin/dbscan</file>
-    <file>/usr/bin/ds-logpipe.py</file>
-    <file>/usr/bin/ds-replcheck</file>
-    <file>/usr/bin/ldclt</file>
-    <file>/usr/bin/logconv.pl</file>
-    <file>/usr/bin/pwdhash</file>
-    <file>/usr/bin/readnsstate</file>
-    <file>/usr/lib64/dirsrv/bin/jeprof</file>
-    <file>/usr/sbin/bak2db</file>
-    <file>/usr/sbin/db2bak</file>
-    <file>/usr/sbin/db2index</file>
-    <file>/usr/sbin/db2ldif</file>
-    <file>/usr/sbin/dbverify</file>
-    <file>/usr/sbin/ldif2db</file>
-    <file>/usr/sbin/ldif2ldap</file>
-    <file>/usr/sbin/ns-slapd</file>
-    <file>/usr/sbin/restart-dirsrv</file>
-    <file>/usr/sbin/start-dirsrv</file>
-    <file>/usr/sbin/status-dirsrv</file>
-    <file>/usr/sbin/stop-dirsrv</file>
-    <file>/usr/sbin/upgradedb</file>
-    <file>/usr/sbin/vlvindex</file>
-    <file>/usr/share/gdb/auto-load/usr/sbin/ns-slapd-gdb.py</file>
-  </format>
-</package>
-<package type="rpm">
-  <name>zziplib-utils</name>
-  <arch>x86_64</arch>
-  <version epoch="0" ver="0.13.68" rel="8.el8"/>
-  <checksum type="sha256" pkgid="YES">26d838b257f0890c3abf408bc200ebcf53ff1e40f16654cad9b1cb4c059f0d42</checksum>
-  <summary>Utilities for the zziplib library</summary>
-  <description>The zziplib library is intentionally lightweight, it offers the ability to
-easily extract data from files archived in a single zip file. Applications
-can bundle files into a single zip archive and access them. The implementation
-is based only on the (free) subset of compression with the zlib algorithm
-which is actually used by the zip/unzip tools.
-
-This packages contains all the utilities that come with the zziplib library.</description>
-  <packager>Red Hat, Inc. &lt;http://bugzilla.redhat.com/bugzilla&gt;</packager>
-  <url>http://zziplib.sourceforge.net/</url>
-  <time file="1579047155" build="1574175461"/>
-  <size package="48588" installed="147600" archive="152544"/>
-  <location href="Packages/z/zziplib-utils-0.13.68-8.el8.x86_64.rpm"/>
-  <format>
-    <rpm:license>LGPLv2+ or MPLv1.1</rpm:license>
-    <rpm:vendor>Red Hat, Inc.</rpm:vendor>
-    <rpm:group>Applications/Archiving</rpm:group>
-    <rpm:buildhost>x86-vm-09.build.eng.bos.redhat.com</rpm:buildhost>
-    <rpm:sourcerpm>zziplib-0.13.68-8.el8.src.rpm</rpm:sourcerpm>
-    <rpm:header-range start="5608" end="19832"/>
-    <rpm:provides>
-      <rpm:entry name="zziplib-utils" flags="EQ" epoch="0" ver="0.13.68" rel="8.el8"/>
-      <rpm:entry name="zziplib-utils(x86-64)" flags="EQ" epoch="0" ver="0.13.68" rel="8.el8"/>
-    </rpm:provides>
-    <rpm:requires>
-      <rpm:entry name="libz.so.1()(64bit)"/>
-      <rpm:entry name="libzzip-0.so.13()(64bit)"/>
-      <rpm:entry name="libzzipfseeko-0.so.13()(64bit)"/>
-      <rpm:entry name="libzzipmmapped-0.so.13()(64bit)"/>
-      <rpm:entry name="rtld(GNU_HASH)"/>
-      <rpm:entry name="zziplib(x86-64)" flags="EQ" epoch="0" ver="0.13.68" rel="8.el8"/>
-      <rpm:entry name="libc.so.6(GLIBC_2.14)(64bit)"/>
-    </rpm:requires>
-    <file>/usr/bin/unzip-mem</file>
-    <file>/usr/bin/unzzip</file>
-    <file>/usr/bin/unzzip-big</file>
-    <file>/usr/bin/unzzip-mem</file>
-    <file>/usr/bin/unzzip-mix</file>
-    <file>/usr/bin/zzcat</file>
-    <file>/usr/bin/zzdir</file>
-    <file>/usr/bin/zzxorcat</file>
-    <file>/usr/bin/zzxorcopy</file>
-    <file>/usr/bin/zzxordir</file>
-  </format>
-</package>
-<package type="rpm">
-  <name>zziplib</name>
-  <arch>i686</arch>
-  <version epoch="0" ver="0.14.68" rel="8.el8"/>
-  <checksum type="sha256" pkgid="YES">207d3ba8e031d11bd13923e6027e17e5db12d76e915a28e9cd1589ef796a6e6b</checksum>
-  <summary>Lightweight library to easily extract data from zip files</summary>
-  <description>The zziplib library is intentionally lightweight, it offers the ability to
-easily extract data from files archived in a single zip file. Applications
-can bundle files into a single zip archive and access them. The implementation
-is based only on the (free) subset of compression with the zlib algorithm
-which is actually used by the zip/unzip tools.</description>
-  <packager>Red Hat, Inc. &lt;http://bugzilla.redhat.com/bugzilla&gt;</packager>
-  <url>http://zziplib.sourceforge.net/</url>
-  <time file="1579042443" build="1574175462"/>
-  <size package="95172" installed="217669" archive="223072"/>
-  <location href="Packages/z/zziplib-0.13.68-8.el8.i686.rpm"/>
-  <format>
-    <rpm:license>LGPLv2+ or MPLv1.1</rpm:license>
-    <rpm:vendor>Red Hat, Inc.</rpm:vendor>
-    <rpm:group>Applications/Archiving</rpm:group>
-    <rpm:buildhost>x86-vm-09.build.eng.bos.redhat.com</rpm:buildhost>
-    <rpm:sourcerpm>zziplib-0.13.68-8.el8.src.rpm</rpm:sourcerpm>
-    <rpm:header-range start="5608" end="18592"/>
-    <rpm:provides>
-      <rpm:entry name="libzzip-0.so.13"/>
-      <rpm:entry name="libzzipfseeko-0.so.13"/>
-      <rpm:entry name="libzzipmmapped-0.so.13"/>
-      <rpm:entry name="libzzipwrap-0.so.13"/>
-      <rpm:entry name="zziplib" flags="EQ" epoch="0" ver="0.13.68" rel="8.el8"/>
-      <rpm:entry name="zziplib(x86-32)" flags="EQ" epoch="0" ver="0.13.68" rel="8.el8"/>
-    </rpm:provides>
-    <rpm:requires>
-      <rpm:entry name="/sbin/ldconfig" pre="1"/>
-      <rpm:entry name="/sbin/ldconfig"/>
-      <rpm:entry name="libz.so.1"/>
-      <rpm:entry name="rtld(GNU_HASH)"/>
-      <rpm:entry name="libc.so.6(GLIBC_2.7)"/>
-    </rpm:requires>
-  </format>
-</package>
-<package type="rpm">
-  <name>zziplib</name>
-  <arch>x86_64</arch>
-  <version epoch="0" ver="0.13.68" rel="8.el8"/>
-  <checksum type="sha256" pkgid="YES">30cee6c1adcaee7b24c1079072299ee55a9c3bbdcb91697544242c7567d18621</checksum>
-  <summary>Lightweight library to easily extract data from zip files</summary>
-  <description>The zziplib library is intentionally lightweight, it offers the ability to
-easily extract data from files archived in a single zip file. Applications
-can bundle files into a single zip archive and access them. The implementation
-is based only on the (free) subset of compression with the zlib algorithm
-which is actually used by the zip/unzip tools.</description>
-  <packager>Red Hat, Inc. &lt;http://bugzilla.redhat.com/bugzilla&gt;</packager>
-  <url>http://zziplib.sourceforge.net/</url>
-  <time file="1579041776" build="1574175461"/>
-  <size package="92904" installed="219993" archive="225452"/>
-  <location href="Packages/z/zziplib-0.13.68-8.el8.x86_64.rpm"/>
-  <format>
-    <rpm:license>LGPLv2+ or MPLv1.1</rpm:license>
-    <rpm:vendor>Red Hat, Inc.</rpm:vendor>
-    <rpm:group>Applications/Archiving</rpm:group>
-    <rpm:buildhost>x86-vm-09.build.eng.bos.redhat.com</rpm:buildhost>
-    <rpm:sourcerpm>zziplib-0.13.68-8.el8.src.rpm</rpm:sourcerpm>
-    <rpm:header-range start="5608" end="18620"/>
-    <rpm:provides>
-      <rpm:entry name="libzzip-0.so.13()(64bit)"/>
-      <rpm:entry name="libzzipfseeko-0.so.13()(64bit)"/>
-      <rpm:entry name="libzzipmmapped-0.so.13()(64bit)"/>
-      <rpm:entry name="libzzipwrap-0.so.13()(64bit)"/>
-      <rpm:entry name="zziplib" flags="EQ" epoch="0" ver="0.13.68" rel="8.el8"/>
-      <rpm:entry name="zziplib(x86-64)" flags="EQ" epoch="0" ver="0.13.68" rel="8.el8"/>
-    </rpm:provides>
-    <rpm:requires>
-      <rpm:entry name="/sbin/ldconfig" pre="1"/>
-      <rpm:entry name="/sbin/ldconfig"/>
-      <rpm:entry name="libz.so.1()(64bit)"/>
-      <rpm:entry name="rtld(GNU_HASH)"/>
-      <rpm:entry name="libc.so.6(GLIBC_2.14)(64bit)"/>
-    </rpm:requires>
-  </format>
-</package>
-</metadata>
diff --git a/tests/data/test_create_packages_json/test_repo_2/repodata/repomd.xml b/tests/data/test_create_packages_json/test_repo_2/repodata/repomd.xml
index 2d14f784..15d22eac 100644
--- a/tests/data/test_create_packages_json/test_repo_2/repodata/repomd.xml
+++ b/tests/data/test_create_packages_json/test_repo_2/repodata/repomd.xml
@@ -1,28 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
-    <revision>1610968727</revision>
-    <data type="primary">
-        <checksum type="sha256">dcfe621a2c74f0f58fce6da4a4fbbc3670d889ec207350a90ec1d082b206f98a</checksum>
-        <open-checksum type="sha256">14cb7ce7edc80fa750d5139170112073325af0badbf8bd9c294e033bf4518b83</open-checksum>
-        <location href="repodata/primary.xml"/>
-        <timestamp>1610968715</timestamp>
-        <size>3193</size>
-        <open-size>20480</open-size>
-    </data>
-    <data type="filelists">
-        <checksum type="sha256">e41805c927fc4ad1b9bde52509afb37e47acc153283b23da17560d4e250b3a3e</checksum>
-        <open-checksum type="sha256">5f659e8c05b7d056748bf809bec8aa9fa5f791c2b0546d6c49b02a7ebfb26ce2</open-checksum>
-        <location href="repodata/filelists.xml.gz"/>
-        <timestamp>1610968715</timestamp>
-        <size>3970</size>
-        <open-size>19897</open-size>
-    </data>
-    <data type="other">
-        <checksum type="sha256">db6d0d88abcaf06dc8ef09207fdbb9ba5e3ffb505a7dd2bf94fdbc953a6de11e</checksum>
-        <open-checksum type="sha256">3ae1b186b4c3037805e2cf28a78b2204c37b4dc04acbd8bef98a7b24ab5b52a8</open-checksum>
-        <location href="repodata/other.xml.gz"/>
-        <timestamp>1610968715</timestamp>
-        <size>2191</size>
-        <open-size>8337</open-size>
-    </data>
+  <revision>1666177500</revision>
+  <data type="primary">
+    <checksum type="sha256">a1d342aa7cef3a2034fc3f9d6ee02d63572780bc76e61749a57e50b6b3ca9869</checksum>
+    <open-checksum type="sha256">a9e3eae447dd44282d7d96db5f15f049b757925397adb752f4df982176bab7e0</open-checksum>
+    <location href="repodata/a1d342aa7cef3a2034fc3f9d6ee02d63572780bc76e61749a57e50b6b3ca9869-primary.xml.gz"/>
+    <timestamp>1666177500</timestamp>
+    <size>3501</size>
+    <open-size>37296</open-size>
+  </data>
+  <data type="filelists">
+    <checksum type="sha256">6778922d5853d20f213ae7702699a76f1e87e55d6bfb5e4ac6a117d904d47b3c</checksum>
+    <open-checksum type="sha256">e30b666d9d88a70de69a08f45e6696bcd600c45485d856bd0213395d7da7bd49</open-checksum>
+    <location href="repodata/6778922d5853d20f213ae7702699a76f1e87e55d6bfb5e4ac6a117d904d47b3c-filelists.xml.gz"/>
+    <timestamp>1666177500</timestamp>
+    <size>27624</size>
+    <open-size>318187</open-size>
+  </data>
+  <data type="other">
+    <checksum type="sha256">5a60d79d8bce6a805f4fdb22fd891524359dce8ccc665c0b54e7299e79debe84</checksum>
+    <open-checksum type="sha256">b18138f4a3de45714e578fb1f30b7ec54fdcdaf1a22585891625b6af0894388e</open-checksum>
+    <location href="repodata/5a60d79d8bce6a805f4fdb22fd891524359dce8ccc665c0b54e7299e79debe84-other.xml.gz"/>
+    <timestamp>1666177500</timestamp>
+    <size>1876</size>
+    <open-size>28701</open-size>
+  </data>
+  <data type="primary_db">
+    <checksum type="sha256">c27bc2ce947173aba305041552c3c6d8db71442c1a2e5dcaf35ff750fe0469fc</checksum>
+    <open-checksum type="sha256">586e1af8934229925adb9e746ae5ced119859dfd97f4e3237399bb36a7d7f071</open-checksum>
+    <location href="repodata/c27bc2ce947173aba305041552c3c6d8db71442c1a2e5dcaf35ff750fe0469fc-primary.sqlite.bz2"/>
+    <timestamp>1666177500</timestamp>
+    <size>11528</size>
+    <open-size>126976</open-size>
+    <database_version>10</database_version>
+  </data>
+  <data type="filelists_db">
+    <checksum type="sha256">ed350865982e7a1e45b144839b56eac888e5d8f680571dd2cd06b37dc83e0fd8</checksum>
+    <open-checksum type="sha256">697903989d0f77de2d44a2b603e75c9b4ca23b3795eb136d175caf5666ce6459</open-checksum>
+    <location href="repodata/ed350865982e7a1e45b144839b56eac888e5d8f680571dd2cd06b37dc83e0fd8-filelists.sqlite.bz2"/>
+    <timestamp>1666177500</timestamp>
+    <size>20440</size>
+    <open-size>163840</open-size>
+    <database_version>10</database_version>
+  </data>
+  <data type="other_db">
+    <checksum type="sha256">35eff699131e0976429144c6f4514d21568177dc64bb4091c3ff62f76b293725</checksum>
+    <open-checksum type="sha256">3bd999a1bdf300df836a4607b7b75f845d8e1432e3e4e1ab6f0c7cc8a853db39</open-checksum>
+    <location href="repodata/35eff699131e0976429144c6f4514d21568177dc64bb4091c3ff62f76b293725-other.sqlite.bz2"/>
+    <timestamp>1666177500</timestamp>
+    <size>4471</size>
+    <open-size>49152</open-size>
+    <database_version>10</database_version>
+  </data>
 </repomd>
diff --git a/tests/test_create_packages_json.py b/tests/test_create_packages_json.py
index df109e71..4855a8a4 100644
--- a/tests/test_create_packages_json.py
+++ b/tests/test_create_packages_json.py
@@ -65,7 +65,7 @@ class TestPackagesJson(TestCase):
                 test_repo_info_2,
             ],
             excluded_packages=['zziplib-utils'],
-            included_packages=['389-ds-base-new*'],
+            included_packages=['vim-file*'],
         )
         test_packages = defaultdict(
             lambda: defaultdict(
@@ -74,18 +74,17 @@ class TestPackagesJson(TestCase):
                 )
             )
         )
-        test_packages['TestRepo2']['x86_64']['zziplib'] = \
+        test_packages['TestRepo']['x86_64']['zziplib'] = \
             [
                 'zziplib.i686',
                 'zziplib.x86_64',
             ]
-        test_packages['TestRepo2']['x86_64']['389-ds-base-new'] = \
+        test_packages['TestRepo2']['x86_64']['vim'] = \
             [
-                '389-ds-base-new.x86_64',
-            ]
-        test_packages['TestRepo']['x86_64']['zziplib'] = \
-            [
-                'zziplib.x86_64',
+                'vim-X11.i686',
+                'vim-common.i686',
+                'vim-enhanced.i686',
+                'vim-filesystem.noarch',
             ]
         result = pg.generate_packages_json()
         self.assertEqual(