diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index d97354f..9b3e6b8 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -5,7 +5,7 @@ on:
     tags:
       - 'v*'
 jobs:
-  build:
+  create-release:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index dfcac0c..fd07fb0 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -5,7 +5,7 @@ on:
     tags: [ 'v*.*.*' ]
 
 jobs:
-  docker:
+  docker-publish-image:
     runs-on: ubuntu-latest
     steps:
       - name: Login to Docker Hub
@@ -17,5 +17,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
+          context: .
+          file: ./Dockerfile
           push: true
           tags: laurocorreia/alura-flix-api:latest
\ No newline at end of file
diff --git a/src/main/java/com/alura/aluraflixapi/infraestructure/mapper/VideoMapper.java b/src/main/java/com/alura/aluraflixapi/infraestructure/mapper/VideoMapper.java
index c48054d..7b09d21 100644
--- a/src/main/java/com/alura/aluraflixapi/infraestructure/mapper/VideoMapper.java
+++ b/src/main/java/com/alura/aluraflixapi/infraestructure/mapper/VideoMapper.java
@@ -4,7 +4,6 @@
 import com.alura.aluraflixapi.domain.video.dto.UpdateVideoDto;
 import com.alura.aluraflixapi.domain.video.dto.VideoDto;
 import org.mapstruct.Mapper;
-import org.springframework.data.domain.PageImpl;
 
 import java.util.List;
 
@@ -15,9 +14,9 @@ public interface VideoMapper {
 
     VideoDto mapToVideoDto(Video video);
 
-    UpdateVideoDto mapUpdateVideoDto(Video updateDto);
+    UpdateVideoDto mapToUpdateVideoDto(Video model);
 
-    Video mapUpdateVideoToModel(UpdateVideoDto updateVideoDto);
+    Video mapToModel(UpdateVideoDto updateVideoDto);
 
     List<VideoDto> maptoList(List<Video> videos);
 }
diff --git a/src/main/java/com/alura/aluraflixapi/infraestructure/service/VideoServiceImpl.java b/src/main/java/com/alura/aluraflixapi/infraestructure/service/VideoServiceImpl.java
index bbaf2be..646649d 100644
--- a/src/main/java/com/alura/aluraflixapi/infraestructure/service/VideoServiceImpl.java
+++ b/src/main/java/com/alura/aluraflixapi/infraestructure/service/VideoServiceImpl.java
@@ -9,9 +9,11 @@
 import com.alura.aluraflixapi.infraestructure.mapper.VideoMapper;
 import com.alura.aluraflixapi.infraestructure.repository.CategoryRepository;
 import com.alura.aluraflixapi.infraestructure.repository.VideoRepository;
+
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -23,87 +25,86 @@
 @Slf4j
 public class VideoServiceImpl implements VideoService {
 
-  private static final String LOGGIN_PREFIX = "[VideoServiceImpl]";
-  private final VideoRepository videoRepository;
-  private final CategoryRepository categoryRepository;
-  private final VideoMapper videoMapper;
-
-  @Autowired
-  public VideoServiceImpl(VideoRepository videoRepository, VideoMapper videoMapper,
-      CategoryRepository categoryRepository) {
-    this.videoRepository = videoRepository;
-    this.videoMapper = videoMapper;
-    this.categoryRepository = categoryRepository;
-  }
-
-  @Override
-  public Page<VideoDto> getVideos(Pageable pageable) {
-    Page<Video> pages = videoRepository.findAll(pageable);
-
-    pages.get()
-        .forEach(video -> {
-          if (Objects.isNull(video.getCategory())) {
-            video.setCategory(Category.builder()
-                .id(null)
-                .rating(Rating.FREE.name())
-                .title(null)
-                .colorHex(null)
-                .build());
-          }
-        });
-
-    return new PageImpl<>(this.videoMapper.maptoList(pages.getContent()));
-  }
-
-  @Override
-  public VideoDto save(VideoDto dto) {
-    try {
-      log.info("{} Saving new video: {}", LOGGIN_PREFIX, dto.toString());
-      final var entityToPersist = videoMapper.mapToModel(dto);
-      final var entityPersisted = this.videoRepository.save(entityToPersist);
-      log.info("{} New Video saved", LOGGIN_PREFIX);
-      return videoMapper.mapToVideoDto(entityPersisted);
-    } catch (Exception e) {
-      throw new RuntimeException("Error to persist entity", e.getCause());
+    private static final String LOGGING_PREFIX = "[VideoServiceImpl]";
+    private final VideoRepository videoRepository;
+    private final CategoryRepository categoryRepository;
+    private final VideoMapper videoMapper;
+
+    @Autowired
+    public VideoServiceImpl(VideoRepository videoRepository, VideoMapper videoMapper,
+                            CategoryRepository categoryRepository) {
+        this.videoRepository = videoRepository;
+        this.videoMapper = videoMapper;
+        this.categoryRepository = categoryRepository;
     }
-  }
-
-  @Override
-  public UpdateVideoDto updateMovie(UpdateVideoDto dto) {
-    try {
-
-      final Video entity = videoMapper.mapUpdateVideoToModel(dto);
-      //The mapping framework does not handle cascading saves.
-      final var categorySaved = categoryRepository.save(entity.getCategory());
-      entity.setCategory(categorySaved);
-      videoRepository.save(entity);
-      return videoMapper.mapUpdateVideoDto(entity);
-    } catch (Exception e) {
-      log.error("Error to try Update entity by method Put {}", e.getMessage());
-      return null;
+
+    @Override
+    public Page<VideoDto> getVideos(Pageable pageable) {
+        Page<Video> pages = videoRepository.findAll(pageable);
+
+        pages.get()
+                .forEach(video -> {
+                    if (Objects.isNull(video.getCategory())) {
+                        video.setCategory(Category.builder()
+                                .id(null)
+                                .rating(Rating.FREE.name())
+                                .title(null)
+                                .colorHex(null)
+                                .build());
+                    }
+                });
+
+        return new PageImpl<>(this.videoMapper.maptoList(pages.getContent()));
+    }
+
+    @Override
+    public VideoDto save(VideoDto dto) {
+        try {
+            log.info("{} Saving new video: {}", LOGGING_PREFIX, dto.toString());
+            final var entityToPersist = videoMapper.mapToModel(dto);
+            final var entityPersisted = this.videoRepository.save(entityToPersist);
+            log.info("{} New Video saved", LOGGING_PREFIX);
+            return videoMapper.mapToVideoDto(entityPersisted);
+        } catch (Exception e) {
+            throw new RuntimeException("Error to persist entity", e.getCause());
+        }
     }
 
-  }
-
-  @Override
-  public Optional<VideoDto> delete(String id) {
-    Optional<Video> entityToDelete = videoRepository.findById(id);
-    entityToDelete.ifPresent(videoRepository::delete);
-    return entityToDelete.map(videoMapper::mapToVideoDto);
-  }
-
-  @Override
-  public VideoDto getById(String id) {
-    return videoRepository.findById(id)
-        .map(videoMapper::mapToVideoDto)
-        .orElse(null);
-  }
-
-  @Override
-  public List<VideoDto> getVideosByTitle(String name) {
-    return this.videoRepository.findByTitleLike(name)
-        .stream()
-        .map(this.videoMapper::mapToVideoDto)
-        .toList();
-  }
+    @Override
+    public UpdateVideoDto updateMovie(UpdateVideoDto dto) {
+        try {
+
+            final Video entity = videoMapper.mapToModel(dto);
+            //The mapping framework does not handle cascading saves.
+            final var categorySaved = categoryRepository.save(entity.getCategory());
+            entity.setCategory(categorySaved);
+            videoRepository.save(entity);
+            return videoMapper.mapToUpdateVideoDto(entity);
+        } catch (Exception e) {
+            throw new RuntimeException("Error to update movie", e.getCause());
+        }
+
+    }
+
+    @Override
+    public Optional<VideoDto> delete(String id) {
+        Optional<Video> entityToDelete = videoRepository.findById(id);
+        entityToDelete.ifPresent(this.videoRepository::delete);
+        return entityToDelete.map(videoMapper::mapToVideoDto);
+    }
+
+    @Override
+    public VideoDto getById(String id) {
+        return videoRepository.findById(id)
+                .map(videoMapper::mapToVideoDto)
+                .orElse(null);
+    }
+
+    @Override
+    public List<VideoDto> getVideosByTitle(String name) {
+        return this.videoRepository.findByTitleLike(name)
+                .stream()
+                .map(this.videoMapper::mapToVideoDto)
+                .toList();
+    }
 }
diff --git a/src/test/java/com/alura/aluraflixapi/infraestructure/service/VideoServiceImplTest.java b/src/test/java/com/alura/aluraflixapi/infraestructure/service/VideoServiceImplTest.java
new file mode 100644
index 0000000..f537f57
--- /dev/null
+++ b/src/test/java/com/alura/aluraflixapi/infraestructure/service/VideoServiceImplTest.java
@@ -0,0 +1,138 @@
+package com.alura.aluraflixapi.infraestructure.service;
+
+import com.alura.aluraflixapi.domain.video.Video;
+import com.alura.aluraflixapi.domain.video.dto.UpdateVideoDto;
+import com.alura.aluraflixapi.domain.video.dto.VideoDto;
+import com.alura.aluraflixapi.infraestructure.mapper.VideoMapperImpl;
+import com.alura.aluraflixapi.infraestructure.repository.CategoryRepository;
+import com.alura.aluraflixapi.infraestructure.repository.VideoRepository;
+import com.alura.aluraflixapi.jsonutils.ParseJson;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(SpringExtension.class)
+class VideoServiceImplTest extends ParseJson {
+
+    @MockBean
+    private VideoRepository videoRepository;
+    @SpyBean
+    private VideoMapperImpl videoMapper;
+    @MockBean
+    private CategoryRepository categoryRepository;
+    @SpyBean
+    private VideoServiceImpl videoService;
+
+    @Test
+    void getVideos_response_ok_test() {
+        //Given
+        final var jsonFile = getJsonFile("getAllVideos_response_ok.json");
+        final var videos = parseToJavaObject(jsonFile, Video[].class);
+        final Page<Video> pagesVideos = new PageImpl<>(Arrays.stream(videos).toList());
+
+        final var videosDto = this.videoMapper.maptoList(Arrays.stream(videos).toList());
+        when(this.videoRepository.findAll(any(Pageable.class))).thenReturn(pagesVideos);
+        when(this.videoMapper.maptoList(anyList())).thenReturn(videosDto);
+
+        //when
+        final var response = this.videoService.getVideos(Pageable.ofSize(10));
+
+        //Then
+        Assertions.assertThat(response).isNotNull();
+        Assertions.assertThat(response.getContent()).usingRecursiveComparison().isEqualTo(videosDto);
+    }
+
+    @Test
+    void save_response_ok_test() {
+        //Given
+        final var jsonFile = getJsonFile("create_video_response_ok.json");
+        final var videoDto = parseToJavaObject(jsonFile, VideoDto.class);
+        final var videoModel = this.videoMapper.mapToModel(videoDto);
+        when(this.videoMapper.mapToModel(any(VideoDto.class))).thenReturn(videoModel);
+        when(this.videoMapper.mapToVideoDto(any())).thenReturn(videoDto);
+
+        //When
+        final var videoCreated = this.videoService.save(videoDto);
+
+        //then
+        Assertions.assertThat(videoCreated).isNotNull();
+        Assertions.assertThat(videoCreated).usingRecursiveComparison().isEqualTo(videoDto);
+    }
+
+    @Test
+    void updateMovie_response_ok_test() {
+
+        //Given
+        final var jsonFile = getJsonFile("update_video_response_ok.json");
+        final var updateVideoDtoParsed = parseToJavaObject(jsonFile, UpdateVideoDto.class);
+        final var model = this.videoMapper.mapToModel(updateVideoDtoParsed);
+        final var updateVideoDto = this.videoMapper.mapToUpdateVideoDto(model);
+        when(this.videoMapper.mapToModel(any(UpdateVideoDto.class))).thenReturn(model);
+        when(this.videoMapper.mapToUpdateVideoDto(any())).thenReturn(updateVideoDto);
+
+        //When
+        final var response = this.videoService.updateMovie(updateVideoDtoParsed);
+
+        //Then
+        Assertions.assertThat(response).isNotNull();
+        Assertions.assertThat(response).usingRecursiveComparison().isEqualTo(updateVideoDtoParsed);
+    }
+
+    @Test
+    void delete_response_ok_test() {
+        //Given
+        final var jsonFile = getJsonFile("delete_video_response_ok.json");
+        final var model = parseToJavaObject(jsonFile, Video.class);
+        final var videoDto = this.videoMapper.mapToVideoDto(model);
+        when(this.videoRepository.findById(anyString())).thenReturn(Optional.of(model));
+        when(this.videoMapper.mapToVideoDto(model)).thenReturn(videoDto);
+
+        //When
+        final var response = this.videoService.delete("63680c011892283477b3e9b9");
+
+        //Then
+        Assertions.assertThat(response.get()).usingRecursiveComparison().isEqualTo(videoDto);
+    }
+
+    @Test
+    void getById_response_ok_test() {
+        //Given
+        final var jsonFile = getJsonFile("getById_video_response_ok.json");
+        final var model = parseToJavaObject(jsonFile, Video.class);
+        when(videoRepository.findById(anyString())).thenReturn(Optional.of(model));
+
+        //When
+        final var response = this.videoService.getById("63680c011892283477b3e9b9");
+
+        //Then
+        Assertions.assertThat(response).usingRecursiveComparison().isEqualTo(this.videoMapper.mapToVideoDto(model));
+    }
+
+    @Test
+    void getVideosByTitle_response_ok() {
+        //Given
+        final var jsonFile = getJsonFile("getById_video_response_ok.json");
+        final var video = parseToJavaObject(jsonFile, Video.class);
+        final var videoDtoExpected = this.videoMapper.mapToVideoDto(video);
+        when(this.videoRepository.findByTitleLike(anyString())).thenReturn(List.of(video));
+
+        //When
+        final var response = this.videoService.getVideosByTitle("Fantasy");
+
+        //Then
+        Assertions.assertThat(response.get(0)).usingRecursiveComparison().isEqualTo(videoDtoExpected);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/alura/aluraflixapi/jsonutils/ParseJson.java b/src/test/java/com/alura/aluraflixapi/jsonutils/ParseJson.java
new file mode 100644
index 0000000..e91ff6e
--- /dev/null
+++ b/src/test/java/com/alura/aluraflixapi/jsonutils/ParseJson.java
@@ -0,0 +1,46 @@
+package com.alura.aluraflixapi.jsonutils;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.boot.json.JsonParseException;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.util.ResourceUtils;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.List;
+
+public class ParseJson {
+
+    private static final String JSON_FOLDER = "src/test/resources/json/video/";
+
+    /**
+     * Convert a JSON file in to a java object
+     *
+     * @param file  json
+     * @param clazz to be converted
+     * @param <T>   type of class
+     * @return the java object
+     */
+    protected static <T> T parseToJavaObject(final File file, Class<T> clazz) {
+        try {
+            return new ObjectMapper().readValue(file, clazz);
+        } catch (IOException ex) {
+            throw new JsonParseException(ex.getCause());
+        }
+    }
+
+    /**
+     * @param json file
+     * @return Json {@link File} passed as argument
+     */
+    protected static File getJsonFile(final String json) {
+
+        try {
+            return ResourceUtils.getFile(JSON_FOLDER + json);
+        } catch (FileNotFoundException ex) {
+            throw new RuntimeException("Error to get json file", ex.getCause());
+        }
+
+    }
+}
diff --git a/src/test/resources/json/video/create_video_response_ok.json b/src/test/resources/json/video/create_video_response_ok.json
new file mode 100644
index 0000000..c23afe5
--- /dev/null
+++ b/src/test/resources/json/video/create_video_response_ok.json
@@ -0,0 +1,12 @@
+{
+  "id": "63680c011892283477b3e9b9",
+  "title": "Lord of the rings - The fellowship of the ring",
+  "description": "best movie ever",
+  "url": "https://lordoftherings.com",
+  "category": {
+    "id": "63f67ec16295ed744dd460cd",
+    "rating": "FREE",
+    "title": "Fantasy",
+    "colorHex": "#ffff83"
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/json/video/delete_video_response_ok.json b/src/test/resources/json/video/delete_video_response_ok.json
new file mode 100644
index 0000000..c23afe5
--- /dev/null
+++ b/src/test/resources/json/video/delete_video_response_ok.json
@@ -0,0 +1,12 @@
+{
+  "id": "63680c011892283477b3e9b9",
+  "title": "Lord of the rings - The fellowship of the ring",
+  "description": "best movie ever",
+  "url": "https://lordoftherings.com",
+  "category": {
+    "id": "63f67ec16295ed744dd460cd",
+    "rating": "FREE",
+    "title": "Fantasy",
+    "colorHex": "#ffff83"
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/json/video/getAllVideos_response_ok.json b/src/test/resources/json/video/getAllVideos_response_ok.json
new file mode 100644
index 0000000..0ed363c
--- /dev/null
+++ b/src/test/resources/json/video/getAllVideos_response_ok.json
@@ -0,0 +1,74 @@
+[
+  {
+    "id": "63680c011892283477b3e9b9",
+    "title": "Lord of the rings - The fellowship of the ring",
+    "description": "best movie ever",
+    "url": "https://lordoftherings.com",
+    "category": {
+      "id": "63f67ec16295ed744dd460cd",
+      "rating": "FREE",
+      "title": "Fantasy",
+      "colorHex": "#ffff83"
+    }
+  },
+  {
+    "id": "63680c911892283477b3e9ba",
+    "title": "Lord of the rings - The two towers",
+    "description": "best movie ever",
+    "url": "https://lordoftherings.com",
+    "category": {
+      "id": null,
+      "rating": "FREE",
+      "title": null,
+      "colorHex": null
+    }
+  },
+  {
+    "id": "63680c9b1892283477b3e9bb",
+    "title": "Lord of the rings - The return of the king",
+    "description": "best movie ever",
+    "url": "https://lordoftherings.com",
+    "category": {
+      "id": null,
+      "rating": "FREE",
+      "title": null,
+      "colorHex": null
+    }
+  },
+  {
+    "id": "63680ec5cdba5969ea63db0f",
+    "title": "The Hobbit",
+    "description": "best movie ever",
+    "url": "https://thehobbit.com",
+    "category": {
+      "id": null,
+      "rating": "FREE",
+      "title": null,
+      "colorHex": null
+    }
+  },
+  {
+    "id": "63bae68dbde3421ed98adfba",
+    "title": "El hobbit: la desolación de Smaug (2013)",
+    "description": "El hobbit: la desolación de Smaug (2013)",
+    "url": "https://elhobbitsmaug.com",
+    "category": {
+      "id": null,
+      "rating": "FREE",
+      "title": null,
+      "colorHex": null
+    }
+  },
+  {
+    "id": "63bae6b8bde3421ed98adfbd",
+    "title": "El hobbit: la desolación de Smaug (2013)",
+    "description": "El hobbit: la desolación de Smaug (2013)",
+    "url": "https://elhobbitsmaug.com",
+    "category": {
+      "id": null,
+      "rating": "FREE",
+      "title": null,
+      "colorHex": null
+    }
+  }
+]
\ No newline at end of file
diff --git a/src/test/resources/json/video/getById_video_response_ok.json b/src/test/resources/json/video/getById_video_response_ok.json
new file mode 100644
index 0000000..c23afe5
--- /dev/null
+++ b/src/test/resources/json/video/getById_video_response_ok.json
@@ -0,0 +1,12 @@
+{
+  "id": "63680c011892283477b3e9b9",
+  "title": "Lord of the rings - The fellowship of the ring",
+  "description": "best movie ever",
+  "url": "https://lordoftherings.com",
+  "category": {
+    "id": "63f67ec16295ed744dd460cd",
+    "rating": "FREE",
+    "title": "Fantasy",
+    "colorHex": "#ffff83"
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/json/video/update_video_response_ok.json b/src/test/resources/json/video/update_video_response_ok.json
new file mode 100644
index 0000000..c23afe5
--- /dev/null
+++ b/src/test/resources/json/video/update_video_response_ok.json
@@ -0,0 +1,12 @@
+{
+  "id": "63680c011892283477b3e9b9",
+  "title": "Lord of the rings - The fellowship of the ring",
+  "description": "best movie ever",
+  "url": "https://lordoftherings.com",
+  "category": {
+    "id": "63f67ec16295ed744dd460cd",
+    "rating": "FREE",
+    "title": "Fantasy",
+    "colorHex": "#ffff83"
+  }
+}
\ No newline at end of file