diff --git a/poc-with-identification-counter/api/pom.xml b/poc-with-identification-counter/api/pom.xml
index 82c98f0..c595681 100644
--- a/poc-with-identification-counter/api/pom.xml
+++ b/poc-with-identification-counter/api/pom.xml
@@ -29,11 +29,17 @@
       <groupId>com.devonfw.java.modules</groupId>
       <artifactId>devon4j-security</artifactId>
     </dependency>
-    <!-- Required for secrutiy REST service -->
+    <!-- Required for security REST service -->
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
+    <!-- Tests -->
+    <dependency>
+      <groupId>com.devonfw.java.modules</groupId>
+      <artifactId>devon4j-test</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/common/api/CompositeEmployeeKey.java b/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/common/api/CompositeEmployeeKey.java
index a135c18..dfa0721 100644
--- a/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/common/api/CompositeEmployeeKey.java
+++ b/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/common/api/CompositeEmployeeKey.java
@@ -2,63 +2,77 @@
 
 import java.io.Serializable;
 
-public class CompositeEmployeeKey implements Serializable{
+public class CompositeEmployeeKey implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-	private String companyId;
-	private String employeeId;
+  private static final long serialVersionUID = 1L;
 
+  private String companyId;
 
-	public CompositeEmployeeKey() {
-	}
+  private String employeeId;
 
-	public CompositeEmployeeKey(String mixed) {
-		super();
-		String[] stringVar = mixed.split(",");
-		this.companyId = stringVar[0];
-		this.employeeId = stringVar[1];
-	}
+  public CompositeEmployeeKey() {
 
-	public CompositeEmployeeKey(String companyId, String employeeId) {
-		super();
-		this.companyId = companyId;
-		this.employeeId = employeeId;
-	}
+  }
 
-	public String getCompanyId() {
-		return companyId;
-	}
+  public CompositeEmployeeKey(String mixed) {
 
-	public void setCompanyId(String companyId) {
-		this.companyId = companyId;
-	}
+    super();
+    String[] stringVar = mixed.split(",");
+    this.companyId = stringVar[0];
+    this.employeeId = stringVar[1];
+  }
 
-	public String getEmployeeId() {
-		return employeeId;
-	}
+  public CompositeEmployeeKey(String companyId, String employeeId) {
 
-	public void setEmployeeId(String employeeId) {
-		this.employeeId = employeeId;
-	}
+    super();
+    this.companyId = companyId;
+    this.employeeId = employeeId;
+  }
 
-    @Override
-    public boolean equals(Object other) {
-        if (this == other) return true;
-        if ( !(other instanceof CompositeEmployeeKey) ) return false;
+  public String getCompanyId() {
 
-        final CompositeEmployeeKey compositeEmployeeKey = (CompositeEmployeeKey) other;
+    return this.companyId;
+  }
 
-        if ( !compositeEmployeeKey.getCompanyId().equals( getCompanyId() ) ) return false;
-        if ( !compositeEmployeeKey.getEmployeeId().equals( getEmployeeId() ) ) return false;
+  public void setCompanyId(String companyId) {
 
-        return true;
-    }
+    this.companyId = companyId;
+  }
 
-    @Override
-    public int hashCode() {
-         int result;
-         result = getCompanyId().hashCode();
-         result = 29 * result + getEmployeeId().hashCode();
-         return result;
-    }
+  public String getEmployeeId() {
+
+    return this.employeeId;
+  }
+
+  public void setEmployeeId(String employeeId) {
+
+    this.employeeId = employeeId;
+  }
+
+  @Override
+  public boolean equals(Object other) {
+
+    if (this == other)
+      return true;
+    if (!(other instanceof CompositeEmployeeKey))
+      return false;
+
+    final CompositeEmployeeKey compositeEmployeeKey = (CompositeEmployeeKey) other;
+
+    if (!compositeEmployeeKey.getCompanyId().equals(getCompanyId()))
+      return false;
+    if (!compositeEmployeeKey.getEmployeeId().equals(getEmployeeId()))
+      return false;
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+
+    int result;
+    result = getCompanyId().hashCode();
+    result = 29 * result + getEmployeeId().hashCode();
+    return result;
+  }
 }
diff --git a/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/logic/api/to/EmployeeEto.java b/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/logic/api/to/EmployeeEto.java
index 8076fed..81c9d1a 100644
--- a/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/logic/api/to/EmployeeEto.java
+++ b/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/logic/api/to/EmployeeEto.java
@@ -9,88 +9,83 @@
  */
 public class EmployeeEto extends AbstractComposedKeyEto<CompositeEmployeeKey> implements Employee {
 
-	private static final long serialVersionUID = 1L;
-
-	private CompositeEmployeeKey id;
-
-	private String name;
-
-	private String lastName;
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	@Override
-	public String getLastName() {
-		return lastName;
-	}
-
-	@Override
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-
-	public CompositeEmployeeKey getId() {
-		return id;
-	}
-
-	public void setId(CompositeEmployeeKey id) {
-		this.id = id;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = super.hashCode();
-		result = prime * result + ((this.id == null) ? 0 : this.id.hashCode());
-		result = prime * result + ((this.name == null) ? 0 : this.name.hashCode());
-		result = prime * result + ((this.lastName == null) ? 0 : this.lastName.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		// class check will be done by super type EntityTo!
-		if (!super.equals(obj)) {
-			return false;
-		}
-		EmployeeEto other = (EmployeeEto) obj;
-		if (this.id == null) {
-			if (other.id != null) {
-				return false;
-			}
-		} else if (!this.id.equals(other.id)) {
-			return false;
-		}
-		if (this.name == null) {
-			if (other.name != null) {
-				return false;
-			}
-		} else if (!this.name.equals(other.name)) {
-			return false;
-		}
-		if (this.lastName == null) {
-			if (other.lastName != null) {
-				return false;
-			}
-		} else if (!this.lastName.equals(other.lastName)) {
-			return false;
-		}
-		return true;
-	}
+  private static final long serialVersionUID = 1L;
+
+  private String name;
+
+  private String lastName;
+
+  @Override
+  public String getName() {
+
+    return this.name;
+  }
+
+  @Override
+  public void setName(String name) {
+
+    this.name = name;
+  }
+
+  @Override
+  public String getLastName() {
+
+    return this.lastName;
+  }
+
+  @Override
+  public void setLastName(String lastName) {
+
+    this.lastName = lastName;
+  }
+
+  @Override
+  public int hashCode() {
+
+    final int prime = 31;
+    int result = super.hashCode();
+    result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+    result = prime * result + ((this.name == null) ? 0 : this.name.hashCode());
+    result = prime * result + ((this.lastName == null) ? 0 : this.lastName.hashCode());
+    return result;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null) {
+      return false;
+    }
+    // class check will be done by super type EntityTo!
+    if (!super.equals(obj)) {
+      return false;
+    }
+    EmployeeEto other = (EmployeeEto) obj;
+    if (getId() == null) {
+      if (other.getId() != null) {
+        return false;
+      }
+    } else if (!getId().equals(other.getId())) {
+      return false;
+    }
+    if (this.name == null) {
+      if (other.name != null) {
+        return false;
+      }
+    } else if (!this.name.equals(other.name)) {
+      return false;
+    }
+    if (this.lastName == null) {
+      if (other.lastName != null) {
+        return false;
+      }
+    } else if (!this.lastName.equals(other.lastName)) {
+      return false;
+    }
+    return true;
+  }
 
 }
diff --git a/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/logic/api/to/EmployeeSearchCriteriaTo.java b/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/logic/api/to/EmployeeSearchCriteriaTo.java
index 36eff82..477bc6b 100644
--- a/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/logic/api/to/EmployeeSearchCriteriaTo.java
+++ b/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/logic/api/to/EmployeeSearchCriteriaTo.java
@@ -1,6 +1,5 @@
 package com.devonfw.application.pocwithidentificationcounter.employeemanagement.logic.api.to;
 
-import com.devonfw.application.pocwithidentificationcounter.employeemanagement.common.api.CompositeEmployeeKey;
 import com.devonfw.application.pocwithidentificationcounter.general.common.api.to.AbstractSearchCriteriaTo;
 import com.devonfw.module.basic.common.api.query.StringSearchConfigTo;
 
@@ -10,92 +9,78 @@
  */
 public class EmployeeSearchCriteriaTo extends AbstractSearchCriteriaTo {
 
-	private static final long serialVersionUID = 1L;
-
-	private String name;
-
-	private String lastName;
-
-	private StringSearchConfigTo nameOption;
-
-	private StringSearchConfigTo lastNameOption;
-
-	private CompositeEmployeeKey id;
-
-	/**
-	 * @return nameId
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @param name setter for name attribute
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * @return lastNameId
-	 */
-	public String getLastName() {
-		return lastName;
-	}
-
-	/**
-	 * @param lastName setter for lastName attribute
-	 */
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-
-	/**
-	 * @return the {@link StringSearchConfigTo} used to search for {@link #getName()
-	 *         name}.
-	 */
-	public StringSearchConfigTo getNameOption() {
-
-		return this.nameOption;
-	}
-
-	/**
-	 * @param nameOption new value of {@link #getNameOption()}.
-	 */
-	public void setNameOption(StringSearchConfigTo nameOption) {
-
-		this.nameOption = nameOption;
-	}
-
-	/**
-	 * @return the {@link StringSearchConfigTo} used to search for
-	 *         {@link #getLastName() lastName}.
-	 */
-	public StringSearchConfigTo getLastNameOption() {
-
-		return this.lastNameOption;
-	}
-
-	/**
-	 * @param lastNameOption new value of {@link #getLastNameOption()}.
-	 */
-	public void setLastNameOption(StringSearchConfigTo lastNameOption) {
-
-		this.lastNameOption = lastNameOption;
-	}
-
-	/**
-	 * @return idId
-	 */
-	public CompositeEmployeeKey getId() {
-		return id;
-	}
-
-	/**
-	 * @param id setter for id attribute
-	 */
-	public void setId(CompositeEmployeeKey id) {
-		this.id = id;
-	}
+  private static final long serialVersionUID = 1L;
+
+  private String name;
+
+  private String lastName;
+
+  private StringSearchConfigTo nameOption;
+
+  private StringSearchConfigTo lastNameOption;
+
+  /**
+   * @return nameId
+   */
+  public String getName() {
+
+    return this.name;
+  }
+
+  /**
+   * @param name setter for name attribute
+   */
+  public void setName(String name) {
+
+    this.name = name;
+  }
+
+  /**
+   * @return lastNameId
+   */
+  public String getLastName() {
+
+    return this.lastName;
+  }
+
+  /**
+   * @param lastName setter for lastName attribute
+   */
+  public void setLastName(String lastName) {
+
+    this.lastName = lastName;
+  }
+
+  /**
+   * @return the {@link StringSearchConfigTo} used to search for {@link #getName() name}.
+   */
+  public StringSearchConfigTo getNameOption() {
+
+    return this.nameOption;
+  }
+
+  /**
+   * @param nameOption new value of {@link #getNameOption()}.
+   */
+  public void setNameOption(StringSearchConfigTo nameOption) {
+
+    this.nameOption = nameOption;
+  }
+
+  /**
+   * @return the {@link StringSearchConfigTo} used to search for {@link #getLastName() lastName}.
+   */
+  public StringSearchConfigTo getLastNameOption() {
+
+    return this.lastNameOption;
+  }
+
+  /**
+   * @param lastNameOption new value of {@link #getLastNameOption()}.
+   */
+  public void setLastNameOption(StringSearchConfigTo lastNameOption) {
+
+    this.lastNameOption = lastNameOption;
+  }
 
 }
diff --git a/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/service/api/rest/EmployeemanagementRestService.java b/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/service/api/rest/EmployeemanagementRestService.java
index 0e24b20..91c6fb5 100644
--- a/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/service/api/rest/EmployeemanagementRestService.java
+++ b/poc-with-identification-counter/api/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/service/api/rest/EmployeemanagementRestService.java
@@ -8,7 +8,9 @@
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
+
 import org.springframework.data.domain.Page;
+
 import com.devonfw.application.pocwithidentificationcounter.employeemanagement.common.api.CompositeEmployeeKey;
 import com.devonfw.application.pocwithidentificationcounter.employeemanagement.logic.api.Employeemanagement;
 import com.devonfw.application.pocwithidentificationcounter.employeemanagement.logic.api.to.EmployeeCto;
@@ -16,76 +18,73 @@
 import com.devonfw.application.pocwithidentificationcounter.employeemanagement.logic.api.to.EmployeeSearchCriteriaTo;
 
 /**
- * The service interface for REST calls in order to execute the logic of
- * component {@link Employeemanagement}.
+ * The service interface for REST calls in order to execute the logic of component {@link Employeemanagement}.
  */
 @Path("/employeemanagement/v1")
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)
 public interface EmployeemanagementRestService {
 
-	/**
-	 * Delegates to {@link Employeemanagement#findEmployee}.
-	 *
-	 * @param id the ID of the {@link EmployeeEto}
-	 * @return the {@link EmployeeEto}
-	 */
-	@GET
-	@Path("/employee/{id}/")
-	public EmployeeEto getEmployee(@PathParam("id") CompositeEmployeeKey id);
+  /**
+   * Delegates to {@link Employeemanagement#findEmployee}.
+   *
+   * @param id the ID of the {@link EmployeeEto}
+   * @return the {@link EmployeeEto}
+   */
+  @GET
+  @Path("/employee/{id}/")
+  public EmployeeEto getEmployee(@PathParam("id") CompositeEmployeeKey id);
 
-	/**
-	 * Delegates to {@link Employeemanagement#saveEmployee}.
-	 *
-	 * @param employee the {@link EmployeeEto} to be saved
-	 * @return the recently created {@link EmployeeEto}
-	 */
-	@POST
-	@Path("/employee/")
-	public EmployeeEto saveEmployee(EmployeeEto employee);
+  /**
+   * Delegates to {@link Employeemanagement#saveEmployee}.
+   *
+   * @param employee the {@link EmployeeEto} to be saved
+   * @return the recently created {@link EmployeeEto}
+   */
+  @POST
+  @Path("/employee/")
+  public EmployeeEto saveEmployee(EmployeeEto employee);
 
-	/**
-	 * Delegates to {@link Employeemanagement#deleteEmployee}.
-	 *
-	 * @param id ID of the {@link EmployeeEto} to be deleted
-	 */
-	@DELETE
-	@Path("/employee/{id}/")
-	public void deleteEmployee(@PathParam("id") CompositeEmployeeKey id);
+  /**
+   * Delegates to {@link Employeemanagement#deleteEmployee}.
+   *
+   * @param id ID of the {@link EmployeeEto} to be deleted
+   */
+  @DELETE
+  @Path("/employee/{id}/")
+  public void deleteEmployee(@PathParam("id") CompositeEmployeeKey id);
 
-	/**
-	 * Delegates to {@link Employeemanagement#findEmployeeEtos}.
-	 *
-	 * @param searchCriteriaTo the pagination and search criteria to be used for
-	 *                         finding employees.
-	 * @return the {@link Page list} of matching {@link EmployeeEto}s.
-	 */
-	@Path("/employee/search")
-	@POST
-	public Page<EmployeeEto> findEmployees(EmployeeSearchCriteriaTo searchCriteriaTo);
+  /**
+   * Delegates to {@link Employeemanagement#findEmployeeEtos}.
+   *
+   * @param searchCriteriaTo the pagination and search criteria to be used for finding employees.
+   * @return the {@link Page list} of matching {@link EmployeeEto}s.
+   */
+  @Path("/employee/search")
+  @POST
+  public Page<EmployeeEto> findEmployees(EmployeeSearchCriteriaTo searchCriteriaTo);
 
-	/**
-	 * Delegates to {@link Employeemanagement#findEmployeeCto}.
-	 *
-	 * @param id the ID of the {@link EmployeeCto}
-	 * @return the {@link EmployeeCto}
-	 */
-	@GET
-	@Path("/employee/cto/{id}/")
-	public EmployeeCto getEmployeeCto(@PathParam("id") CompositeEmployeeKey id);
+  /**
+   * Delegates to {@link Employeemanagement#findEmployeeCto}.
+   *
+   * @param id the ID of the {@link EmployeeCto}
+   * @return the {@link EmployeeCto}
+   */
+  @GET
+  @Path("/employee/cto/{id}/")
+  public EmployeeCto getEmployeeCto(@PathParam("id") CompositeEmployeeKey id);
 
-	/**
-	 * Delegates to {@link Employeemanagement#findEmployeeCtos}.
-	 *
-	 * @param searchCriteriaTo the pagination and search criteria to be used for
-	 *                         finding employees.
-	 * @return the {@link Page list} of matching {@link EmployeeCto}s.
-	 */
-	@Path("/employee/cto/search")
-	@POST
-	public Page<EmployeeCto> findEmployeeCtos(EmployeeSearchCriteriaTo searchCriteriaTo);
+  /**
+   * Delegates to {@link Employeemanagement#findEmployeeCtos}.
+   *
+   * @param searchCriteriaTo the pagination and search criteria to be used for finding employees.
+   * @return the {@link Page list} of matching {@link EmployeeCto}s.
+   */
+  @Path("/employee/cto/search")
+  @POST
+  public Page<EmployeeCto> findEmployeeCtos(EmployeeSearchCriteriaTo searchCriteriaTo);
 
-	@Path("/employee/cto")
-	@POST
-	public EmployeeCto saveEmployeePhone(EmployeeCto employee);
+  @Path("/employee/cto")
+  @POST
+  public EmployeeCto saveEmployeePhone(EmployeeCto employee);
 }
diff --git a/poc-with-identification-counter/core/pom.xml b/poc-with-identification-counter/core/pom.xml
index f4ae259..d946537 100644
--- a/poc-with-identification-counter/core/pom.xml
+++ b/poc-with-identification-counter/core/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -10,7 +10,7 @@
   <artifactId>poc-with-identification-counter-core</artifactId>
   <packaging>jar</packaging>
   <name>${project.artifactId}</name>
-  <description>Core of the server for the poc-with-identification-counter application - a simple example using the Open Application Standard Platform for Java (devon4j).</description>
+  <description>Core of the server for the poc-with-identification-counter application - a simple example based on devon4j.</description>
 
   <dependencies>
     <dependency>
@@ -72,10 +72,10 @@
       <artifactId>spring-boot-starter-jdbc</artifactId>
     </dependency>
 
-    <!-- JPA 2.1 API -->
+    <!-- JPA 2.2 API -->
     <dependency>
-      <groupId>org.hibernate.javax.persistence</groupId>
-      <artifactId>hibernate-jpa-2.1-api</artifactId>
+      <groupId>javax.persistence</groupId>
+      <artifactId>javax.persistence-api</artifactId>
     </dependency>
 
     <!-- Hibernate EntityManager for JPA (implementation) -->
@@ -155,7 +155,7 @@
       <groupId>cglib</groupId>
       <artifactId>cglib</artifactId>
     </dependency>
-    
+
     <!-- Enable JSON logging for easy integration with xPaaS and ELK/Graylog/Splunk/etc. -->
     <dependency>
       <groupId>net.logstash.logback</groupId>
@@ -165,13 +165,7 @@
     <!-- Tests -->
     <dependency>
       <groupId>com.devonfw.java.modules</groupId>
-      <artifactId>devon4j-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
+      <artifactId>devon4j-test-jpa</artifactId>
       <scope>test</scope>
     </dependency>
 
@@ -189,12 +183,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-
-    <dependency>
-      <groupId>org.skyscreamer</groupId>
-      <artifactId>jsonassert</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <profiles>
diff --git a/poc-with-identification-counter/core/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/dataaccess/api/EmployeeEntity.java b/poc-with-identification-counter/core/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/dataaccess/api/EmployeeEntity.java
index fac89cd..37c9d09 100644
--- a/poc-with-identification-counter/core/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/dataaccess/api/EmployeeEntity.java
+++ b/poc-with-identification-counter/core/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/dataaccess/api/EmployeeEntity.java
@@ -2,11 +2,7 @@
 
 import java.util.List;
 
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
 import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.OneToMany;
@@ -19,60 +15,49 @@
 
 @Entity
 @Table(name = "employee")
-public class EmployeeEntity extends ApplicationComposedKeyPersistenceEntity<CompositeEmployeeKey> implements Employee
-		{
+public class EmployeeEntity extends ApplicationComposedKeyPersistenceEntity<CompositeEmployeeKey> implements Employee {
 
-	private CompositeEmployeeKey id;
+  private String name;
 
-	private String name;
+  private String lastName;
 
-	private String lastName;
+  private List<PhoneEntity> phones;
 
-	private List<PhoneEntity> phones;
+  private static final long serialVersionUID = 1L;
 
-	private static final long serialVersionUID = 1L;
+  @Override
+  public String getName() {
 
+    return this.name;
+  }
 
-	@Override
-	@AttributeOverrides({
-           @AttributeOverride(name="employeeId",
-                column=@Column(name="employeeId",length=10)),
-           @AttributeOverride(name="companyId",
-           		column=@Column(name="companyId",length=10)),
-    })
-	@EmbeddedId
-	public CompositeEmployeeKey getId() {
-		return id;
-	}
+  @Override
+  public void setName(String name) {
 
-	@Override
-	public void setId(CompositeEmployeeKey id) {
-		this.id = id;
-	}
+    this.name = name;
+  }
 
-	public String getName() {
-		return name;
-	}
+  @Override
+  public String getLastName() {
 
-	public void setName(String name) {
-		this.name = name;
-	}
+    return this.lastName;
+  }
 
-	public String getLastName() {
-		return lastName;
-	}
+  @Override
+  public void setLastName(String lastName) {
 
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
+    this.lastName = lastName;
+  }
 
-	@OneToMany(fetch = FetchType.EAGER, cascade= CascadeType.ALL,mappedBy="employee")
-	public List<PhoneEntity> getPhones() {
-		return phones;
-	}
+  @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, mappedBy = "employee")
+  public List<PhoneEntity> getPhones() {
 
-	public void setPhones(List<PhoneEntity> phones) {
-		this.phones = phones;
-	}
+    return this.phones;
+  }
+
+  public void setPhones(List<PhoneEntity> phones) {
+
+    this.phones = phones;
+  }
 
 }
diff --git a/poc-with-identification-counter/core/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/service/impl/rest/EmployeemanagementRestServiceImpl.java b/poc-with-identification-counter/core/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/service/impl/rest/EmployeemanagementRestServiceImpl.java
index ac61001..dd7fa9f 100644
--- a/poc-with-identification-counter/core/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/service/impl/rest/EmployeemanagementRestServiceImpl.java
+++ b/poc-with-identification-counter/core/src/main/java/com/devonfw/application/pocwithidentificationcounter/employeemanagement/service/impl/rest/EmployeemanagementRestServiceImpl.java
@@ -13,48 +13,54 @@
 import com.devonfw.application.pocwithidentificationcounter.employeemanagement.service.api.rest.EmployeemanagementRestService;
 
 /**
- * The service implementation for REST calls in order to execute the logic of
- * component {@link Employeemanagement}.
+ * The service implementation for REST calls in order to execute the logic of component {@link Employeemanagement}.
  */
 @Named("EmployeemanagementRestService")
 public class EmployeemanagementRestServiceImpl implements EmployeemanagementRestService {
 
-	@Inject
-	private Employeemanagement employeemanagement;
-
-	@Override
-	public EmployeeEto getEmployee(CompositeEmployeeKey id) {
-		return this.employeemanagement.findEmployee(id);
-	}
-
-	@Override
-	public EmployeeEto saveEmployee(EmployeeEto employee) {
-		return this.employeemanagement.saveEmployee(employee);
-	}
-
-	@Override
-	public void deleteEmployee(CompositeEmployeeKey id) {
-		this.employeemanagement.deleteEmployee(id);
-	}
-
-	@Override
-	public Page<EmployeeEto> findEmployees(EmployeeSearchCriteriaTo searchCriteriaTo) {
-		return this.employeemanagement.findEmployees(searchCriteriaTo);
-	}
-
-	@Override
-	public EmployeeCto getEmployeeCto(CompositeEmployeeKey id) {
-		return this.employeemanagement.findEmployeeCto(id);
-	}
-
-	@Override
-	public Page<EmployeeCto> findEmployeeCtos(EmployeeSearchCriteriaTo searchCriteriaTo) {
-		return this.employeemanagement.findEmployeeCtos(searchCriteriaTo);
-	}
-
-	@Override
-	public EmployeeCto saveEmployeePhone(EmployeeCto employee) {
-		return this.employeemanagement.saveEmployeePhone(employee);
-	}
+  @Inject
+  private Employeemanagement employeemanagement;
+
+  @Override
+  public EmployeeEto getEmployee(CompositeEmployeeKey id) {
+
+    return this.employeemanagement.findEmployee(id);
+  }
+
+  @Override
+  public EmployeeEto saveEmployee(EmployeeEto employee) {
+
+    return this.employeemanagement.saveEmployee(employee);
+  }
+
+  @Override
+  public void deleteEmployee(CompositeEmployeeKey id) {
+
+    this.employeemanagement.deleteEmployee(id);
+  }
+
+  @Override
+  public Page<EmployeeEto> findEmployees(EmployeeSearchCriteriaTo searchCriteriaTo) {
+
+    return this.employeemanagement.findEmployees(searchCriteriaTo);
+  }
+
+  @Override
+  public EmployeeCto getEmployeeCto(CompositeEmployeeKey id) {
+
+    return this.employeemanagement.findEmployeeCto(id);
+  }
+
+  @Override
+  public Page<EmployeeCto> findEmployeeCtos(EmployeeSearchCriteriaTo searchCriteriaTo) {
+
+    return this.employeemanagement.findEmployeeCtos(searchCriteriaTo);
+  }
+
+  @Override
+  public EmployeeCto saveEmployeePhone(EmployeeCto employee) {
+
+    return this.employeemanagement.saveEmployeePhone(employee);
+  }
 
 }
diff --git a/poc-with-identification-counter/core/src/main/java/com/devonfw/application/pocwithidentificationcounter/general/common/impl/config/BeansDozerConfig.java b/poc-with-identification-counter/core/src/main/java/com/devonfw/application/pocwithidentificationcounter/general/common/impl/config/BeansDozerConfig.java
index 05c176a..065486f 100644
--- a/poc-with-identification-counter/core/src/main/java/com/devonfw/application/pocwithidentificationcounter/general/common/impl/config/BeansDozerConfig.java
+++ b/poc-with-identification-counter/core/src/main/java/com/devonfw/application/pocwithidentificationcounter/general/common/impl/config/BeansDozerConfig.java
@@ -3,12 +3,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.dozer.DozerBeanMapper;
-import org.dozer.Mapper;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
+import com.github.dozermapper.core.DozerBeanMapper;
+import com.github.dozermapper.core.DozerBeanMapperBuilder;
+import com.github.dozermapper.core.Mapper;
+
 /**
  * Java bean configuration for Dozer
  */
@@ -21,12 +23,14 @@ public class BeansDozerConfig {
   /**
    * @return the {@link DozerBeanMapper}.
    */
+
   @Bean
   public Mapper getDozer() {
 
     List<String> beanMappings = new ArrayList<>();
     beanMappings.add(DOZER_MAPPING_XML);
-    return new DozerBeanMapper(beanMappings);
+    Mapper mapper = DozerBeanMapperBuilder.create().withMappingFiles(beanMappings).build();
+    return mapper;
 
   }
 }
diff --git a/poc-with-identification-counter/core/src/main/resources/config/app/common/dozer-mapping.xml b/poc-with-identification-counter/core/src/main/resources/config/app/common/dozer-mapping.xml
index a97c78c..8e920b0 100644
--- a/poc-with-identification-counter/core/src/main/resources/config/app/common/dozer-mapping.xml
+++ b/poc-with-identification-counter/core/src/main/resources/config/app/common/dozer-mapping.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--<!DOCTYPE mappings PUBLIC "-//DOZER//DTD MAPPINGS//EN" "http://dozer.sourceforge.net/dtd/dozerbeanmapping.dtd"> -->
+<!--<!DOCTYPE mappings PUBLIC "-//DOZER//DTD MAPPINGS//EN" "https://github.com/DozerMapper/DozerMapper.github.io/blob/master/dtd/bean-mapping.dtd"> -->
 <!-- <mappings> -->
-<mappings xmlns="http://dozer.sourceforge.net" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://dozer.sourceforge.net
-          http://dozer.sourceforge.net/schema/beanmapping.xsd">
+<mappings xmlns="http://dozermapper.github.io/schema/bean-mapping"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://dozermapper.github.io/schema/bean-mapping http://dozermapper.github.io/schema/bean-mapping.xsd">
   <configuration>
     <stop-on-errors>true</stop-on-errors>
 
@@ -12,6 +12,22 @@
       <copy-by-reference>java.lang.Long</copy-by-reference>
       <copy-by-reference>java.lang.Integer</copy-by-reference>
       <copy-by-reference>java.lang.Number</copy-by-reference>
+      <copy-by-reference>java.time.LocalDate</copy-by-reference>
+      <copy-by-reference>java.time.LocalDateTime</copy-by-reference>
+      <copy-by-reference>java.time.LocalTime</copy-by-reference>
+      <copy-by-reference>java.time.ZonedDateTime</copy-by-reference>
+      <copy-by-reference>java.time.Instant</copy-by-reference>
+      <copy-by-reference>java.time.Year</copy-by-reference>
+      <copy-by-reference>java.time.Duration</copy-by-reference>
+      <copy-by-reference>java.time.Clock</copy-by-reference>
+      <copy-by-reference>java.time.MonthDay</copy-by-reference>
+      <copy-by-reference>java.time.OffsetDateTime</copy-by-reference>
+      <copy-by-reference>java.time.OffsetTime</copy-by-reference>
+      <copy-by-reference>java.time.Period</copy-by-reference>
+      <copy-by-reference>java.time.YearMonth</copy-by-reference>
+      <copy-by-reference>java.time.Month</copy-by-reference>
+      <copy-by-reference>java.util.regex.Pattern</copy-by-reference>
+      <copy-by-reference>com.devonfw.module.basic.common.api.reference.IdRef</copy-by-reference>
       <!--
       <copy-by-reference>javax.money.MonetaryAmount</copy-by-reference>
       <copy-by-reference>org.javamoney.moneta.Money</copy-by-reference>
@@ -26,20 +42,12 @@
        has been committed what is after this conversion so the wrong modificationCounter is converted.
        The hidden and transient reference allows to update the modificationCounter to the correct value on
        serialization. -->
-    <mapping type="one-way">
-	    <class-a>com.devonfw.application.pocwithidentificationcounter.general.dataaccess.api.ApplicationPersistenceEntity</class-a>
-	    <class-b>com.devonfw.module.basic.common.api.to.AbstractEto</class-b>
-	    <field custom-converter="com.devonfw.module.beanmapping.common.impl.dozer.IdentityConverter">
-	      <a>this</a>
-	      <b is-accessible="true">persistentEntity</b>
-	    </field>
- 	</mapping>
-    <mapping type="one-way">
-	    <class-a>com.devonfw.application.pocwithidentificationcounter.general.dataaccess.api.ApplicationComposedKeyPersistenceEntity</class-a>
-	    <class-b>com.devonfw.application.pocwithidentificationcounter.general.common.api.to.AbstractComposedKeyEto</class-b>
-	    <field custom-converter="com.devonfw.module.beanmapping.common.impl.dozer.IdentityConverter">
-	      <a>this</a>
-	      <b is-accessible="true">persistentEntity</b>
-	    </field>
- 	</mapping>
+  <mapping type="one-way">
+    <class-a>com.devonfw.application.pocwithidentificationcounter.general.dataaccess.api.ApplicationPersistenceEntity</class-a>
+    <class-b>com.devonfw.module.basic.common.api.to.AbstractEto</class-b>
+    <field custom-converter="com.devonfw.module.beanmapping.common.impl.dozer.IdentityConverter">
+      <a>this</a>
+      <b is-accessible="true">persistentEntity</b>
+    </field>
+  </mapping>
 </mappings>
diff --git a/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/common/base/Devon4jPackageCheckTest.java b/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/common/base/Devon4jPackageCheckTest.java
index 7d89a94..f4f74a2 100644
--- a/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/common/base/Devon4jPackageCheckTest.java
+++ b/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/common/base/Devon4jPackageCheckTest.java
@@ -7,7 +7,7 @@
 import net.sf.mmm.util.reflect.base.ReflectionUtilImpl;
 
 import org.assertj.core.api.SoftAssertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.devonfw.module.basic.common.api.reflect.Devon4jPackage;
 import com.devonfw.module.test.common.base.ModuleTest;
diff --git a/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/common/base/PermissionCheckTest.java b/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/common/base/PermissionCheckTest.java
index 8a51ce0..f274f01 100644
--- a/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/common/base/PermissionCheckTest.java
+++ b/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/common/base/PermissionCheckTest.java
@@ -1,7 +1,5 @@
 package com.devonfw.application.pocwithidentificationcounter.general.common.base;
 
-import com.devonfw.module.test.common.base.ModuleTest;
-
 import java.lang.reflect.Method;
 import java.util.Set;
 
@@ -14,7 +12,9 @@
 import net.sf.mmm.util.reflect.base.ReflectionUtilImpl;
 
 import org.assertj.core.api.SoftAssertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import com.devonfw.module.test.common.base.ModuleTest;
 
 /**
  * Tests the permission check in logic layer.
diff --git a/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/common/base/test/AccessControlSchemaXmlValidationTest.java b/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/common/base/test/AccessControlSchemaXmlValidationTest.java
index b5934b6..3f3ee09 100644
--- a/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/common/base/test/AccessControlSchemaXmlValidationTest.java
+++ b/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/common/base/test/AccessControlSchemaXmlValidationTest.java
@@ -1,7 +1,5 @@
 package com.devonfw.application.pocwithidentificationcounter.general.common.base.test;
 
-import com.devonfw.module.test.common.base.ModuleTest;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -15,10 +13,12 @@
 import javax.xml.validation.SchemaFactory;
 import javax.xml.validation.Validator;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
+import com.devonfw.module.test.common.base.ModuleTest;
+
 /**
  * Class for XML Validation Tests.
  *
diff --git a/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/service/impl/rest/SecurityRestServiceImplTest.java b/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/service/impl/rest/SecurityRestServiceImplTest.java
index 86e2907..7bda88c 100644
--- a/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/service/impl/rest/SecurityRestServiceImplTest.java
+++ b/poc-with-identification-counter/core/src/test/java/com/devonfw/application/pocwithidentificationcounter/general/service/impl/rest/SecurityRestServiceImplTest.java
@@ -1,7 +1,7 @@
 package com.devonfw.application.pocwithidentificationcounter.general.service.impl.rest;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpEntity;
@@ -10,19 +10,18 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.web.csrf.CsrfToken;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.web.client.RestTemplate;
 
-import com.devonfw.module.service.common.api.client.config.ServiceClientConfigBuilder;
-
 import com.devonfw.application.pocwithidentificationcounter.general.common.api.to.UserProfileTo;
 import com.devonfw.application.pocwithidentificationcounter.general.service.api.rest.SecurityRestService;
 import com.devonfw.application.pocwithidentificationcounter.general.service.base.test.RestServiceTest;
+import com.devonfw.module.service.common.api.client.config.ServiceClientConfigBuilder;
 
 /**
  * This class tests the login functionality of {@link SecurityRestServiceImpl}.
  */
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 public class SecurityRestServiceImplTest extends RestServiceTest {
 
   /** Logger instance. */
@@ -66,6 +65,7 @@ public void testGetCsrfToken() {
    */
   @Test
   public void testGetCurrentUser() {
+
     String login = "waiter";
     String password = "waiter";
     SecurityRestService securityService = getServiceClientFactory().create(SecurityRestService.class,
@@ -89,7 +89,8 @@ private ResponseEntity<String> login(String userName, String tmpPassword) {
     HttpEntity<String> postRequest = new HttpEntity<>(
         "{\"j_username\": \"" + userName + "\", \"j_password\": \"" + tmpPassword + "\"}", new HttpHeaders());
 
-    ResponseEntity<String> postResponse = new RestTemplate().exchange(tmpUrl, HttpMethod.POST, postRequest, String.class);
+    ResponseEntity<String> postResponse = new RestTemplate().exchange(tmpUrl, HttpMethod.POST, postRequest,
+        String.class);
     return postResponse;
   }
 
diff --git a/poc-with-identification-counter/pom.xml b/poc-with-identification-counter/pom.xml
index 9220902..5d65c2a 100644
--- a/poc-with-identification-counter/pom.xml
+++ b/poc-with-identification-counter/pom.xml
@@ -7,25 +7,50 @@
   <version>v1</version>
   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
-  <description>Application based on the Open Application Standard Platform for Java (devon4j).</description>
+  <description>Application based on the devon4j.</description>
 
   <properties>
-    <spring.boot.version>2.0.4.RELEASE</spring.boot.version>
-    <devon4j.version>3.0.0</devon4j.version>
+    <spring.boot.version>2.1.9.RELEASE</spring.boot.version>
+    <devon4j.version>3.2.1</devon4j.version>
     <java.version>1.8</java.version>
+    <junit.version>5.5.2</junit.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <devonfw.test.excluded.groups>com.devonfw.module.test.common.api.category.CategorySystemTest</devonfw.test.excluded.groups>
+    <jackson.version>2.9.9.20190727</jackson.version> <!-- Overriding Jackson for fixing vulnerabilities -->
+    <guava.version>28.1-jre</guava.version>
+    <devonfw.test.excluded.groups>system</devonfw.test.excluded.groups>
   </properties>
 
   <modules>
     <module>api</module>
     <module>core</module>
-            <module>server</module>
+    <module>server</module>
   </modules>
 
   <dependencyManagement>
     <dependencies>
+      <!-- overriding jackson version from spring-boot by importing BOM before -->
+      <dependency>
+        <groupId>com.fasterxml.jackson</groupId>
+        <artifactId>jackson-bom</artifactId>
+        <version>${jackson.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <!-- overriding junit version from spring-boot by importing BOM before -->
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>${junit.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>      
+      <!-- Library with general utilities -->
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}</version>
+      </dependency>
       <!-- BOM of spring-boot -->
       <dependency>
         <groupId>org.springframework.boot</groupId>
@@ -38,8 +63,7 @@
       <dependency>
         <groupId>com.devonfw.java.boms</groupId>
         <artifactId>devon4j-bom</artifactId>
-        <version>${devon4j.version}
-        </version>
+        <version>${devon4j.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -47,11 +71,6 @@
   </dependencyManagement>
 
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -188,7 +207,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.20.1</version>
+          <version>3.0.0-M3</version>
           <configuration>
             <!-- Surefire changed the default to the project.build.directory causing trouble with file paths to test resources -->
             <workingDirectory>${basedir}</workingDirectory>
@@ -220,7 +239,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-help-plugin</artifactId>
-          <version>2.2</version>
+          <version>3.2.0</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -255,12 +274,12 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.0</version>
+          <version>0.8.3</version>
         </plugin>
         <plugin>
           <groupId>org.owasp</groupId>
           <artifactId>dependency-check-maven</artifactId>
-          <version>3.1.1</version>
+          <version>5.1.0</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -281,7 +300,7 @@
         <plugin>
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-maven-plugin</artifactId>
-          <version>2.0.4.RELEASE</version>
+          <version>${spring.boot.version}</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -291,25 +310,25 @@
     <profile>
       <id>moduletest</id>
       <properties>
-        <devonfw.test.excluded.groups>com.devonfw.module.test.common.api.category.CategoryComponentTest,com.devonfw.module.test.common.api.category.CategorySubsystemTest,com.devonfw.module.test.common.api.category.CategorySystemTest</devonfw.test.excluded.groups>
+      <devonfw.test.excluded.groups>component,subsystem,system</devonfw.test.excluded.groups>
       </properties>
     </profile>
     <profile>
       <id>componenttest</id>
       <properties>
-        <devonfw.test.excluded.groups>com.devonfw.module.test.common.api.category.CategorySubsystemTest,com.devonfw.module.test.common.api.category.CategorySystemTest</devonfw.test.excluded.groups>
+        <devonfw.test.excluded.groups>subsystem,system</devonfw.test.excluded.groups>
       </properties>
     </profile>
     <profile>
       <id>subsystemtest</id>
-      <properties>
-        <devonfw.test.excluded.groups>com.devonfw.module.test.common.api.category.CategorySystemTest</devonfw.test.excluded.groups>
+       <properties>
+        <devonfw.test.excluded.groups>system</devonfw.test.excluded.groups>
       </properties>
     </profile>
     <profile>
       <id>systemtest</id>
       <properties>
-        <devonfw.test.excluded.groups></devonfw.test.excluded.groups>
+        <devonfw.test.excluded.groups>none</devonfw.test.excluded.groups>
       </properties>
     </profile>
     <profile>
@@ -430,6 +449,9 @@
       <plugin>
         <groupId>org.owasp</groupId>
         <artifactId>dependency-check-maven</artifactId>
+        <configuration>
+          <failOnError>false</failOnError>
+        </configuration>
         <reportSets>
           <reportSet>
             <reports>
diff --git a/poc-with-identification-counter/server/pom.xml b/poc-with-identification-counter/server/pom.xml
index 51f8099..86f7f95 100644
--- a/poc-with-identification-counter/server/pom.xml
+++ b/poc-with-identification-counter/server/pom.xml
@@ -10,11 +10,7 @@
   <artifactId>poc-with-identification-counter-server</artifactId>
   <packaging>war</packaging>
   <name>${project.artifactId}</name>
-  <description>Server for the poc-with-identification-counter application - a simple example using the Open Application Standard Platform for Java (devon4j).</description>
-
-  <properties>
-    <java.version>1.8</java.version>
-  </properties>
+  <description>Server for the poc-with-identification-counter application - a simple example based on devon4j.</description>
 
   <dependencies>
     <dependency>
@@ -22,7 +18,13 @@
       <artifactId>poc-with-identification-counter-core</artifactId>
       <version>${project.version}</version>
     </dependency>
-      </dependencies>
+    <!-- Tests -->
+    <dependency>
+      <groupId>com.devonfw.java.modules</groupId>
+      <artifactId>devon4j-test-jpa</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
   <profiles>
     <profile>
@@ -124,7 +126,7 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
         <configuration>
-          <mainClass>com.devonfw.application.pocwithidentificationcounter.SpringBootApp</mainClass>
+          <mainClass>com.devonfw.application.pocwithidentification.SpringBootApp</mainClass>
           <classifier>bootified</classifier>
           <finalName>${project.artifactId}</finalName>
         </configuration>