diff --git a/Course/CourseTests/Presentation/Container/CourseContainerViewModelTests.swift b/Course/CourseTests/Presentation/Container/CourseContainerViewModelTests.swift
index 39ccbd8b..278faf66 100644
--- a/Course/CourseTests/Presentation/Container/CourseContainerViewModelTests.swift
+++ b/Course/CourseTests/Presentation/Container/CourseContainerViewModelTests.swift
@@ -100,9 +100,13 @@ final class CourseContainerViewModelTests: XCTestCase {
             displayName: "",
             topicID: nil,
             childs: childs,
-            media: DataLayer.CourseMedia(image: DataLayer.Image(raw: "",
-                                                                small: "",
-                                                                large: "")),
+            media: CourseMedia(
+                image: CourseImage(
+                    raw: "",
+                    small: "",
+                    large: ""
+                )
+            ),
             certificate: nil,
             org: "",
             isSelfPaced: true,
@@ -169,9 +173,13 @@ final class CourseContainerViewModelTests: XCTestCase {
             displayName: "",
             topicID: nil,
             childs: [],
-            media: DataLayer.CourseMedia(image: DataLayer.Image(raw: "",
-                                                                small: "",
-                                                                large: "")),
+            media: CourseMedia(
+                image: CourseImage(
+                    raw: "",
+                    small: "",
+                    large: ""
+                )
+            ),
             certificate: nil,
             org: "",
             isSelfPaced: true,
@@ -431,11 +439,13 @@ final class CourseContainerViewModelTests: XCTestCase {
             displayName: "",
             topicID: nil,
             childs: [chapter],
-            media: DataLayer.CourseMedia(image: DataLayer.Image(
-                raw: "",
-                small: "",
-                large: ""
-            )),
+            media: CourseMedia(
+                image: CourseImage(
+                    raw: "",
+                    small: "",
+                    large: ""
+                )
+            ),
             certificate: nil,
             org: "",
             isSelfPaced: true,
@@ -573,11 +583,13 @@ final class CourseContainerViewModelTests: XCTestCase {
             displayName: "",
             topicID: nil,
             childs: [chapter],
-            media: DataLayer.CourseMedia(image: DataLayer.Image(
-                raw: "",
-                small: "",
-                large: ""
-            )),
+            media: CourseMedia(
+                image: CourseImage(
+                    raw: "",
+                    small: "",
+                    large: ""
+                )
+            ),
             certificate: nil,
             org: "",
             isSelfPaced: true,
@@ -698,11 +710,13 @@ final class CourseContainerViewModelTests: XCTestCase {
             displayName: "",
             topicID: nil,
             childs: [chapter],
-            media: DataLayer.CourseMedia(image: DataLayer.Image(
-                raw: "",
-                small: "",
-                large: ""
-            )),
+            media: CourseMedia(
+                image: CourseImage(
+                    raw: "",
+                    small: "",
+                    large: ""
+                )
+            ),
             certificate: nil,
             org: "",
             isSelfPaced: true,
@@ -824,11 +838,13 @@ final class CourseContainerViewModelTests: XCTestCase {
             displayName: "",
             topicID: nil,
             childs: [chapter],
-            media: DataLayer.CourseMedia(image: DataLayer.Image(
-                raw: "",
-                small: "",
-                large: ""
-            )),
+            media: CourseMedia(
+                image: CourseImage(
+                    raw: "",
+                    small: "",
+                    large: ""
+                )
+            ),
             certificate: nil,
             org: "",
             isSelfPaced: true,
@@ -943,11 +959,9 @@ final class CourseContainerViewModelTests: XCTestCase {
             displayName: "",
             topicID: nil,
             childs: [chapter],
-            media: DataLayer.CourseMedia(image: DataLayer.Image(
-                raw: "",
-                small: "",
-                large: ""
-            )),
+            media: CourseMedia(image: CourseImage(raw: "",
+                                                  small: "",
+                                                  large: "")),
             certificate: nil,
             org: "",
             isSelfPaced: true,
@@ -1078,11 +1092,9 @@ final class CourseContainerViewModelTests: XCTestCase {
             displayName: "",
             topicID: nil,
             childs: [chapter],
-            media: DataLayer.CourseMedia(image: DataLayer.Image(
-                raw: "",
-                small: "",
-                large: ""
-            )),
+            media: CourseMedia(image: CourseImage(raw: "",
+                                                  small: "",
+                                                  large: "")),
             certificate: nil,
             org: "",
             isSelfPaced: true,
@@ -1236,11 +1248,13 @@ final class CourseContainerViewModelTests: XCTestCase {
             displayName: "",
             topicID: nil,
             childs: [chapter],
-            media: DataLayer.CourseMedia(image: DataLayer.Image(
-                raw: "",
-                small: "",
-                large: ""
-            )),
+            media: CourseMedia(
+                image: CourseImage(
+                    raw: "",
+                    small: "",
+                    large: ""
+                )
+            ),
             certificate: nil,
             org: "",
             isSelfPaced: true,
diff --git a/Course/CourseTests/Presentation/Unit/CourseDateViewModelTests.swift b/Course/CourseTests/Presentation/Unit/CourseDateViewModelTests.swift
index 1fb78183..6e5579b6 100644
--- a/Course/CourseTests/Presentation/Unit/CourseDateViewModelTests.swift
+++ b/Course/CourseTests/Presentation/Unit/CourseDateViewModelTests.swift
@@ -42,9 +42,13 @@ final class CourseDateViewModelTests: XCTestCase {
             displayName: "",
             topicID: nil,
             childs: [],
-            media: DataLayer.CourseMedia(image: DataLayer.Image(raw: "",
-                                                                small: "",
-                                                                large: "")),
+            media: CourseMedia(
+                image: CourseImage(
+                    raw: "",
+                    small: "",
+                    large: ""
+                )
+            ),
             certificate: nil,
             org: "",
             isSelfPaced: true,