diff --git a/code/Makefile b/code/Makefile
index e9f2b2d50..d8bb97dda 100644
--- a/code/Makefile
+++ b/code/Makefile
@@ -44,6 +44,7 @@ FFTWROOT ?= /usr/local
 IMKLROOT ?= 
 ACMLROOT ?= 
 LAPACKROOT ?= /usr
+HDF5ROOT ?=
 
 F90 ?= ifort
 ########################################################################################
@@ -119,9 +120,9 @@ LIB_DIRS  +=-L$(FFTWROOT)/lib
 
 #hdf5
 ifeq "$(HDF5)" "ON"
-LIB_DIRS +=-L/opt/hdf5-1.8.10-patch1/hdf5/lib
-LIBRARIES +=-lhdf5_fortran -lhdf5
-INCLUDE_DIRS +=-I/opt/hdf5-1.8.10-patch1/hdf5/include -DHDF
+LIBRARIES +=-lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5
+LIB_DIRS  +=-L$(HDF5ROOT)/lib
+INCLUDE_DIRS +=-I$(HDF5ROOT)/include -DHDF
 endif
 
 ifdef PETSC_DIR
diff --git a/lib/damask/test/test.py b/lib/damask/test/test.py
index 5d7c5f354..1b7a11313 100644
--- a/lib/damask/test/test.py
+++ b/lib/damask/test/test.py
@@ -124,31 +124,37 @@ class Test():
 
   def dirReference(self):
     '''
+    Directory containing reference results of the test.
     '''
     return os.path.normpath(os.path.join(self.dirBase,'reference/'))
 
   def dirCurrent(self):
     '''
+    Directory containing current results of the test.
     '''
     return os.path.normpath(os.path.join(self.dirBase,'current/'))
   
   def dirProof(self):
     '''
+    Directory containing human readable proof of correctness for the test.
     '''
     return os.path.normpath(os.path.join(self.dirBase,'proof/'))
     
   def fileInReference(self,file):
     '''
+    Path to a file in the refrence directory for the test.
     '''
     return os.path.join(self.dirReference(),file)
 
   def fileInCurrent(self,file):
     '''
+    Path to a file in the current results directory for the test.
     '''
     return os.path.join(self.dirCurrent(),file)
   
   def fileInProof(self,file):
     '''
+    Path to a file in the proof directory for the test.
     '''
     return os.path.join(self.dirProof(),file)
     
diff --git a/processing/setup/compile_CoreModule.py b/processing/setup/compile_CoreModule.py
index c517ca75f..be749b8f1 100755
--- a/processing/setup/compile_CoreModule.py
+++ b/processing/setup/compile_CoreModule.py
@@ -117,7 +117,6 @@ for tasks in execute:
       print 'failed..!'
       pass
 
-os.chdir(damaskEnv.relPath('processing/setup/'))
 modules = glob.glob('*.mod')
 for module in modules:
   print 'removing', module