diff --git a/model/isl-propagation-loss-model.cc b/model/isl-propagation-loss-model.cc
index de6622b..f9c6bc0 100644
--- a/model/isl-propagation-loss-model.cc
+++ b/model/isl-propagation-loss-model.cc
@@ -22,6 +22,8 @@
  *                Pavel Boyko <boyko@iitp.ru> for matrix
  */
 
+#include "ns3/log.h"
+
 #include "isl-propagation-loss-model.h"
 
 namespace ns3 {
diff --git a/model/isl-propagation-loss-model.h b/model/isl-propagation-loss-model.h
index 414cc3b..f98bbea 100644
--- a/model/isl-propagation-loss-model.h
+++ b/model/isl-propagation-loss-model.h
@@ -25,7 +25,6 @@
 #ifndef ISL_PROPAGATION_LOSS_MODEL_H
 #define ISL_PROPAGATION_LOSS_MODEL_H
 
-#include "leo-mobility-model.h"
 #include <ns3/object.h>
 #include <ns3/propagation-loss-model.h>
 
diff --git a/model/leo-propagation-loss-model.cc b/model/leo-propagation-loss-model.cc
index e427c0f..2aded5c 100644
--- a/model/leo-propagation-loss-model.cc
+++ b/model/leo-propagation-loss-model.cc
@@ -1,5 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 
+#include "ns3/log.h"
 #include "leo-propagation-loss-model.h"
 
 namespace ns3 {
@@ -38,7 +39,7 @@ LeoPropagationLossModel::DoCalcRxPower (double txPowerDbm,
   // TODO perform line-earth intersection (ray tracing)
 
   double rxc = 0;//-m_variable->GetValue ();
-  NS_LOG_DEBUG ("attenuation coefficient="<<rxc<<"Db");
+  //NS_LOG_DEBUG ("attenuation coefficient="<<rxc<<"Db");
   return txPowerDbm + rxc;
 }
 
diff --git a/model/leo-propagation-loss-model.h b/model/leo-propagation-loss-model.h
index 4d51653..88acfce 100644
--- a/model/leo-propagation-loss-model.h
+++ b/model/leo-propagation-loss-model.h
@@ -3,7 +3,6 @@
 #ifndef LEO_PROPAGATION_LOSS_MODEL_H
 #define LEO_PROPAGATION_LOSS_MODEL_H
 
-#include "leo-mobility-model.h"
 #include <ns3/object.h>
 #include <ns3/propagation-loss-model.h>
 
diff --git a/test/isl-mock-channel-test-suite.cc b/test/isl-mock-channel-test-suite.cc
index c540673..64c0241 100644
--- a/test/isl-mock-channel-test-suite.cc
+++ b/test/isl-mock-channel-test-suite.cc
@@ -42,7 +42,7 @@ IslMockChannelTransmitUnknownTestCase::DoRun (void)
   Time txTime;
   channel->SetAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
   channel->SetAttribute ("PropagationLoss", StringValue ("ns3::IslPropagationLossModel"));
-  dev->SetAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel"));
+  dev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
   bool result = channel->TransmitStart (p, srcId, destAddr, txTime);
 
   NS_TEST_ASSERT_MSG_EQ (result, false, "Unknown destination fails to deliver");
@@ -80,13 +80,13 @@ IslMockChannelTransmitKnownTestCase::DoRun (void)
   Ptr<Node> srcNode = CreateObject<Node> ();
   Ptr<MockNetDevice> srcDev = CreateObject<MockNetDevice> ();
   srcDev->SetNode (srcNode);
-  srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel"));
+  srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
   int32_t srcId = channel->Attach (srcDev);
 
   Ptr<Node> dstNode = CreateObject<Node> ();
   Ptr<MockNetDevice> dstDev = CreateObject<MockNetDevice> ();
   dstDev->SetNode (dstNode);
-  dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel"));
+  dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
   channel->Attach (dstDev);
 
   Address destAddr = dstDev->GetAddress ();
diff --git a/test/isl-test-suite.cc b/test/isl-test-suite.cc
index ca2c504..4df4be6 100644
--- a/test/isl-test-suite.cc
+++ b/test/isl-test-suite.cc
@@ -41,7 +41,7 @@ IslIcmpTestCase::DoRun (void)
   isl.SetDeviceAttribute ("DataRate", StringValue ("5Gbps"));
   isl.SetChannelAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
   isl.SetChannelAttribute ("PropagationLoss", StringValue ("ns3::IslPropagationLossModel"));
-  isl.SetDeviceAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel"));
+  isl.SetDeviceAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
 
   NetDeviceContainer devices;
   devices = isl.Install (nodes);
diff --git a/test/leo-mock-channel-test-suite.cc b/test/leo-mock-channel-test-suite.cc
index f7283eb..9b473ed 100644
--- a/test/leo-mock-channel-test-suite.cc
+++ b/test/leo-mock-channel-test-suite.cc
@@ -88,7 +88,7 @@ LeoMockChannelTransmitKnownTestCase::DoRun (void)
   Ptr<Node> dstNode = CreateObject<Node> ();
   Ptr<LeoMockNetDevice> dstDev = CreateObject<LeoMockNetDevice> ();
   dstDev->SetNode (dstNode);
-  dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel"));
+  dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
   dstDev->SetDeviceType (LeoMockNetDevice::SAT);
   channel->Attach (dstDev);
 
@@ -131,7 +131,7 @@ LeoMockChannelTransmitSpaceGroundTestCase::DoRun (void)
   Ptr<Node> srcNode = CreateObject<Node> ();
   Ptr<LeoMockNetDevice> srcDev = CreateObject<LeoMockNetDevice> ();
   srcDev->SetNode (srcNode);
-  srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel"));
+  srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
   srcDev->SetDeviceType (LeoMockNetDevice::SAT);
   int32_t srcId = channel->Attach (srcDev);
 
@@ -181,14 +181,14 @@ LeoMockChannelTransmitSpaceSpaceTestCase::DoRun (void)
   Ptr<Node> srcNode = CreateObject<Node> ();
   Ptr<LeoMockNetDevice> srcDev = CreateObject<LeoMockNetDevice> ();
   srcDev->SetNode (srcNode);
-  srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel"));
+  srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
   srcDev->SetDeviceType (LeoMockNetDevice::SAT);
   int32_t srcId = channel->Attach (srcDev);
 
   Ptr<Node> dstNode = CreateObject<Node> ();
   Ptr<LeoMockNetDevice> dstDev = CreateObject<LeoMockNetDevice> ();
   dstDev->SetNode (dstNode);
-  dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel"));
+  dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
   dstDev->SetDeviceType (LeoMockNetDevice::SAT);
   channel->Attach (dstDev);
 
diff --git a/test/leo-test-suite.cc b/test/leo-test-suite.cc
index b88ac65..d78179c 100644
--- a/test/leo-test-suite.cc
+++ b/test/leo-test-suite.cc
@@ -48,7 +48,7 @@ LeoTestCase1::DoRun (void)
   LeoHelper leo;
   leo.SetDeviceAttribute ("DataRate", StringValue ("10Mbps"));
   leo.SetChannelAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
-  leo.SetDeviceAttribute ("MobilityModel", StringValue ("ns3::LeoMobilityModel"));
+  leo.SetDeviceAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
 
   NetDeviceContainer allDevices = leo.Install (satellites, gateways, terminals);