--- a/src/test/java/net/timbusproject/extractors/test/ArchiUtilsTest.java
+++ b/src/test/java/net/timbusproject/extractors/test/ArchiUtilsTest.java
@@ -53,9 +53,7 @@
     private static TavernaExtractor loopingExtractor;
 
     // @BeforeClass
-    public static void customInit() throws EditException, OpenDataflowException, InvalidOptionException,
-            InvalidDataflowException, TokenOrderException, ReadInputException, DatabaseConfigurationException,
-            CMException, IOException, DeserializationException, IterationTypeMismatchException {
+    public static void customInit() throws Exception {
 
         matchboxExtractor = new TavernaExtractor(true);
 
@@ -74,9 +72,7 @@
     }
 
     @Test
-    public void test_Looping() throws EditException, OpenDataflowException, InvalidOptionException,
-            InvalidDataflowException, TokenOrderException, ReadInputException, DatabaseConfigurationException,
-            CMException, IOException, DeserializationException, IterationTypeMismatchException {
+    public void test_Looping() throws Exception {
 
         loopingExtractor = new TavernaExtractor(true);
 //        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
@@ -91,9 +87,7 @@
     }
 
     @Test
-    public void test_processWSDLActivity() throws EditException, OpenDataflowException, InvalidOptionException,
-            InvalidDataflowException, TokenOrderException, ReadInputException, DatabaseConfigurationException,
-            CMException, IOException, DeserializationException, IterationTypeMismatchException {
+    public void test_processWSDLActivity() throws Exception {
 
         wsdlActivityExtractor = new TavernaExtractor(true);
 //        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
@@ -108,9 +102,7 @@
     }
 
     @Test
-    public void test_processLocalToolActivity() throws EditException, OpenDataflowException, InvalidOptionException,
-            InvalidDataflowException, TokenOrderException, ReadInputException, DatabaseConfigurationException,
-            CMException, IOException, DeserializationException, IterationTypeMismatchException {
+    public void test_processLocalToolActivity() throws Exception {
 
         wsdlActivityExtractor = new TavernaExtractor(true);
 //        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
@@ -125,9 +117,7 @@
     }
 
     @Test
-    public void test_processSSHToolActivity() throws EditException, OpenDataflowException, InvalidOptionException,
-            InvalidDataflowException, TokenOrderException, ReadInputException, DatabaseConfigurationException,
-            CMException, IOException, DeserializationException, IterationTypeMismatchException {
+    public void test_processSSHToolActivity() throws Exception {
 
         wsdlActivityExtractor = new TavernaExtractor(true);
 //        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()
@@ -143,9 +133,7 @@
 
     @Test
     @Ignore
-    public void test_processBeanshellActivity() throws EditException, OpenDataflowException, InvalidOptionException,
-            InvalidDataflowException, TokenOrderException, ReadInputException, DatabaseConfigurationException,
-            CMException, IOException, DeserializationException, IterationTypeMismatchException {
+    public void test_processBeanshellActivity() throws Exception {
 
         beanshellActivityExtractor = new TavernaExtractor(true);
 //        TavernaExtractor.setArchimateOutputPath(Joiner.on(File.separator).skipNulls()