diff --git a/app/pom.xml b/app/pom.xml
index cafdc66..25d0f09 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -16,6 +16,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*Test.class</exclude>
+                    </excludes>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>
diff --git a/app/src/test/java/ch/sbb/polarion/extension/generic/util/PObjectListStub.java b/app/src/test/java/ch/sbb/polarion/extension/generic/util/PObjectListStub.java
index 7a9a524..c8ddf52 100644
--- a/app/src/test/java/ch/sbb/polarion/extension/generic/util/PObjectListStub.java
+++ b/app/src/test/java/ch/sbb/polarion/extension/generic/util/PObjectListStub.java
@@ -1,6 +1,7 @@
 package ch.sbb.polarion.extension.generic.util;
 
 import com.polarion.platform.persistence.IDataService;
+import com.polarion.platform.persistence.model.IPObject;
 import com.polarion.platform.persistence.model.IPObjectList;
 import com.polarion.subterra.base.SubterraURI;
 import org.jetbrains.annotations.NotNull;
@@ -14,13 +15,12 @@
 /**
  * Used in unit tests for stubbing instances of {@link IPObjectList}
  */
-@SuppressWarnings({"rawtypes", "unchecked"})
-public class PObjectListStub extends ArrayList implements IPObjectList {
+public class PObjectListStub<T extends IPObject> extends ArrayList<T> implements IPObjectList<T> {
 
     public PObjectListStub() {
     }
 
-    public PObjectListStub(@NotNull Collection c) {
+    public PObjectListStub(@NotNull Collection<? extends T> c) {
         super(c);
     }
 
@@ -31,17 +31,14 @@ public IDataService getDataService() {
 
     @Override
     public void resolveAll() {
-
     }
 
     @Override
     public void resolveFirst(int i) {
-
     }
 
     @Override
     public void resolve(int i, int i1) {
-
     }
 
     @Override