diff --git a/jee7/pom.xml b/jee7/pom.xml
index 3d5d7ccdc4..f275f56d58 100644
--- a/jee7/pom.xml
+++ b/jee7/pom.xml
@@ -28,7 +28,6 @@
 
         <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
-        <mockito.version>1.10.19</mockito.version>
     </properties>
 
     <prerequisites>
diff --git a/jee7/src/main/java/com/baeldung/jaxws/EmployeeService.java b/jee7/src/main/java/com/baeldung/jaxws/EmployeeService.java
index 7544369992..9735607da6 100644
--- a/jee7/src/main/java/com/baeldung/jaxws/EmployeeService.java
+++ b/jee7/src/main/java/com/baeldung/jaxws/EmployeeService.java
@@ -1,13 +1,14 @@
 package com.baeldung.jaxws;
 
+import java.util.List;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
 import com.baeldung.jaxws.exception.EmployeeAlreadyExists;
 import com.baeldung.jaxws.exception.EmployeeNotFound;
 import com.baeldung.jaxws.model.Employee;
 
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import java.util.List;
-
 @WebService
 public interface EmployeeService {
 
diff --git a/jee7/src/main/java/com/baeldung/jaxws/EmployeeServiceImpl.java b/jee7/src/main/java/com/baeldung/jaxws/EmployeeServiceImpl.java
index 35b84fe620..c1c9cd4385 100644
--- a/jee7/src/main/java/com/baeldung/jaxws/EmployeeServiceImpl.java
+++ b/jee7/src/main/java/com/baeldung/jaxws/EmployeeServiceImpl.java
@@ -1,15 +1,16 @@
 package com.baeldung.jaxws;
 
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
 import com.baeldung.jaxws.exception.EmployeeAlreadyExists;
 import com.baeldung.jaxws.exception.EmployeeNotFound;
 import com.baeldung.jaxws.model.Employee;
 import com.baeldung.jaxws.repository.EmployeeRepository;
 
-import javax.inject.Inject;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import java.util.List;
-
 @WebService(serviceName = "EmployeeService", endpointInterface = "com.baeldung.jaxws.EmployeeService")
 public class EmployeeServiceImpl implements EmployeeService {
 
diff --git a/jee7/src/main/java/com/baeldung/jaxws/config/EmployeeServicePublisher.java b/jee7/src/main/java/com/baeldung/jaxws/config/EmployeeServicePublisher.java
index 6d7acc88e0..ac3b049320 100644
--- a/jee7/src/main/java/com/baeldung/jaxws/config/EmployeeServicePublisher.java
+++ b/jee7/src/main/java/com/baeldung/jaxws/config/EmployeeServicePublisher.java
@@ -1,9 +1,9 @@
 package com.baeldung.jaxws.config;
 
-import com.baeldung.jaxws.EmployeeServiceImpl;
-
 import javax.xml.ws.Endpoint;
 
+import com.baeldung.jaxws.EmployeeServiceImpl;
+
 public class EmployeeServicePublisher {
 
     public static void main(String[] args) {
diff --git a/jee7/src/main/java/com/baeldung/jaxws/exception/EmployeeAlreadyExists.java b/jee7/src/main/java/com/baeldung/jaxws/exception/EmployeeAlreadyExists.java
index d7c9d0f2cc..4842fbf84c 100644
--- a/jee7/src/main/java/com/baeldung/jaxws/exception/EmployeeAlreadyExists.java
+++ b/jee7/src/main/java/com/baeldung/jaxws/exception/EmployeeAlreadyExists.java
@@ -1,13 +1,16 @@
 package com.baeldung.jaxws.exception;
 
-import javax.xml.ws.WebFault;
 import java.io.Serializable;
 
+import javax.xml.ws.WebFault;
+
 @WebFault
 public class EmployeeAlreadyExists extends Exception implements Serializable {
 
+    private static final long serialVersionUID = 1L;
+
     public EmployeeAlreadyExists() {
-        super("This employee already exist");
+        super("This employee already exists");
     }
 
     public EmployeeAlreadyExists(String str) {
diff --git a/jee7/src/main/java/com/baeldung/jaxws/model/Employee.java b/jee7/src/main/java/com/baeldung/jaxws/model/Employee.java
index 27d02354c0..5b1673c1e4 100644
--- a/jee7/src/main/java/com/baeldung/jaxws/model/Employee.java
+++ b/jee7/src/main/java/com/baeldung/jaxws/model/Employee.java
@@ -3,6 +3,7 @@ package com.baeldung.jaxws.model;
 import java.io.Serializable;
 
 public class Employee implements Serializable {
+    private static final long serialVersionUID = 1L;
     private int id;
     private String firstName;
 
diff --git a/jee7/src/main/java/com/baeldung/jaxws/repository/EmployeeRepository.java b/jee7/src/main/java/com/baeldung/jaxws/repository/EmployeeRepository.java
index 3a8930ac04..0d5dec0462 100644
--- a/jee7/src/main/java/com/baeldung/jaxws/repository/EmployeeRepository.java
+++ b/jee7/src/main/java/com/baeldung/jaxws/repository/EmployeeRepository.java
@@ -1,11 +1,11 @@
 package com.baeldung.jaxws.repository;
 
+import java.util.List;
+
 import com.baeldung.jaxws.exception.EmployeeAlreadyExists;
 import com.baeldung.jaxws.exception.EmployeeNotFound;
 import com.baeldung.jaxws.model.Employee;
 
-import java.util.List;
-
 public interface EmployeeRepository {
 
     List<Employee> getAllEmployees();
diff --git a/jee7/src/main/java/com/baeldung/jaxws/repository/EmployeeRepositoryImpl.java b/jee7/src/main/java/com/baeldung/jaxws/repository/EmployeeRepositoryImpl.java
index 0e728ae253..f67509fff5 100644
--- a/jee7/src/main/java/com/baeldung/jaxws/repository/EmployeeRepositoryImpl.java
+++ b/jee7/src/main/java/com/baeldung/jaxws/repository/EmployeeRepositoryImpl.java
@@ -1,12 +1,12 @@
 package com.baeldung.jaxws.repository;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.baeldung.jaxws.exception.EmployeeAlreadyExists;
 import com.baeldung.jaxws.exception.EmployeeNotFound;
 import com.baeldung.jaxws.model.Employee;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class EmployeeRepositoryImpl implements EmployeeRepository {
     private List<Employee> employeeList;
 
diff --git a/jee7/src/test/java/com/baeldung/jaxws/EmployeeServiceLiveTest.java b/jee7/src/test/java/com/baeldung/jaxws/EmployeeServiceLiveTest.java
index 8907179b14..5311b3c5fe 100644
--- a/jee7/src/test/java/com/baeldung/jaxws/EmployeeServiceLiveTest.java
+++ b/jee7/src/test/java/com/baeldung/jaxws/EmployeeServiceLiveTest.java
@@ -1,9 +1,14 @@
 package com.baeldung.jaxws;
 
-import com.baeldung.jaxws.exception.EmployeeAlreadyExists;
-import com.baeldung.jaxws.exception.EmployeeNotFound;
-import com.baeldung.jaxws.model.Employee;
-import com.baeldung.jaxws.repository.EmployeeRepository;
+import static org.junit.Assert.assertEquals;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
@@ -14,13 +19,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
+import com.baeldung.jaxws.exception.EmployeeAlreadyExists;
+import com.baeldung.jaxws.exception.EmployeeNotFound;
+import com.baeldung.jaxws.model.Employee;
+import com.baeldung.jaxws.repository.EmployeeRepository;
 
 @RunWith(Arquillian.class)
 public class EmployeeServiceLiveTest {
@@ -54,54 +56,54 @@ public class EmployeeServiceLiveTest {
     }
 
     @Test
-    public void givenGetAllEmployees_thenCorrectNumberOfEmployeesReturned() {
+    public void givenEmployees_whenGetCount_thenCorrectNumberOfEmployeesReturned() {
         int employeeCount = employeeServiceProxy.countEmployees();
         List<Employee> employeeList = employeeServiceProxy.getAllEmployees();
         assertEquals(employeeList.size(), employeeCount);
     }
 
     @Test
-    public void givenEmployeeId_whenEmployeeExists_thenCorrectEmployeeReturned() throws EmployeeNotFound {
+    public void givenEmployees_whenGetAvailableEmployee_thenCorrectEmployeeReturned() throws EmployeeNotFound {
         Employee employee = employeeServiceProxy.getEmployee(2);
         assertEquals(employee.getFirstName(), "Jack");
     }
 
     @Test(expected = EmployeeNotFound.class)
-    public void givenEmployeeId_whenEmployeeNotExists_thenEmployeeNotFoundExceptionReturned() throws EmployeeNotFound {
+    public void givenEmployees_whenGetNonAvailableEmployee_thenEmployeeNotFoundException() throws EmployeeNotFound {
         employeeServiceProxy.getEmployee(20);
     }
 
     @Test
-    public void givenAddEmployee_whenEmployeeDoesntAlreadyExist_thenEmployeeCountIncreased() throws EmployeeAlreadyExists {
+    public void givenEmployees_whenAddNewEmployee_thenEmployeeCountIncreased() throws EmployeeAlreadyExists {
         int employeeCount = employeeServiceProxy.countEmployees();
         employeeServiceProxy.addEmployee(4, "Anna");
         assertEquals(employeeServiceProxy.countEmployees(), employeeCount + 1);
     }
 
     @Test(expected = EmployeeAlreadyExists.class)
-    public void givenAddEmployee_whenEmployeeAlreadyExist_thenEmployeeAlreadyExistsExceptionReturned() throws EmployeeAlreadyExists {
+    public void givenEmployees_whenAddAlreadyExistingEmployee_thenEmployeeAlreadyExistsException() throws EmployeeAlreadyExists {
         employeeServiceProxy.addEmployee(1, "Anna");
     }
 
     @Test
-    public void givenUpdateEmployee_whenEmployeeExists_thenUpdatedEmployeeReturned() throws EmployeeNotFound {
+    public void givenEmployees_whenUpdateExistingEmployee_thenUpdatedEmployeeReturned() throws EmployeeNotFound {
         Employee updated = employeeServiceProxy.updateEmployee(1, "Joan");
         assertEquals(updated.getFirstName(), "Joan");
     }
 
     @Test(expected = EmployeeNotFound.class)
-    public void givenUpdateEmployee_whenEmployeeNotExists_thenUpdatedEmployeeReturned() throws EmployeeNotFound {
+    public void givenEmployees_whenUpdateNonExistingEmployee_thenEmployeeNotFoundException() throws EmployeeNotFound {
         employeeServiceProxy.updateEmployee(20, "Joan");
     }
 
     @Test
-    public void givenDeleteEmployee_whenEmployeeExists_thenCorrectStatusReturned() throws EmployeeNotFound {
+    public void givenEmployees_whenDeleteExistingEmployee_thenSuccessReturned() throws EmployeeNotFound {
         boolean deleteEmployee = employeeServiceProxy.deleteEmployee(3);
         assertEquals(deleteEmployee, true);
     }
 
     @Test(expected = EmployeeNotFound.class)
-    public void givenDeleteEmployee_whenEmployeeNotExists_thenEmployeeNotFoundExceptionReturned() throws EmployeeNotFound {
+    public void givenEmployee_whenDeleteNonExistingEmployee_thenEmployeeNotFoundException() throws EmployeeNotFound {
         employeeServiceProxy.deleteEmployee(20);
     }