diff --git a/RTCP/Storage/src/MeasurementSetFormat.cc b/RTCP/Storage/src/MeasurementSetFormat.cc
index c2f856eb704412e1f3d1c139c6fd41252ac15a35..fa0de5564b756edf1e3bded93603f7e5ca069937 100644
--- a/RTCP/Storage/src/MeasurementSetFormat.cc
+++ b/RTCP/Storage/src/MeasurementSetFormat.cc
@@ -169,10 +169,10 @@ void MeasurementSetFormat::createMSTables(const string &MSname, unsigned subband
 
     // Create the tables containing the beam info.
     BeamTables::create (*itsMS,
-			itsPS->getString("AntennaSetName"),
-			itsPS->getString("AntennaSetFileName"),
-			itsPS->getString("AntennaFieldDir"),
-			itsPS->getString("iHBADeltaDir"));
+                        itsPS->antennaSet(),
+                        "/home/diepen/data/AntennaSets.conf",
+                        "/home/diepen/data/AntennaFields",
+                        "/home/diepen/data/iHBADeltas");
 
   } catch (AipsError& x) {
     THROW(StorageException,"AIPS/CASA error: " << x.getMesg());
diff --git a/RTCP/Storage/test/tMeasurementSetFormat.cc b/RTCP/Storage/test/tMeasurementSetFormat.cc
new file mode 100644
index 0000000000000000000000000000000000000000..915334315329f4ce19458ca1110214866a743e54
--- /dev/null
+++ b/RTCP/Storage/test/tMeasurementSetFormat.cc
@@ -0,0 +1,19 @@
+//#  tMeasurementSetFormat.cc: Test program for class MeasurementSetFormat
+//#
+//#  Copyright (C) 2011
+//#  ASTRON (Netherlands Foundation for Research in Astronomy)
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#
+//#  $Id$
+
+#include <lofar_config.h>
+#include <Storage/MeasurementSetFormat.h>
+
+using namespace LOFAR;
+
+int main()
+{
+  Parset parset("tMeasurementSetFormat.parset");
+  MeasurementSetFormat msf(parset);
+  msf.addSubband ("tMeasurementSetFormat_tmp.ms", 0, false);
+}
diff --git a/RTCP/Storage/test/tMeasurementSetFormat.sh b/RTCP/Storage/test/tMeasurementSetFormat.sh
new file mode 100755
index 0000000000000000000000000000000000000000..c23d0e97991ac3ce24f62a603a6db33dceac5b5f
--- /dev/null
+++ b/RTCP/Storage/test/tMeasurementSetFormat.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+./runctest.sh tMeasurementSetFormat 2>&1 > tMeasurementSetFormat.log