diff --git a/src/ITAPropagationPathSim/CombinedModel/PropagationEngine.cpp b/src/ITAPropagationPathSim/CombinedModel/PropagationEngine.cpp
index ce6b06373db3634c196e6100ab0d2c0427c413fa..67a3e82a5112e385458a75104ef58fca9eb12ae8 100644
--- a/src/ITAPropagationPathSim/CombinedModel/PropagationEngine.cpp
+++ b/src/ITAPropagationPathSim/CombinedModel/PropagationEngine.cpp
@@ -132,6 +132,11 @@ void ITAPropagationPathSim::CombinedModel::CPathEngine::UpdateEmitter( shared_pt
 	}
 }
 
+void ITAPropagationPathSim::CombinedModel::CPathEngine::UpdateSensor( shared_ptr< CSensor > pSensor )
+{
+	ITA_EXCEPT_NOT_IMPLEMENTED;
+}
+
 void ITAPropagationPathSim::CombinedModel::CPathEngine::ApplyEmitter( shared_ptr<ITAGeo::CEmitter> pEmitter )
 {
 	if( m_pProgressHandler )
diff --git a/tests/CombinedModel/CombinedModelTest.cpp b/tests/CombinedModel/CombinedModelTest.cpp
index 40ec4116a137c67952c210a2bc54c14635da843b..8afca14498801079b709f38baa817c2b346e8d57 100644
--- a/tests/CombinedModel/CombinedModelTest.cpp
+++ b/tests/CombinedModel/CombinedModelTest.cpp
@@ -179,7 +179,7 @@ int main( int iNumInArgs, char* pcInArgs[] )
 				sw.start();
 
 				pPathEngine->InitializePathEnvironment( pMeshModelList );
-				pPathEngine->ApplyEmitterForTestingOnlyTreeAndImageEdges( pSource ); //Builds tree and image edges
+				pPathEngine->UpdateEmitter( pSource ); //Builds tree and image edges
 				d1 = sw.stop();
 				cout << "Calculation time pre-processing of path environment: " << timeToString( d1 ) << endl;
 
@@ -187,13 +187,13 @@ int main( int iNumInArgs, char* pcInArgs[] )
 
 				sw.start();
 
-				pPathEngine->ApplyEmitterForTestingOnlyImageSources();
+				pPathEngine->UpdateSensor( pReceiver );
 				d2 = sw.stop();
 				cout << "Calculation time applying emitter: " << timeToString( d2 ) << endl;
 
 				sw.start();
 
-				pPathEngine->ApplySensor( pReceiver );
+				pPathEngine->UpdateSensor( pReceiver );
 				d3 = sw.stop();
 				cout << "Calculation time applying sensor: " << timeToString( d3 ) << endl;
 
diff --git a/tests/CombinedModel/GRAS_scene5.cpp b/tests/CombinedModel/GRAS_scene5.cpp
index f009668b66d28c415adf74ba2f41ec1920688217..d7881c3b570b65a3b4bfe40bfea14ae118167b81 100644
--- a/tests/CombinedModel/GRAS_scene5.cpp
+++ b/tests/CombinedModel/GRAS_scene5.cpp
@@ -172,8 +172,7 @@ int main( int, char** )
 		pPathEngine->SetSimulationConfiguration( oSimConf );
 		pPathEngine->SetAbortionCriteria( oAbort );
 		pPathEngine->InitializePathEnvironment( pMeshModelList );
-		pPathEngine->ApplyEmitter( scene.pEmitter );
-		pPathEngine->ApplySensor( scene.pSensor );
+		pPathEngine->SetEntities( scene.pEmitter, scene.pSensor );
 		CPropagationPathList oPathList;
 		pPathEngine->ConstructPropagationPaths( oPathList );
 		cout << "\t -> found " << oPathList.size() << " visible paths" << endl;
diff --git a/tests/CombinedModel/GRAS_scene6.cpp b/tests/CombinedModel/GRAS_scene6.cpp
index 51bb70cb6157703ea3617f0c82f41438863a7b0b..3aaf4dda1aaa27474cfc0f44dcad1b038670fd18 100644
--- a/tests/CombinedModel/GRAS_scene6.cpp
+++ b/tests/CombinedModel/GRAS_scene6.cpp
@@ -163,8 +163,7 @@ int main( int, char** )
 		pPathEngine->SetSimulationConfiguration( oSimConf );
 		pPathEngine->SetAbortionCriteria( oAbort );
 		pPathEngine->InitializePathEnvironment( pMeshModelList );
-		pPathEngine->ApplyEmitter( scene.pEmitter );
-		pPathEngine->ApplySensor( scene.pSensor );
+		pPathEngine->SetEntities( scene.pEmitter, scene.pSensor );
 		CPropagationPathList oPathList;
 		pPathEngine->ConstructPropagationPaths( oPathList );
 		cout << "\t -> found " << oPathList.size() << " visible paths" << endl;
diff --git a/tests/CombinedModel/stienen2019auralization_INTERNOISE.cpp b/tests/CombinedModel/stienen2019auralization_INTERNOISE.cpp
index 2e1e66b1a5575796b7d12dc86cba6fecd531a368..9b4661de70fcddfc7b1503a6349d4852f7fc203c 100644
--- a/tests/CombinedModel/stienen2019auralization_INTERNOISE.cpp
+++ b/tests/CombinedModel/stienen2019auralization_INTERNOISE.cpp
@@ -147,8 +147,7 @@ int main( int, char** )
 		pPathEngine->SetAbortionCriteria( oAbort );
 		pPathEngine->InitializePathEnvironment( pMeshModelList );
 		// Path finding
-		pPathEngine->ApplyEmitter( pEmitter );
-		pPathEngine->ApplySensor( pSensor );
+		pPathEngine->SetEntities( pEmitter, pSensor );
 		CPropagationPathList oPathList;
 		pPathEngine->ConstructPropagationPaths( oPathList );
 		cout << "\t -> found " << oPathList.size() << " visible paths" << endl;