diff --git a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
index 8f03e4d12e89bc60654a4846c98943c7fe89ae7a..b45e404f6ed3e7975d5026df98eb2f5acb095f19 100644
--- a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
+++ b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
@@ -271,7 +271,7 @@ RegionImageToRectangularPathListFilter<TInputImage,TOutputPath>
         if (al1 != 0)
           width = vcl_fabs(al2 / al1) * length;
         else { // l1 == 0 and l2 == 0
-          length = width = vcl_sqrt(n); // should happen only when n == 1 anyway
+          length = width = vcl_sqrt(static_cast<double>(n)); // should happen only when n == 1 anyway
         }
       } else {
         length = n;  // Arbitrary representation for degenerate case
diff --git a/Code/IO/otbDEMToOrthoImageGenerator.txx b/Code/IO/otbDEMToOrthoImageGenerator.txx
index 292ff95b0c44bcaf38b024a11c50a0a909fcb432..24302d040d5dc2d44ed9fd0b92869a3aef6aca32 100644
--- a/Code/IO/otbDEMToOrthoImageGenerator.txx
+++ b/Code/IO/otbDEMToOrthoImageGenerator.txx
@@ -79,7 +79,8 @@ DEMToOrthoImageGenerator<TDEMImage, TMapProjection>
 
   if (!m_MapProjection)
   {
-    itkExceptionMacro( << "Please set map projection!" );
+    itkExceptionMacro( <<
+                       "Please set map projection!" );
   }
 
   DEMImagePointerType  DEMImage = this->GetOutput();
diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index 68409d0e8f4a187170a6d4d1cb57c8bd63f8d84e..c9cf9158f2a1a67d087a9b85d7c0ded674e4166b 100755
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -1748,13 +1748,13 @@ ADD_TEST(ioTvDEMToOrthoImageGeneratorTest ${IO_TESTS17}
         otbDEMToOrthoImageGeneratorTest
          ${INPUTDATA}/DEM/srtm_directory
          ${TEMP}/ioTvDEMToOrthoImageGenerator.tif
-         6.5
-         44.5
+         773441 #6.5
+         5044457 #44.5
          500
          500
-         0.002
-         0.002
-	 31 # utm zone
+         200 #0.002
+         -200 #0.002
+	 48 #31 # utm zone
          N # hemisphere
 )
 
diff --git a/Testing/Code/IO/otbDEMHandlerTest.cxx b/Testing/Code/IO/otbDEMHandlerTest.cxx
index c2766dfb8568a2a53fbae461e46ec3c20d0d90b7..6954d9f89b3db6bc059468421ca7f36f79b40e6e 100644
--- a/Testing/Code/IO/otbDEMHandlerTest.cxx
+++ b/Testing/Code/IO/otbDEMHandlerTest.cxx
@@ -48,7 +48,7 @@ int otbDEMHandlerTest(int argc, char * argv[])
   std::ofstream file;
   file.open(outputfilename);
   file << "--- HEIGHT ABOVE MSL TEST ---" << std::endl;
-  file << " geoPoint: "<<geoPoint[1]<<"; "<<geoPoint[0]<< std::endl;
+  file << " geoPoint: "<<geoPoint[1]<<" ; "<<geoPoint[0]<< std::endl;
   file << " -> Height: "<<height<< std::endl;
   file.close();
 
diff --git a/Testing/Code/IO/otbDEMToOrthoImageGeneratorTest.cxx b/Testing/Code/IO/otbDEMToOrthoImageGeneratorTest.cxx
index 3cba24c17f0c706479788e8ae88a4a56ae4dd551..0822d22317ab32bdba9933377cfa846d119383c3 100644
--- a/Testing/Code/IO/otbDEMToOrthoImageGeneratorTest.cxx
+++ b/Testing/Code/IO/otbDEMToOrthoImageGeneratorTest.cxx
@@ -26,7 +26,7 @@ int otbDEMToOrthoImageGeneratorTest(int argc, char * argv[])
 {
   if (argc<9)
   {
-    std::cout << argv[0] <<" folder path , output filename , Longitude Output Orign point , Latitude Output Origin point , X Output Size, Y Output size , X Spacing , Y Spacing"  << std::endl;
+    std::cout << argv[0] <<" DEM folder path , output filename , Easting Output Orign point , Northing Output Origin point , X Output Size, Y Output size , X Spacing , Y Spacing"  << std::endl;
     return EXIT_FAILURE;
   }
 
@@ -59,6 +59,7 @@ int otbDEMToOrthoImageGeneratorTest(int argc, char * argv[])
   SpacingType spacing;
   spacing[0] = ::atof(argv[7]);
   spacing[1] = ::atof(argv[8]);
+  std::cout<<atoi(argv[9])<<std::endl;
 
   mapProj->SetZone(::atoi(argv[9]));
   mapProj->SetHemisphere(argv[10][0]);