diff --git a/ReadMe.md b/ReadMe.md
new file mode 100644
index 0000000..34d4623
--- /dev/null
+++ b/ReadMe.md
@@ -0,0 +1,7 @@
+# REST-API APP
+This is a project to showcase the rest API using Spring boot. It allows you to add, view, update and remove film titles.
+## spring Boot 
+The use  of spring data jpa, hibernate as one of the technologies used.
+### MYSQL 
+database used to store data.
+#### maven.
diff --git a/pom.xml b/pom.xml
index 8f9fb82..807f047 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,12 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.github.javafaker/javafaker -->
+		<dependency>
+			<groupId>com.github.javafaker</groupId>
+			<artifactId>javafaker</artifactId>
+			<version>1.0.2</version>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/com/birichani/code/restapi/api/VideoApiController.java b/src/main/java/com/birichani/code/restapi/api/VideoApiController.java
index 9739c7d..bfbd514 100644
--- a/src/main/java/com/birichani/code/restapi/api/VideoApiController.java
+++ b/src/main/java/com/birichani/code/restapi/api/VideoApiController.java
@@ -1,39 +1,46 @@
 package com.birichani.code.restapi.api;
 
+import com.birichani.code.restapi.constant.ErrorMessage;
+import com.birichani.code.restapi.constant.InfoMessage;
 import com.birichani.code.restapi.model.Video;
 import com.birichani.code.restapi.repository.VideoRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.List;
+@RequestMapping("/videos")
 
 @RestController
 public class VideoApiController {
-	private VideoRepository videoRepository;
-	
+	private final VideoRepository videoRepository;
 	@Autowired
 	 public VideoApiController(VideoRepository videoRepository) {
 		this.videoRepository = videoRepository;
 	}
-	
-	@GetMapping("/Getvideos/{videoTopic}")
-	public String video(@PathVariable String videoTopic) {
-		
-		switch(videoTopic) {
-		case"python":
-		
-		return String.format("This is our python contents") ;
-		case "java": 
-			return String.format("This is our java contents") ;
+
+	@GetMapping("/{videoTopic}")
+	public String video (@PathVariable String videoTopic) {
+		String message;
+
+		switch (videoTopic) {
+			case "python":
+				message = InfoMessage.PYTHON_RESPONSE_MESSAGE;
+				break;
+			case "java":
+				message = InfoMessage.JAVA_RESPONSE_MESSAGE;
+				break;
 			default:
-				return String.format("sorry,Incorrect input") ;
-			
+
+
+		message = ErrorMessage.VIDEO_TOPIC_SELECTION_MESSAGE;
 	}
-		
+
+		return message;
 }
-	@GetMapping("/GetAll")
+	@GetMapping()
 	public List<Video> getAllvideos(){
 		return videoRepository.findAll();
 	}
diff --git a/src/main/java/com/birichani/code/restapi/constant/ErrorMessage.java b/src/main/java/com/birichani/code/restapi/constant/ErrorMessage.java
new file mode 100644
index 0000000..5c1ec30
--- /dev/null
+++ b/src/main/java/com/birichani/code/restapi/constant/ErrorMessage.java
@@ -0,0 +1,5 @@
+package com.birichani.code.restapi.constant;
+
+public class ErrorMessage {
+    public static final String VIDEO_TOPIC_SELECTION_MESSAGE = "Sorry. Incorrect input.";
+}
diff --git a/src/main/java/com/birichani/code/restapi/constant/InfoMessage.java b/src/main/java/com/birichani/code/restapi/constant/InfoMessage.java
new file mode 100644
index 0000000..a1fcecf
--- /dev/null
+++ b/src/main/java/com/birichani/code/restapi/constant/InfoMessage.java
@@ -0,0 +1,12 @@
+package com.birichani.code.restapi.constant;
+
+
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+public class InfoMessage {
+
+    public static final String PYTHON_RESPONSE_MESSAGE = "This is our python content.";
+    public static final String JAVA_RESPONSE_MESSAGE = "This is our java content.";
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/birichani/code/restapi/model/Video.java b/src/main/java/com/birichani/code/restapi/model/Video.java
index 65ace79..4d0daa1 100644
--- a/src/main/java/com/birichani/code/restapi/model/Video.java
+++ b/src/main/java/com/birichani/code/restapi/model/Video.java
@@ -1,6 +1,8 @@
 package com.birichani.code.restapi.model;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -8,6 +10,8 @@
 import javax.persistence.Id;
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 @Entity
 public class Video {
 	@Id
@@ -15,4 +19,11 @@ public class Video {
 	private Long vid;
 	private String title;
 	private String description;
+	private String link;
+	
+	public Video(String title, String description, String link) {
+		this.title = title;
+		this.description = description;
+		this.link = link;
+	}
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index ebba310..c5e0552 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,9 +1,9 @@
 server.port=8084
 
 # Datasource properties
-spring.datasource.url=jdbc:mysql://localhost/dynamiccontents?useSSL=false
+spring.datasource.url=jdbc:mysql://localhost:3306/dynamiccontents?allowPublicKeyRetrieval=true&useSSL=false
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=Sb34106209
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 # JPA properties
diff --git a/src/test/java/com/birichani/code/restapi/VideoControllerUnitTest.java b/src/test/java/com/birichani/code/restapi/VideoControllerUnitTest.java
new file mode 100644
index 0000000..426cbd4
--- /dev/null
+++ b/src/test/java/com/birichani/code/restapi/VideoControllerUnitTest.java
@@ -0,0 +1,26 @@
+package com.birichani.code.restapi;
+
+import com.birichani.code.restapi.api.VideoApiController;
+import com.birichani.code.restapi.constant.InfoMessage;
+import com.birichani.code.restapi.repository.VideoRepository;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+@DisplayName("Video API Controller Unit Test")
+public class VideoControllerUnitTest {
+
+    @Mock
+    VideoRepository videoRepository;
+    VideoApiController controller = new VideoApiController(videoRepository);
+
+    @Test
+    @DisplayName("Test That Correct Video Topic Is Returned")
+    void testThatCorrectVideoTopicIsReturned() {
+        String response = controller.video("Java");
+        assertEquals(InfoMessage.JAVA_RESPONSE_MESSAGE, response);
+    }
+
+}
+
diff --git a/src/test/java/com/birichani/code/restapi/repository/VideoRepositoryTest.java b/src/test/java/com/birichani/code/restapi/repository/VideoRepositoryTest.java
new file mode 100644
index 0000000..3a70612
--- /dev/null
+++ b/src/test/java/com/birichani/code/restapi/repository/VideoRepositoryTest.java
@@ -0,0 +1,45 @@
+package com.birichani.code.restapi.repository;
+
+import com.birichani.code.restapi.model.Video;
+import com.github.javafaker.Faker;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import java.util.Locale;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+/**
+ * @author - JoeSeff
+ * @created - 16/10/2020 02:02
+ */
+
+@ExtendWith(SpringExtension.class)
+@DataJpaTest
+@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
+@TestPropertySource(properties = {
+        "spring.jpa.hibernate.ddl-auto=create-drop"
+})
+class VideoRepositoryTest {
+    
+    @Autowired private VideoRepository videoRepository;
+    private final Faker faker = new Faker(Locale.ENGLISH);
+    private String link;
+
+    @Test
+    void testThatRecordsAreInserted() {
+        assertNotNull(videoRepository);
+    
+        for (int i = 0; i < 5; i++) {
+            videoRepository.save( new Video(faker.name().title(), faker.lorem().paragraph(), link) );
+        }
+        
+        assertEquals(5, videoRepository.count());
+    }
+}
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
new file mode 100644
index 0000000..5a2e0cb
--- /dev/null
+++ b/src/test/resources/application.properties
@@ -0,0 +1,12 @@
+server.port=8084
+
+# Datasource properties
+spring.datasource.url=jdbc:mysql://localhost:3306/video_db?useSSL=false
+spring.datasource.username=test
+spring.datasource.password=test123*
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+
+# JPA properties
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.format_sql=true
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect
\ No newline at end of file