diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d6c98f81d2b348d7e8238bd651b45b144ab543f..365a2ae03db958f443190f3892a4c6dcfb8f9da7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ test:frontend:
     - npm test
 
 .jdk_8_template: &jdk_8_definition
-  image: maven:3.6.0-jdk-8
+  image: maven:3.8.6-jdk-8
   services:
     - postgres:9.6
   stage: test
@@ -61,11 +61,6 @@ test:frontend:
 .test_backend_commons_template:
   script: &test_backend_commons_definition
 #xvfb is for X11 connection used by some parts of the java code: https://stackoverflow.com/a/47575851/1127920
-    - apt-get update
-    - DEBIAN_FRONTEND=noninteractive apt-get install -y xvfb
-    - Xvfb :99 &
-    - export DISPLAY=:99
-
     - mvn -DskipTests=true clean install -pl commons -am
     - mvn test -pl commons
     - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions,"% covered" }' commons/target/site/jacoco/jacoco.csv
diff --git a/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyAction.java b/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyAction.java
index e9bfd563895f4a700bdbaf8c9a793ab5e51eaf63..afdd178afc762085fcb6cc92a456c5827d725c09 100644
--- a/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyAction.java
+++ b/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/CopyAction.java
@@ -8,7 +8,6 @@ import jp.sbi.celldesigner.plugin.PluginReaction;
 import jp.sbi.celldesigner.plugin.PluginSBase;
 import jp.sbi.celldesigner.plugin.PluginSpecies;
 import jp.sbi.celldesigner.plugin.PluginSpeciesAlias;
-import lcsb.mapviewer.common.SystemClipboard;
 import lcsb.mapviewer.common.exception.InvalidXmlSchemaException;
 
 /**
diff --git a/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/PasteAction.java b/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/PasteAction.java
index b66d6f632fdffec6357438c57a0499a6d0a7e7a4..7d0ba23e86e11f8ebf654512c007c39b769ee27c 100644
--- a/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/PasteAction.java
+++ b/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/PasteAction.java
@@ -11,7 +11,6 @@ import jp.sbi.celldesigner.plugin.PluginSBase;
 import jp.sbi.celldesigner.plugin.PluginSpecies;
 import jp.sbi.celldesigner.plugin.PluginSpeciesAlias;
 import lcsb.mapviewer.common.Pair;
-import lcsb.mapviewer.common.SystemClipboard;
 import lcsb.mapviewer.converter.annotation.XmlAnnotationParser;
 import lcsb.mapviewer.model.map.MiriamData;
 
diff --git a/commons/src/main/java/lcsb/mapviewer/common/SystemClipboard.java b/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/SystemClipboard.java
similarity index 97%
rename from commons/src/main/java/lcsb/mapviewer/common/SystemClipboard.java
rename to CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/SystemClipboard.java
index 6dd2325541cc483c1d45e9aa0823b1b2aad8011d..8d441767ba400eb7046afb960cba142ce54e0961 100644
--- a/commons/src/main/java/lcsb/mapviewer/common/SystemClipboard.java
+++ b/CellDesigner-plugin/src/main/java/lcsb/mapviewer/cdplugin/copypaste/SystemClipboard.java
@@ -1,4 +1,4 @@
-package lcsb.mapviewer.common;
+package lcsb.mapviewer.cdplugin.copypaste;
 
 import java.awt.Toolkit;
 import java.awt.datatransfer.Clipboard;
diff --git a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/AllCopyPasteTests.java b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/AllCopyPasteTests.java
index 4592dfdabccb1b921afe87f405316f55d719a94f..f1b5e832241ff892df151e13a16175bfa0777251 100644
--- a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/AllCopyPasteTests.java
+++ b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/AllCopyPasteTests.java
@@ -9,6 +9,7 @@ import org.junit.runners.Suite.SuiteClasses;
     CopyPasteAbstractActionTest.class,
     CopyPastePluginTest.class,
     PasteActionTest.class,
+    SystemClipboardTest.class,
 })
 public class AllCopyPasteTests {
 
diff --git a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/CopyActionTest.java b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/CopyActionTest.java
index aaa2f38c8622b868c7ecc843ec043b8a383c202b..9ec76857069f264657e423e660f6879e18f34514 100644
--- a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/CopyActionTest.java
+++ b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/CopyActionTest.java
@@ -8,7 +8,6 @@ import org.mockito.Mockito;
 
 import jp.sbi.celldesigner.plugin.PluginListOf;
 import lcsb.mapviewer.cdplugin.CdPluginFunctions;
-import lcsb.mapviewer.common.SystemClipboard;
 
 public class CopyActionTest extends CdPluginFunctions {
 
diff --git a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/CopyPastePluginTest.java b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/CopyPastePluginTest.java
index cc4c5f0c11e2ea693d54f6e4296629f542d53e81..868e4ac368c33123ad4932a2cd2e89bacdfaf034 100644
--- a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/CopyPastePluginTest.java
+++ b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/CopyPastePluginTest.java
@@ -11,7 +11,6 @@ import org.mockito.Mockito;
 
 import jp.sbi.celldesigner.plugin.PluginListOf;
 import lcsb.mapviewer.cdplugin.CdPluginFunctions;
-import lcsb.mapviewer.common.SystemClipboard;
 
 public class CopyPastePluginTest extends CdPluginFunctions {
 
diff --git a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/PasteActionTest.java b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/PasteActionTest.java
index eea9c0781ddbce6a27cff5de6d07c2d24da10f80..25d47b4b2600a13942c101429d4f3bf58085d08c 100644
--- a/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/PasteActionTest.java
+++ b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/PasteActionTest.java
@@ -13,7 +13,6 @@ import jp.sbi.celldesigner.plugin.PluginReaction;
 import jp.sbi.celldesigner.plugin.PluginSpecies;
 import jp.sbi.celldesigner.plugin.PluginSpeciesAlias;
 import lcsb.mapviewer.cdplugin.CdPluginFunctions;
-import lcsb.mapviewer.common.SystemClipboard;
 
 public class PasteActionTest extends CdPluginFunctions {
 
diff --git a/commons/src/test/java/lcsb/mapviewer/common/SystemClipboardTest.java b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/SystemClipboardTest.java
similarity index 92%
rename from commons/src/test/java/lcsb/mapviewer/common/SystemClipboardTest.java
rename to CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/SystemClipboardTest.java
index cae5f61666736c004caeae6dd90faec353d8e5c0..2a0225108f94be20088b4be17b7e6ab7935160b7 100644
--- a/commons/src/test/java/lcsb/mapviewer/common/SystemClipboardTest.java
+++ b/CellDesigner-plugin/src/test/java/lcsb/mapviewer/cdplugin/copypaste/SystemClipboardTest.java
@@ -1,4 +1,4 @@
-package lcsb.mapviewer.common;
+package lcsb.mapviewer.cdplugin.copypaste;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -14,7 +14,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-public class SystemClipboardTest extends CommonTestFunctions {
+import lcsb.mapviewer.cdplugin.CdPluginFunctions;
+
+public class SystemClipboardTest extends CdPluginFunctions {
 
   @Before
   public void setUp() throws Exception {
diff --git a/commons/src/test/java/lcsb/mapviewer/common/AllCommonTests.java b/commons/src/test/java/lcsb/mapviewer/common/AllCommonTests.java
index b09bf968afdf12ca421d1e58398606ff94c1eef0..e9aee332cc18efeccc7cdb8a2643fc4ccf29e8a3 100644
--- a/commons/src/test/java/lcsb/mapviewer/common/AllCommonTests.java
+++ b/commons/src/test/java/lcsb/mapviewer/common/AllCommonTests.java
@@ -17,7 +17,6 @@ import lcsb.mapviewer.common.geometry.AllGeometryTests;
     MimeTypeTest.class,
     ObjectUtilsTest.class,
     PairTest.class,
-    SystemClipboardTest.class,
     TextFileUtilsTest.class,
     XmlParserTest.class,
 })