diff --git a/src/eu.aniketos.dasca.crosslanguage.tests/.gitignore b/src/eu.aniketos.dasca.crosslanguage.test/.gitignore
similarity index 100%
rename from src/eu.aniketos.dasca.crosslanguage.tests/.gitignore
rename to src/eu.aniketos.dasca.crosslanguage.test/.gitignore
diff --git a/src/eu.aniketos.dasca.crosslanguage.tests/RunAllTests.launch b/src/eu.aniketos.dasca.crosslanguage.test/RunAllTests.launch
similarity index 72%
rename from src/eu.aniketos.dasca.crosslanguage.tests/RunAllTests.launch
rename to src/eu.aniketos.dasca.crosslanguage.test/RunAllTests.launch
index 81e1f44..582659b 100644
--- a/src/eu.aniketos.dasca.crosslanguage.tests/RunAllTests.launch
+++ b/src/eu.aniketos.dasca.crosslanguage.test/RunAllTests.launch
@@ -2,12 +2,12 @@
 <launchConfiguration type="scala.application">
 <listAttribute key="StepOutExcludePkgsOrClasses"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/TestDriver.scala"/>
+<listEntry value="/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/test/TestDriver.scala"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eu.aniketos.dasca.crosslanguage.tests.TestDriver"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="eu.aniketos.dasca.crosslanguage.test.TestDriver"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-mrfj src/main/resources"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="eu.aniketos.dasca.crosslanguage.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="eu.aniketos.dasca.crosslanguage.test"/>
 </launchConfiguration>
diff --git a/src/eu.aniketos.dasca.crosslanguage.tests/pom.xml b/src/eu.aniketos.dasca.crosslanguage.test/pom.xml
similarity index 99%
rename from src/eu.aniketos.dasca.crosslanguage.tests/pom.xml
rename to src/eu.aniketos.dasca.crosslanguage.test/pom.xml
index 2a190af..6fd67ea 100644
--- a/src/eu.aniketos.dasca.crosslanguage.tests/pom.xml
+++ b/src/eu.aniketos.dasca.crosslanguage.test/pom.xml
@@ -7,7 +7,7 @@
     <version>0.1</version>
     <relativePath>../eu.aniketos.dasca.parent/pom.xml</relativePath>
   </parent>
-  <artifactId>eu.aniketos.dasca.crosslanguage.tests</artifactId>
+  <artifactId>eu.aniketos.dasca.crosslanguage.test</artifactId>
   <version>0.0.1-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>jar</packaging>
diff --git a/src/eu.aniketos.dasca.crosslanguage.tests/src/main/resources/de.zertapps.dvhma.featherweight.apk b/src/eu.aniketos.dasca.crosslanguage.test/src/main/resources/de.zertapps.dvhma.featherweight.apk
similarity index 100%
rename from src/eu.aniketos.dasca.crosslanguage.tests/src/main/resources/de.zertapps.dvhma.featherweight.apk
rename to src/eu.aniketos.dasca.crosslanguage.test/src/main/resources/de.zertapps.dvhma.featherweight.apk
diff --git a/src/eu.aniketos.dasca.crosslanguage.tests/src/main/resources/de.zertapps.dvhma.featherweight_1.0.0_3.5.0_debug.apk b/src/eu.aniketos.dasca.crosslanguage.test/src/main/resources/de.zertapps.dvhma.featherweight_1.0.0_3.5.0_debug.apk
similarity index 100%
rename from src/eu.aniketos.dasca.crosslanguage.tests/src/main/resources/de.zertapps.dvhma.featherweight_1.0.0_3.5.0_debug.apk
rename to src/eu.aniketos.dasca.crosslanguage.test/src/main/resources/de.zertapps.dvhma.featherweight_1.0.0_3.5.0_debug.apk
diff --git a/src/eu.aniketos.dasca.crosslanguage.tests/src/main/resources/de.zertapps.dvhma.featherweight_1.0.0_6.3.0_debug.apk b/src/eu.aniketos.dasca.crosslanguage.test/src/main/resources/de.zertapps.dvhma.featherweight_1.0.0_6.3.0_debug.apk
similarity index 100%
rename from src/eu.aniketos.dasca.crosslanguage.tests/src/main/resources/de.zertapps.dvhma.featherweight_1.0.0_6.3.0_debug.apk
rename to src/eu.aniketos.dasca.crosslanguage.test/src/main/resources/de.zertapps.dvhma.featherweight_1.0.0_6.3.0_debug.apk
diff --git a/src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/AppInfo.scala b/src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/AppInfo.scala
similarity index 91%
rename from src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/AppInfo.scala
rename to src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/AppInfo.scala
index f8cd1db..52bf979 100644
--- a/src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/AppInfo.scala
+++ b/src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/AppInfo.scala
@@ -8,7 +8,7 @@
  *
  */
 
-package eu.aniketos.dasca.crosslanguage.tests
+package eu.aniketos.dasca.crosslanguage.test
 
 import java.io.File
 import eu.aniketos.dasca.crosslanguage.util.SourceLocation
diff --git a/src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/TestDriver.scala b/src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/TestDriver.scala
similarity index 94%
rename from src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/TestDriver.scala
rename to src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/TestDriver.scala
index 2986b95..b76d9ce 100644
--- a/src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/TestDriver.scala
+++ b/src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/TestDriver.scala
@@ -9,13 +9,13 @@
  *
  */
 
-package eu.aniketos.dasca.crosslanguage.tests
+package eu.aniketos.dasca.crosslanguage.test
 
 import com.ibm.wala.classLoader.CallSiteReference
 import com.ibm.wala.ipa.callgraph.CGNode
 import eu.aniketos.dasca.crosslanguage.util.Util
 import eu.aniketos.dasca.crosslanguage.builder.CordovaCGBuilder
-import eu.aniketos.dasca.crosslanguage.tests.apps.FeatherweightInfo
+import eu.aniketos.dasca.crosslanguage.test.apps.FeatherweightInfo
 import eu.aniketos.dasca.crosslanguage.builder.FilterJavaCallSites
 import eu.aniketos.dasca.crosslanguage.builder.MockCordovaExec
 import eu.aniketos.dasca.crosslanguage.builder.ReplacePluginDefinesAndRequires
@@ -27,8 +27,8 @@ import eu.aniketos.dasca.crosslanguage.util.SourceLocation
 import eu.aniketos.dasca.crosslanguage.builder.FilterJSFrameworks
 import scala.collection.mutable.LinkedHashSet
 import com.ibm.wala.classLoader.IMethod
-import eu.aniketos.dasca.crosslanguage.tests.apps.Featherweight_100_350_Info
-import eu.aniketos.dasca.crosslanguage.tests.apps.Featherweight_100_630_Info
+import eu.aniketos.dasca.crosslanguage.test.apps.Featherweight_100_350_Info
+import eu.aniketos.dasca.crosslanguage.test.apps.Featherweight_100_630_Info
 
 object TestDriver {
   def main(args: Array[String]): Unit = {
diff --git a/src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/FeatherweightInfo.scala b/src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/FeatherweightInfo.scala
similarity index 96%
rename from src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/FeatherweightInfo.scala
rename to src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/FeatherweightInfo.scala
index 772ad4b..1ff92ad 100644
--- a/src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/FeatherweightInfo.scala
+++ b/src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/FeatherweightInfo.scala
@@ -8,13 +8,13 @@
  *
  */
 
-package eu.aniketos.dasca.crosslanguage.tests.apps
+package eu.aniketos.dasca.crosslanguage.test.apps
 
 import java.io.File
 
 import scala.collection.mutable.ListBuffer
 
-import eu.aniketos.dasca.crosslanguage.tests.AppInfo
+import eu.aniketos.dasca.crosslanguage.test.AppInfo
 import eu.aniketos.dasca.crosslanguage.util.JavaScriptSourceLocation
 import eu.aniketos.dasca.crosslanguage.util.JavaSourceLocation
 import eu.aniketos.dasca.crosslanguage.util.SourceLocation
diff --git a/src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/Featherweight_100_350_Info.scala b/src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/Featherweight_100_350_Info.scala
similarity index 97%
rename from src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/Featherweight_100_350_Info.scala
rename to src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/Featherweight_100_350_Info.scala
index bdd75cc..7b92a88 100644
--- a/src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/Featherweight_100_350_Info.scala
+++ b/src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/Featherweight_100_350_Info.scala
@@ -9,13 +9,13 @@
  *
  */
 
-package eu.aniketos.dasca.crosslanguage.tests.apps
+package eu.aniketos.dasca.crosslanguage.test.apps
 
 import java.io.File
 
 import scala.collection.mutable.ListBuffer
 
-import eu.aniketos.dasca.crosslanguage.tests.AppInfo
+import eu.aniketos.dasca.crosslanguage.test.AppInfo
 import eu.aniketos.dasca.crosslanguage.util.JavaScriptSourceLocation
 import eu.aniketos.dasca.crosslanguage.util.JavaSourceLocation
 import eu.aniketos.dasca.crosslanguage.util.SourceLocation
diff --git a/src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/Featherweight_100_630_Info.scala b/src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/Featherweight_100_630_Info.scala
similarity index 97%
rename from src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/Featherweight_100_630_Info.scala
rename to src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/Featherweight_100_630_Info.scala
index a37b59e..1b9edcc 100644
--- a/src/eu.aniketos.dasca.crosslanguage.tests/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/Featherweight_100_630_Info.scala
+++ b/src/eu.aniketos.dasca.crosslanguage.test/src/main/scala/eu/aniketos/dasca/crosslanguage/tests/apps/Featherweight_100_630_Info.scala
@@ -9,13 +9,13 @@
  *
  */
 
-package eu.aniketos.dasca.crosslanguage.tests.apps
+package eu.aniketos.dasca.crosslanguage.test.apps
 
 import java.io.File
 
 import scala.collection.mutable.ListBuffer
 
-import eu.aniketos.dasca.crosslanguage.tests.AppInfo
+import eu.aniketos.dasca.crosslanguage.test.AppInfo
 import eu.aniketos.dasca.crosslanguage.util.JavaScriptSourceLocation
 import eu.aniketos.dasca.crosslanguage.util.JavaSourceLocation
 import eu.aniketos.dasca.crosslanguage.util.SourceLocation
diff --git a/src/eu.aniketos.dasca.dataflow/src/main/java/eu/aniketos/dasca/dataflow/util/AnalysisUtil.java b/src/eu.aniketos.dasca.dataflow/src/main/java/eu/aniketos/dasca/dataflow/util/AnalysisUtil.java
index 50a6885..84b25da 100644
--- a/src/eu.aniketos.dasca.dataflow/src/main/java/eu/aniketos/dasca/dataflow/util/AnalysisUtil.java
+++ b/src/eu.aniketos.dasca.dataflow/src/main/java/eu/aniketos/dasca/dataflow/util/AnalysisUtil.java
@@ -229,12 +229,17 @@ public class AnalysisUtil {
                 File f = new File("config/main.config");
                 in = new FileInputStream(f);
             }
+            System.err.println("Reading configuration file: "+in);
             stream = new BufferedInputStream(in);
             properties.load(stream);
             stream.close();
         } catch (FileNotFoundException e) {
             System.err.println("no config file found");
             return "";
+        } catch (NullPointerException e) {
+            System.out.println(" STD no config file found (null pointer)");
+            System.err.println(" ERR no config file found (null pointer)");
+        	return "";
         } catch (IOException e) {
             e.printStackTrace();
             return "";
diff --git a/src/eu.aniketos.dasca.parent/pom.xml b/src/eu.aniketos.dasca.parent/pom.xml
index 8257f87..cd01d5a 100644
--- a/src/eu.aniketos.dasca.parent/pom.xml
+++ b/src/eu.aniketos.dasca.parent/pom.xml
@@ -23,7 +23,7 @@
         <module>../eu.aniketos.dasca.dataflow.test.data</module>
         <module>../eu.aniketos.dasca.js</module>
         <module>../eu.aniketos.dasca.crosslanguage</module>
-        <module>../eu.aniketos.dasca.crosslanguage.tests</module>
+        <module>../eu.aniketos.dasca.crosslanguage.test</module>
       </modules>
     </profile>
     <profile>