diff --git a/bats/fb-katello-content.bats b/bats/fb-katello-content.bats
index 111fe9923..3688d1374 100755
--- a/bats/fb-katello-content.bats
+++ b/bats/fb-katello-content.bats
@@ -32,7 +32,7 @@ setup() {
 @test "create package repository" {
   hammer repository create --organization="${ORGANIZATION}" \
     --product="${PRODUCT}" --content-type="yum" --name "${YUM_REPOSITORY}" \
-    --url https://fixtures.pulpproject.org/rpm-packages-updateinfo/ | grep -q "Repository created"
+    --url https://fixtures.pulpproject.org/rpm-no-comps/ | grep -q "Repository created"
 }
 
 @test "upload package" {
@@ -449,3 +449,15 @@ setup() {
 @test "fetch rpm from yum repository on old path" {
   tCheckPulpYumContent "${HOSTNAME}" "pulp/repos" "Library"
 }
+
+@test "clean-up modules-rpms and rpm-deps" {
+  hammer repository delete --organization="${ORGANIZATION}" \
+    --product="${PRODUCT}" --name ${YUM_REPOSITORY_2} \
+    --remove-from-content-view-versions true
+  hammer repository delete --organization="${ORGANIZATION}" \
+    --product="${PRODUCT}" --name ${YUM_REPOSITORY_3} \
+    --remove-from-content-view-versions true
+
+  echo "::ForemanTasks.sync_task(::Actions::Katello::OrphanCleanup::RemoveOrphans, SmartProxy.pulp_primary)" \
+    | foreman-rake console
+}
diff --git a/bats/fixtures/component_1_modulemds b/bats/fixtures/component_1_modulemds
index af3e26417..72d2ab0fd 100644
--- a/bats/fixtures/component_1_modulemds
+++ b/bats/fixtures/component_1_modulemds
@@ -1,6 +1,5 @@
 -------------------|--------|----------------|--------------|---------
 MODULE STREAM NAME | STREAM | VERSION        | ARCHITECTURE | CONTEXT 
 -------------------|--------|----------------|--------------|---------
-kangaroo           | 0      | 20180730223407 | noarch       | deadbeef
 walrus             | 5.21   | 20180704144203 | x86_64       | deadbeef
 -------------------|--------|----------------|--------------|---------
diff --git a/bats/fixtures/component_1_rpms b/bats/fixtures/component_1_rpms
index 3d4703dcc..e64db76b0 100644
--- a/bats/fixtures/component_1_rpms
+++ b/bats/fixtures/component_1_rpms
@@ -1,18 +1,7 @@
------------------------------
-FILENAME                     
------------------------------
-wolf-9.4-2.noarch.rpm        
-whale-0.2-1.noarch.rpm       
-walrus-5.21-1.noarch.rpm     
-tiger-1.0-4.noarch.rpm       
-stork-0.12-2.noarch.rpm      
-shark-0.1-1.noarch.rpm       
-pike-2.2-1.noarch.rpm        
-penguin-0.9.1-1.noarch.rpm   
-lion-0.4-1.noarch.rpm        
-kangaroo-0.3-1.noarch.rpm    
-elephant-8.3-1.noarch.rpm    
-dolphin-3.10.232-1.noarch.rpm
-crow-0.8-1.noarch.rpm        
-bear-4.1-1.noarch.rpm        
------------------------------
+--------------------------
+FILENAME                  
+--------------------------
+walrus-5.21-1.noarch.rpm  
+shark-0.1-1.noarch.rpm    
+penguin-0.9.1-1.noarch.rpm
+--------------------------
diff --git a/bats/fixtures/component_2_errata b/bats/fixtures/component_2_errata
index fcfbe97ba..21a6536ea 100644
--- a/bats/fixtures/component_2_errata
+++ b/bats/fixtures/component_2_errata
@@ -2,4 +2,7 @@
 ERRATA ID     
 --------------
 RHEA-2012:0055
+RHEA-2012:0056
+RHEA-2012:0057
+RHEA-2012:0058
 --------------
diff --git a/bats/fixtures/composite_errata b/bats/fixtures/composite_errata
index fcfbe97ba..21a6536ea 100644
--- a/bats/fixtures/composite_errata
+++ b/bats/fixtures/composite_errata
@@ -2,4 +2,7 @@
 ERRATA ID     
 --------------
 RHEA-2012:0055
+RHEA-2012:0056
+RHEA-2012:0057
+RHEA-2012:0058
 --------------
diff --git a/bats/fixtures/composite_modulemds b/bats/fixtures/composite_modulemds
index af3e26417..72d2ab0fd 100644
--- a/bats/fixtures/composite_modulemds
+++ b/bats/fixtures/composite_modulemds
@@ -1,6 +1,5 @@
 -------------------|--------|----------------|--------------|---------
 MODULE STREAM NAME | STREAM | VERSION        | ARCHITECTURE | CONTEXT 
 -------------------|--------|----------------|--------------|---------
-kangaroo           | 0      | 20180730223407 | noarch       | deadbeef
 walrus             | 5.21   | 20180704144203 | x86_64       | deadbeef
 -------------------|--------|----------------|--------------|---------