diff --git a/.gitignore b/.gitignore
index f6838ee..f25e089 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /modulemd-tools-0.5.tar.gz
 /modulemd-tools-0.6.tar.gz
 /modulemd-tools-0.7.tar.gz
+/modulemd-tools-0.8.tar.gz
diff --git a/modulemd-tools.spec b/modulemd-tools.spec
index 1bf1f59..b5da031 100644
--- a/modulemd-tools.spec
+++ b/modulemd-tools.spec
@@ -1,5 +1,5 @@
 Name: modulemd-tools
-Version: 0.7
+Version: 0.8
 Release: 1%{?dist}
 Summary: Collection of tools for parsing and generating modulemd YAML files
 License: MIT
@@ -19,7 +19,6 @@ BuildRequires: python3-dnf
 BuildRequires: python3-hawkey
 BuildRequires: python3-createrepo_c
 BuildRequires: python3-pyyaml
-BuildRequires: python3-parameterized
 BuildRequires: python3-pytest
 
 Requires: createrepo_c
@@ -66,6 +65,18 @@ cd dir2module
 %py3_build
 cd ..
 
+cd createrepo_mod
+%py3_build
+cd ..
+
+cd modulemd-merge
+%py3_build
+cd ..
+
+cd modulemd_tools
+%py3_build
+cd ..
+
 PYTHONPATH=./modulemd_tools ./man/generate-manpages.sh
 
 
@@ -78,24 +89,46 @@ cd dir2module
 %py3_install
 cd ..
 
-cp createrepo_mod/createrepo_mod.py %{buildroot}%{_bindir}/createrepo_mod
-cp modulemd-merge/modulemd-merge.py %{buildroot}%{_bindir}/modulemd-merge
+cd createrepo_mod
+%py3_install
+cd ..
+
+cd modulemd-merge
+%py3_install
+cd ..
+
+cd modulemd_tools
+%py3_install
+cd ..
+
 cp modulemd-generate-macros/modulemd-generate-macros.py \
     %{buildroot}%{_bindir}/modulemd-generate-macros
 
-cp -r modulemd_tools/modulemd_tools %{buildroot}%{python3_sitelib}/modulemd_tools
-
 install -d %{buildroot}%{_mandir}/man1
 cp man/*.1 %{buildroot}%{_mandir}/man1/
 
 
 %check
+export PATH={buildroot}%{_bindir}:$PATH
+
 cd repo2module
-%{python3} -m pytest
+%{python3} -m pytest -vv
 cd ..
 
 cd dir2module
-%{python3} -m pytest
+%{python3} -m pytest -vv
+cd ..
+
+cd createrepo_mod
+%{python3} -m pytest -vv
+cd ..
+
+cd modulemd-merge
+%{python3} -m pytest -vv -s
+cd ..
+
+cd modulemd_tools
+%{python3} -m pytest -vv
 cd ..
 
 
@@ -106,12 +139,17 @@ cd ..
 %{python3_sitelib}/repo2module-*.egg-info/
 %{python3_sitelib}/dir2module
 %{python3_sitelib}/dir2module-*.egg-info/
+%{python3_sitelib}/createrepo_mod
+%{python3_sitelib}/createrepo_mod-*.egg-info/
+%{python3_sitelib}/modulemd_merge
+%{python3_sitelib}/modulemd_merge-*.egg-info/
+%{python3_sitelib}/modulemd_tools
+%{python3_sitelib}/modulemd_tools-*.egg-info/
 %{_bindir}/repo2module
 %{_bindir}/dir2module
 %{_bindir}/createrepo_mod
 %{_bindir}/modulemd-merge
 %{_bindir}/modulemd-generate-macros
-%{python3_sitelib}/modulemd_tools
 
 %{_mandir}/man1/repo2module.1*
 %{_mandir}/man1/dir2module.1*
@@ -121,6 +159,13 @@ cd ..
 
 
 %changelog
+* Tue Apr 06 2021 Jakub Kadlcik <frostyx@email.cz> 0.8-1
+- modulemd_tools: drop python3-parameterized dependency (frostyx@email.cz)
+- Package modulemd_tools helper lib (fvalder@redhat.com)
+- Add modulemd-merge tests (fvalder@redhat.com)
+- Add createrepo_mod tests (fvalder@redhat.com)
+- Replace master in fedora releaser to rawhide (frostyx@email.cz)
+
 * Tue Feb 09 2021 Jakub Kadlcik <frostyx@email.cz> 0.7-1
 - Generate manpages on the fly
 - Automated test builds incl. Docker/Travis
diff --git a/sources b/sources
index 3f55a5c..343ad51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (modulemd-tools-0.7.tar.gz) = ef0de75c87d36d4222be72ce99d64e43dd0de65a1a4ddeed9d901546612ac483c8724f18fb1e737a8c6d3d145531ea7ecd6703479c69bd0de1b6135701a19201
+SHA512 (modulemd-tools-0.8.tar.gz) = f1a8229008b07b8c62312cf5610f75c5a964df1d78efe08a75f2d822762cf65d76dca210988ece11d16a7705cc451a06c85be25b38cc6a601ddac62abe5249c9