diff --git a/pom.xml b/pom.xml
index ff160fd..2c23e76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,14 +14,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.1.RELEASE</version>
+		<version>2.5.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
+		<java.version>11</java.version>
 	</properties>
 
 	<dependencies>
@@ -33,7 +33,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-validation</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
diff --git a/src/main/java/com/example/postgresdemo/model/Answer.java b/src/main/java/com/example/postgresdemo/model/Answer.java
index d9e3bc7..b5e48d0 100644
--- a/src/main/java/com/example/postgresdemo/model/Answer.java
+++ b/src/main/java/com/example/postgresdemo/model/Answer.java
@@ -21,7 +21,7 @@ public class Answer extends AuditModel {
     @Column(columnDefinition = "text")
     private String text;
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
     @JoinColumn(name = "question_id", nullable = false)
     @OnDelete(action = OnDeleteAction.CASCADE)
     @JsonIgnore
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index ff398ee..35b376a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 ## Spring DATASOURCE (DataSourceAutoConfiguration & DataSourceProperties)
 spring.datasource.url=jdbc:postgresql://localhost:5432/postgres_demo
-spring.datasource.username= rajeevkumarsingh
+spring.datasource.username= postgres
 spring.datasource.password=
 
 # The SQL dialect makes Hibernate generate better SQL for the chosen database
diff --git a/src/test/java/com/example/postgresdemo/PostgresDemoApplicationTests.java b/src/test/java/com/example/postgresdemo/PostgresDemoApplicationTests.java
index 163f493..dea7bde 100644
--- a/src/test/java/com/example/postgresdemo/PostgresDemoApplicationTests.java
+++ b/src/test/java/com/example/postgresdemo/PostgresDemoApplicationTests.java
@@ -1,11 +1,8 @@
 package com.example.postgresdemo;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest
 public class PostgresDemoApplicationTests {