diff --git a/src/gz_src_TEST.cc b/src/gz_src_TEST.cc
index 1ca4e8f9..8b41291c 100644
--- a/src/gz_src_TEST.cc
+++ b/src/gz_src_TEST.cc
@@ -51,6 +51,11 @@ class CmdLine : public ::testing::Test
     // instead of on teardown leaves the folder intact for debugging if needed
     common::removeAll(testCachePath);
     ASSERT_TRUE(common::createDirectories(testCachePath));
+    ASSERT_TRUE(common::createDirectories(
+        common::joinPaths(testCachePath, "fuel.gazebosim.org")));
+    ASSERT_TRUE(common::createDirectories(
+        common::joinPaths(testCachePath, "fuel.ignitionrobotics.org")));
+
     setenv("IGN_FUEL_CACHE_PATH", this->testCachePath.c_str(), true);
   }
 
@@ -85,7 +90,7 @@ TEST_F(CmdLine, ModelListFail)
 
   EXPECT_NE(this->stdOutBuffer.str().find("Invalid URL"),
       std::string::npos) << this->stdOutBuffer.str();
-  EXPECT_TRUE(this->stdErrBuffer.str().empty());
+  EXPECT_TRUE(this->stdErrBuffer.str().empty()) << this->stdErrBuffer.str();
 }
 
 /////////////////////////////////////////////////
@@ -397,10 +402,10 @@ TEST_P(DownloadCollectionTest, AllItems)
       "openrobotics", "models", "backpack")));
   EXPECT_TRUE(common::isDirectory(
     common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
-      "openrobotics", "models", "backpack", "2")));
+      "openrobotics", "models", "backpack", "3")));
   EXPECT_TRUE(common::isFile(
     common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
-      "openrobotics", "models", "backpack", "2", "model.sdf")));
+      "openrobotics", "models", "backpack", "3", "model.sdf")));
 
   // Model: TEAMBASE
   EXPECT_TRUE(common::isDirectory(
@@ -408,10 +413,10 @@ TEST_P(DownloadCollectionTest, AllItems)
       "openrobotics", "models", "teambase")));
   EXPECT_TRUE(common::isDirectory(
     common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
-      "openrobotics", "models", "teambase", "2")));
+      "openrobotics", "models", "teambase", "3")));
   EXPECT_TRUE(common::isFile(
     common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
-     "openrobotics", "models", "teambase", "2", "model.sdf")));
+     "openrobotics", "models", "teambase", "3", "model.sdf")));
 
   // World: Test World
   EXPECT_TRUE(common::isDirectory(
@@ -460,10 +465,10 @@ TEST_P(DownloadCollectionTest, Models)
       "openrobotics", "models", "backpack")));
   EXPECT_TRUE(common::isDirectory(
     common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
-      "openrobotics", "models", "backpack", "2")));
+      "openrobotics", "models", "backpack", "3")));
   EXPECT_TRUE(common::isFile(
     common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
-      "openrobotics", "models", "backpack", "2", "model.sdf")));
+      "openrobotics", "models", "backpack", "3", "model.sdf")));
 
   // Model: TEAMBASE
   EXPECT_TRUE(common::isDirectory(
@@ -471,10 +476,10 @@ TEST_P(DownloadCollectionTest, Models)
       "openrobotics", "models", "teambase")));
   EXPECT_TRUE(common::isDirectory(
     common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
-      "openrobotics", "models", "teambase", "2")));
+      "openrobotics", "models", "teambase", "3")));
   EXPECT_TRUE(common::isFile(
     common::joinPaths(this->testCachePath, "fuel.gazebosim.org",
-      "openrobotics", "models", "teambase", "2", "model.sdf")));
+      "openrobotics", "models", "teambase", "3", "model.sdf")));
 
   // World: Test World
   EXPECT_FALSE(common::isDirectory(