diff --git a/spring-boot/src/main/java/com/baeldung/displayallbeans/controller/FooController.java b/spring-boot/src/main/java/com/baeldung/displayallbeans/controller/FooController.java
index c4a83cc2d9..630820ff9f 100644
--- a/spring-boot/src/main/java/com/baeldung/displayallbeans/controller/FooController.java
+++ b/spring-boot/src/main/java/com/baeldung/displayallbeans/controller/FooController.java
@@ -3,6 +3,7 @@ package com.baeldung.displayallbeans.controller;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 
@@ -14,9 +15,9 @@ public class FooController {
     private FooService fooService;
 
     @GetMapping(value = "/displayallbeans")
-    public String getHeaderAndBody(Map<String, Object> model) {
+    public ResponseEntity<String> getHeaderAndBody(Map<String, Object> model) {
         model.put("header", fooService.getHeader());
         model.put("message", fooService.getBody());
-        return "displayallbeans";
+        return ResponseEntity.ok("displayallbeans");
     }
 }
diff --git a/spring-boot/src/main/java/org/baeldung/boot/config/WebConfig.java b/spring-boot/src/main/java/org/baeldung/boot/config/WebConfig.java
new file mode 100644
index 0000000000..69abeb0bdd
--- /dev/null
+++ b/spring-boot/src/main/java/org/baeldung/boot/config/WebConfig.java
@@ -0,0 +1,15 @@
+package org.baeldung.boot.config;
+
+import org.baeldung.boot.converter.StringToEmployeeConverter;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfig implements WebMvcConfigurer {
+	 
+    @Override
+    public void addFormatters(FormatterRegistry registry) {
+        registry.addConverter(new StringToEmployeeConverter());
+    }
+}
diff --git a/spring-boot/src/main/java/org/baeldung/boot/converter/StringToEmployeeConverter.java b/spring-boot/src/main/java/org/baeldung/boot/converter/StringToEmployeeConverter.java
new file mode 100644
index 0000000000..6902cd84d1
--- /dev/null
+++ b/spring-boot/src/main/java/org/baeldung/boot/converter/StringToEmployeeConverter.java
@@ -0,0 +1,16 @@
+package org.baeldung.boot.converter;
+
+import org.springframework.core.convert.converter.Converter;
+
+import com.baeldung.toggle.Employee;
+
+public class StringToEmployeeConverter implements Converter<String, Employee> {
+
+  @Override
+  public Employee convert(String from) {
+      String[] data = from.split(",");
+      return new Employee(
+        Long.parseLong(data[0]), 
+        Double.parseDouble(data[1]));
+  }
+}
diff --git a/spring-boot/src/main/java/org/baeldung/boot/converter/controller/StringToEmployeeConverterController.java b/spring-boot/src/main/java/org/baeldung/boot/converter/controller/StringToEmployeeConverterController.java
new file mode 100644
index 0000000000..27bad4c387
--- /dev/null
+++ b/spring-boot/src/main/java/org/baeldung/boot/converter/controller/StringToEmployeeConverterController.java
@@ -0,0 +1,17 @@
+package org.baeldung.boot.converter.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.baeldung.toggle.Employee;
+
+@RestController
+public class StringToEmployeeConverterController {
+ 
+    @GetMapping("/string-to-employee")
+    public ResponseEntity<Object> getStringToEmployee(@RequestParam("employee") Employee employee) {
+        return ResponseEntity.ok(employee);
+    }
+}
diff --git a/spring-boot/src/test/java/org/baeldung/boot/repository/HibernateSessionIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/boot/repository/HibernateSessionIntegrationTest.java
index 4658861162..baa4f70e83 100644
--- a/spring-boot/src/test/java/org/baeldung/boot/repository/HibernateSessionIntegrationTest.java
+++ b/spring-boot/src/test/java/org/baeldung/boot/repository/HibernateSessionIntegrationTest.java
@@ -4,17 +4,15 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
-import org.baeldung.boot.ApplicationIntegrationTest;
+import org.baeldung.boot.DemoApplicationIntegrationTest;
 import org.baeldung.demo.model.Foo;
-import org.baeldung.session.exception.repository.FooRepository;
+import org.baeldung.demo.repository.FooRepository;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
-@TestPropertySource("classpath:exception-hibernate.properties")
-public class HibernateSessionIntegrationTest extends ApplicationIntegrationTest {
+public class HibernateSessionIntegrationTest extends DemoApplicationIntegrationTest {
     @Autowired
     private FooRepository fooRepository;
 
@@ -23,7 +21,7 @@ public class HibernateSessionIntegrationTest extends ApplicationIntegrationTest
         Foo foo = new Foo("Exception Solved");
         fooRepository.save(foo);
         foo = null;
-        foo = fooRepository.get(1);
+        foo = fooRepository.findByName("Exception Solved");
 
         assertThat(foo, notNullValue());
         assertThat(foo.getId(), is(1));
diff --git a/spring-boot/src/test/java/org/baeldung/boot/repository/NoHibernateSessionIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/boot/repository/NoHibernateSessionIntegrationTest.java
index 8de7068949..5c8d10223b 100644
--- a/spring-boot/src/test/java/org/baeldung/boot/repository/NoHibernateSessionIntegrationTest.java
+++ b/spring-boot/src/test/java/org/baeldung/boot/repository/NoHibernateSessionIntegrationTest.java
@@ -6,9 +6,11 @@ import org.baeldung.session.exception.repository.FooRepository;
 import org.hibernate.HibernateException;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
+@TestPropertySource("classpath:exception-hibernate.properties")
 public class NoHibernateSessionIntegrationTest extends ApplicationIntegrationTest {
     @Autowired
     private FooRepository fooRepository;
diff --git a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterIntegrationTest.java
index bd1ae2c8fa..1356de6d0e 100644
--- a/spring-boot/src/test/java/org/baeldung/converter/CustomConverterIntegrationTest.java
+++ b/spring-boot/src/test/java/org/baeldung/converter/CustomConverterIntegrationTest.java
@@ -43,7 +43,7 @@ public class CustomConverterIntegrationTest {
 
     @Test
     public void whenConvertingToBigDecimalUsingGenericConverter_thenSuccess() {
-        assertThat(conversionService.convert(Integer.valueOf(11), BigDecimal.class)).isEqualTo(BigDecimal.valueOf(11.00).setScale(2, BigDecimal.ROUND_HALF_EVEN));
+        assertThat(conversionService.convert(Integer.valueOf(11), BigDecimal.class)).isEqualTo(BigDecimal.valueOf(11.00).setScale(0, BigDecimal.ROUND_HALF_EVEN));
         assertThat(conversionService.convert(Double.valueOf(25.23), BigDecimal.class)).isEqualByComparingTo(BigDecimal.valueOf(Double.valueOf(25.23)));
         assertThat(conversionService.convert("2.32", BigDecimal.class)).isEqualTo(BigDecimal.valueOf(2.32));
     }
diff --git a/spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeServiceImplIntegrationTest.java b/spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeServiceImplIntegrationTest.java
index 4eec62db13..df28111a57 100644
--- a/spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeServiceImplIntegrationTest.java
+++ b/spring-boot/src/test/java/org/baeldung/demo/boottest/EmployeeServiceImplIntegrationTest.java
@@ -1,9 +1,11 @@
 package org.baeldung.demo.boottest;
 
-import org.baeldung.demo.boottest.Employee;
-import org.baeldung.demo.boottest.EmployeeRepository;
-import org.baeldung.demo.boottest.EmployeeService;
-import org.baeldung.demo.boottest.EmployeeServiceImpl;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -15,11 +17,6 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.util.Arrays;
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 @RunWith(SpringRunner.class)
 public class EmployeeServiceImplIntegrationTest {
 
@@ -50,9 +47,9 @@ public class EmployeeServiceImplIntegrationTest {
         Mockito.when(employeeRepository.findByName(john.getName())).thenReturn(john);
         Mockito.when(employeeRepository.findByName(alex.getName())).thenReturn(alex);
         Mockito.when(employeeRepository.findByName("wrong_name")).thenReturn(null);
-        Mockito.when(employeeRepository.findById(john.getId()).orElse(null)).thenReturn(john);
+        Mockito.when(employeeRepository.findById(john.getId())).thenReturn(Optional.of(john));
         Mockito.when(employeeRepository.findAll()).thenReturn(allEmployees);
-        Mockito.when(employeeRepository.findById(-99L).orElse(null)).thenReturn(null);
+        Mockito.when(employeeRepository.findById(-99L)).thenReturn(Optional.empty());
     }
 
     @Test