   //   * Check that linger was long enough (if linger threshold is higher enough to allow it).
   // Also check for some correct initialisation and 'velocity'/smoothing behaviour.
 //  DEBUG_SERIAL_PRINTLN_FLASHSTRING("close...");
-  ModelledRadValveInputState is1(100<<4);
-  is1.targetTempC = OTV0P2BASE::randRNG8NextBoolean() ? FROST : WARM;
-  ModelledRadValveState rs1;
+  OTRadValve::ModelledRadValveInputState is1(100<<4);
+  is1.targetTempC = OTV0P2BASE::randRNG8NextBoolean() ? 5 : 25;
+  OTRadValve::ModelledRadValveState rs1;
   AssertIsTrue(!rs1.initialised); // Initialisation not yet complete.
   const uint8_t valvePCOpenInitial1 = 1 + (OTV0P2BASE::randRNG8() % 100);
   valvePCOpen = valvePCOpenInitial1;

  // and also test that the fully-open state is reached in a bounded number of ticks ie bounded time.
  static const int maxFullTravelMins = 25;
//  DEBUG_SERIAL_PRINTLN_FLASHSTRING("open...");
  ModelledRadValveInputState is0(0);
  is0.targetTempC = OTV0P2BASE::randRNG8NextBoolean() ? FROST : WARM;
  ModelledRadValveState rs0;
  const uint8_t valvePCOpenInitial0 = OTV0P2BASE::randRNG8() % 100;
  volatile uint8_t valvePCOpen = valvePCOpenInitial0;
  for(int i = maxFullTravelMins; --i >= 0; ) // Must fully open in reasonable time.

  }


// Test for general sanity of computation of desired valve position.
// In particular test the logic in ModelledRadValveState for extreme positions.
static void testMRVSExtremes()
  {
  Serial.println("MRVSExtremes");
  // Test that if the real temperature is zero
  // and the initial valve position is anything less than 100%
  // that after one tick (with mainly defaults)
