diff --git a/RTCP/InputProc/test/tGenerator.cc b/RTCP/InputProc/test/tGenerator.cc
index 011019076f029affc15fefd335e5a94e2328e073..924e122472cc5d7b542af5fffe4818155e844b2d 100644
--- a/RTCP/InputProc/test/tGenerator.cc
+++ b/RTCP/InputProc/test/tGenerator.cc
@@ -33,15 +33,14 @@ int main( int, char **argv ) {
 
   vector<string> streamDescs(1, "tcp:localhost:54321");
 
-  unsigned clock = 200 * 1000 * 1000;
-  struct StationID stationID("RS106", "LBA", clock, 16);
+  struct StationID stationID("RS106", "LBA", 200, 16);
   struct BufferSettings settings;
 
   settings.station = stationID;
   settings.nrBeamlets = 61;
   settings.nrBoards = 1;
 
-  settings.nrSamples = (2 * stationID.clock / 1024);// & ~0xFL;
+  settings.nrSamples = (2 * stationID.clockMHz * 1000000 / 1024);// & ~0xFL;
   settings.nrFlagRanges = 64;
 
   settings.dataKey = stationID.hash();
diff --git a/RTCP/InputProc/test/tSampleBuffer.cc b/RTCP/InputProc/test/tSampleBuffer.cc
index ad254869c125c2de3d841ff7c73d7f6e1aadf073..4292aa114b29feb5b57ad394d6f304ed839dbb0c 100644
--- a/RTCP/InputProc/test/tSampleBuffer.cc
+++ b/RTCP/InputProc/test/tSampleBuffer.cc
@@ -36,15 +36,14 @@ int main( int, char **argv ) {
 
   OMPThread::init();
 
-  unsigned clock = 200 * 1000 * 1000;
-  struct StationID stationID("RS106", "LBA", clock, 16);
+  struct StationID stationID("RS106", "LBA", 200, 16);
   struct BufferSettings settings;
 
   settings.station = stationID;
   settings.nrBeamlets = 61;
   settings.nrBoards = 1;
 
-  settings.nrSamples = (2 * stationID.clock / 1024);// & ~0xFL;
+  settings.nrSamples = (2 * stationID.clockMHz * 1000000 / 1024);// & ~0xFL;
   settings.nrFlagRanges = 64;
 
   settings.dataKey = 0x12345678;