diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 00000000..b5f5c355
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+CElegansNeuroML
\ No newline at end of file
diff --git a/.idea/CElegansNeuroML.iml b/.idea/CElegansNeuroML.iml
new file mode 100644
index 00000000..634c4089
--- /dev/null
+++ b/.idea/CElegansNeuroML.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="Python 2.7.10 (~/anaconda/bin/python)" jdkType="Python SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 00000000..97626ba4
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..0ff2ff7a
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+    <OptionsSetting value="true" id="Add" />
+    <OptionsSetting value="true" id="Remove" />
+    <OptionsSetting value="true" id="Checkout" />
+    <OptionsSetting value="true" id="Update" />
+    <OptionsSetting value="true" id="Status" />
+    <OptionsSetting value="true" id="Edit" />
+    <ConfirmationsSetting value="0" id="Add" />
+    <ConfirmationsSetting value="0" id="Remove" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7.10 (~/anaconda/bin/python)" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..de098795
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/CElegansNeuroML.iml" filepath="$PROJECT_DIR$/.idea/CElegansNeuroML.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..94a25f7f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index b455e2b2..f2921b3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,10 +26,13 @@ script:
     
      #    Test readers
     - cd CElegans/pythonScripts
-    - python SpreadsheetDataReader.py
+
+    #Testing RegenerateConnectome.py, SpreadsheetDataReader.py, OpenWormReader.py via py.test
+    - py.test python_script_tester.py
+#    - python SpreadsheetDataReader.py
     
      #    Test regenerate connectome
-    - python RegenerateConnectome.py
+#    - python RegenerateConnectome.py
     
      #    Install PyOpenWorm
     - git clone https://github.com/openworm/PyOpenWorm.git
diff --git a/CElegans/pythonScripts/python_script_tester.py b/CElegans/pythonScripts/python_script_tester.py
new file mode 100644
index 00000000..864062a0
--- /dev/null
+++ b/CElegans/pythonScripts/python_script_tester.py
@@ -0,0 +1,26 @@
+import subprocess as sp
+
+def get_file_list():
+    #Add the name of the python scripts to the list that needs to be tested
+    file_list = ['RegenerateConnectome.py', 'SpreadsheetDataReader.py', 'OpenWormReader.py']
+    return file_list
+
+
+def test_python_scripts(file_list = get_file_list()):
+    '''
+    Executes the desired python scripts and check whether they exit correctly(code 0) or not.
+    :param file_list: contains files that are to be tested
+    :return: none
+    '''
+
+    #stores returncode of each file.
+    returncode_list = []
+
+    for each_script in file_list:
+        exit_code = sp.call("python "+each_script, shell=True)
+        returncode_list.append(exit_code)
+
+    for i in range(len(file_list)):
+        assert(returncode_list[i] == 0),"Test Failed for " + file_list[i]
+        print("Test passed for " + file_list[i])
+
diff --git a/setup.py b/setup.py
index a1bea63f..a3025e2b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+
 
 from setuptools import setup
 from setuptools.command.install import install as _install