diff --git a/src/ctbutterfly/ctbutterfly.par b/src/ctbutterfly/ctbutterfly.par
index 21f71fb..3681727 100644
--- a/src/ctbutterfly/ctbutterfly.par
+++ b/src/ctbutterfly/ctbutterfly.par
@@ -20,8 +20,8 @@
 inobs,    f, a, "events.fits",,,"Input event list, counts cube or observation definition file"
 inmodel,  f, a, "$CTOOLS/share/models/crab.xml",,, "Source model"
 srcname,  s, a, "Crab",,,"Source of interest"
-expcube,  f, a, NONE,,, "Exposure cube file (only needed for stacked analysis)"
-psfcube,  f, a, NONE,,, "PSF cube file (only needed for stacked analysis)"
+expcube,  f, a, "NONE",,, "Exposure cube file (only needed for stacked analysis)"
+psfcube,  f, a, "NONE",,, "PSF cube file (only needed for stacked analysis)"
 caldb,    s, a, "dummy",,, "Calibration database"
 irf,      s, a, "cta_dummy_irf",,, "Instrument response function"
 outfile,  f, a, "butterfly.txt",,, "Output ascii file"
diff --git a/src/ctexpcube/ctexpcube.par b/src/ctexpcube/ctexpcube.par
index 49ce98b..6057915 100644
--- a/src/ctexpcube/ctexpcube.par
+++ b/src/ctexpcube/ctexpcube.par
@@ -34,7 +34,7 @@ ebinfile, f, h, "NONE",,,"Name of the file containing the energy bin definition"
 #
 # Spatial binning parameters
 #===========================
-usepnt,   b, h,    no,,, "Use pointing instead of xref/yref parameters?"
+usepnt,   b, h, no,,, "Use pointing instead of xref/yref parameters?"
 nxpix,    i, a, 200,,, "Size of the X axis in pixels"
 nypix,    i, a, 200,,, "Size of the Y axis in pixels"
 binsz,    r, a, 0.02,,, "Image scale (in degrees/pixel)"
diff --git a/src/ctlike/ctlike.par b/src/ctlike/ctlike.par
index f11dc12..8b2ff8a 100644
--- a/src/ctlike/ctlike.par
+++ b/src/ctlike/ctlike.par
@@ -19,8 +19,8 @@
 #===================
 inobs,    f, a, "events.fits",,, "Event list, counts cube or observation definition file"
 inmodel,  f, a, "$CTOOLS/share/models/crab.xml",,, "Source model"
-expcube,  f, a, NONE,,, "Exposure cube file (only needed for stacked analysis)"
-psfcube,  f, a, NONE,,, "PSF cube file (only needed for stacked analysis)"
+expcube,  f, a, "NONE",,, "Exposure cube file (only needed for stacked analysis)"
+psfcube,  f, a, "NONE",,, "PSF cube file (only needed for stacked analysis)"
 caldb,    s, a, "dummy",,, "Calibration database"
 irf,      s, a, "cta_dummy_irf",,, "Instrument response function"
 outmodel, f, a, "crab_results.xml",,,  "Source model output file"
diff --git a/src/ctmodel/ctmodel.par b/src/ctmodel/ctmodel.par
index 0d02223..99e74d3 100644
--- a/src/ctmodel/ctmodel.par
+++ b/src/ctmodel/ctmodel.par
@@ -25,8 +25,8 @@ edisp,    b, h, no,,, "Apply energy dispersion?"
 # Observation parameters
 #=======================
 inobs,    f, a, "NONE",,, "Event list, counts cube or observation definition file"
-expcube,  f, a, NONE,,, "Exposure cube file (only needed for stacked analysis)"
-psfcube,  f, a, NONE,,, "PSF cube file (only needed for stacked analysis)"
+expcube,  f, a, "NONE",,, "Exposure cube file (only needed for stacked analysis)"
+psfcube,  f, a, "NONE",,, "PSF cube file (only needed for stacked analysis)"
 caldb,    s, a, "dummy",,, "Calibration database"
 irf,      s, a, "cta_dummy_irf",,, "Instrument response function"
 ra,       r, a, 83.63,0,360, "RA of pointing (degrees)"
diff --git a/src/ctskymap/ctskymap.par b/src/ctskymap/ctskymap.par
index 8c7adb9..8771fb4 100644
--- a/src/ctskymap/ctskymap.par
+++ b/src/ctskymap/ctskymap.par
@@ -27,7 +27,7 @@ emax, r, a, 100.0,,,"Maximum energy in TeV"
 #
 # Spatial binning parameters
 #===========================
-usepnt,   b, h,    no,,, "Use pointing instead of xref/yref parameters?"
+usepnt,   b, h, no,,, "Use pointing instead of xref/yref parameters?"
 nxpix,    i, a, 200,,, "Size of the X axis in pixels"
 nypix,    i, a, 200,,, "Size of the Y axis in pixels"
 binsz,    r, a, 0.02,,, "Image scale (in degrees/pixel)"
diff --git a/src/cttsmap/cttsmap.par b/src/cttsmap/cttsmap.par
index c0f6935..5380c4b 100644
--- a/src/cttsmap/cttsmap.par
+++ b/src/cttsmap/cttsmap.par
@@ -20,8 +20,8 @@
 inobs,   f, a, "events.fits",,, "Input event list, counts cube or observation definition file"
 inmodel, f, a, "$CTOOLS/share/models/crab.xml",,, "Source model"
 srcname, s, a, "Crab",,, "Test source"
-expcube, f, a, NONE,,, "Exposure cube file (only needed for stacked analysis)"
-psfcube, f, a, NONE,,, "PSF cube file (only needed for stacked analysis)"
+expcube, f, a, "NONE",,, "Exposure cube file (only needed for stacked analysis)"
+psfcube, f, a, "NONE",,, "PSF cube file (only needed for stacked analysis)"
 caldb,   s, a, "dummy",,, "Calibration database"
 irf,     s, a, "cta_dummy_irf",,, "Instrument response function"
 outmap,  f, a, "tsmap.fits",,, "Output Test Statistic map"
@@ -29,10 +29,10 @@ outmap,  f, a, "tsmap.fits",,, "Output Test Statistic map"
 #
 # Spatial binning parameters
 #===========================
-usepnt,   b, h,    no,,, "Use pointing instead of xref/yref parameters?"
-nxpix,    i, a,   200,,, "Size of the X axis in pixels"
-nypix,    i, a,   200,,, "Size of the Y axis in pixels"
-binsz,    r, a,  0.02,,, "Image scale (in degrees/pixel)"
+usepnt,   b, h, no,,, "Use pointing instead of xref/yref parameters?"
+nxpix,    i, a, 200,,, "Size of the X axis in pixels"
+nypix,    i, a, 200,,, "Size of the Y axis in pixels"
+binsz,    r, a, 0.02,,, "Image scale (in degrees/pixel)"
 coordsys, s, a, "CEL", CEL|GAL,,"Coordinate system (CEL - celestial, GAL - galactic)"
 xref,     r, a, 83.63,,, "First coordinate of image center in degrees (RA or galactic l)"
 yref,     r, a, 22.01,,, "Second coordinate of image center in degrees (DEC or galactic b)"
diff --git a/test/test_ctools.sh b/test/test_ctools.sh
index e36b054..89597ae 100755
--- a/test/test_ctools.sh
+++ b/test/test_ctools.sh
@@ -2,7 +2,7 @@
 # ==========================================================================
 # This script tests all ctools
 #
-# Copyright (C) 2011-2014 Juergen Knoedlseder
+# Copyright (C) 2011-2015 Juergen Knoedlseder
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -202,6 +202,8 @@ $ECHO -n "Test ctmodel: "
 $ctmodel inobs="cntmap.fits" \
          incube="cntmap.fits" \
          outcube="modmap1.fits" \
+         expcube="NONE" \
+         psfcube="NONE" \
          caldb="irf" \
          irf="cta_dummy_irf" \
          inmodel="data/crab.xml"
@@ -249,6 +251,8 @@ fi
 $ctmodel inobs="cntmap2.fits" \
          incube="cntmap2.fits" \
          outcube="modmap2.fits" \
+         expcube="NONE" \
+         psfcube="NONE" \
          caldb="irf" \
          irf="cta_dummy_irf" \
          inmodel="data/model_background_cube.xml"
@@ -296,6 +300,8 @@ $ECHO -n "Test ctlike: "
 $ctlike inobs="cntmap.fits" \
         inmodel="data/crab.xml" \
         outmodel="results_binned.xml" \
+        expcube="NONE" \
+        psfcube="NONE" \
         caldb="irf" \
         irf="cta_dummy_irf"
 $ECHO -n "."
@@ -341,6 +347,8 @@ fi
 $ctlike inobs="cntmap2.fits" \
         inmodel="data/model_background_cube.xml" \
         outmodel="results_binned_background_cube.xml" \
+        expcube="NONE" \
+        psfcube="NONE" \
         caldb="irf" \
         irf="cta_dummy_irf"
 $ECHO -n "."