diff --git a/Code/Mantid/Framework/Algorithms/src/ReflectometryWorkflowBase.cpp b/Code/Mantid/Framework/Algorithms/src/ReflectometryWorkflowBase.cpp
index 7bba056af73156f19b9e91f6ef5fb6bc063a77d3..38522663a8796941adaa4650ccfff4bf01f2df63 100644
--- a/Code/Mantid/Framework/Algorithms/src/ReflectometryWorkflowBase.cpp
+++ b/Code/Mantid/Framework/Algorithms/src/ReflectometryWorkflowBase.cpp
@@ -373,7 +373,7 @@ ReflectometryWorkflowBase::toLamMonitor(const MatrixWorkspace_sptr &toConvert,
   cropWorkspaceAlg->execute();
   monitorWS = cropWorkspaceAlg->getProperty("OutputWorkspace");
 
-  //If min&max are both 0, we won't do the flat background normalization.
+  // If min&max are both 0, we won't do the flat background normalization.
   if (backgroundMinMax.get<0>() == 0 && backgroundMinMax.get<1>() == 0)
     return monitorWS;
 
@@ -405,8 +405,7 @@ ReflectometryWorkflowBase::toLamDetector(const std::string &processingCommands,
                                          const MatrixWorkspace_sptr &toConvert,
                                          const MinMax &wavelengthMinMax,
                                          const double &wavelengthStep) {
-  // Process the input workspace according to the processingCommands to get a
-  // detector workspace
+
   auto convertUnitsAlg = this->createChildAlgorithm("ConvertUnits");
   convertUnitsAlg->initialize();
   convertUnitsAlg->setProperty("InputWorkspace", toConvert);
@@ -416,6 +415,9 @@ ReflectometryWorkflowBase::toLamDetector(const std::string &processingCommands,
   MatrixWorkspace_sptr detectorWS =
       convertUnitsAlg->getProperty("OutputWorkspace");
 
+  // Process the input workspace according to the processingCommands to get a
+  // detector workspace
+
   auto performIndexAlg = this->createChildAlgorithm("GroupDetectors");
   performIndexAlg->initialize();
   performIndexAlg->setProperty("GroupingPattern", processingCommands);
diff --git a/Code/Mantid/Framework/Algorithms/test/CreateTransmissionWorkspaceTest.h b/Code/Mantid/Framework/Algorithms/test/CreateTransmissionWorkspaceTest.h
index 935c311ac75f79a121887ce6aded88230d7f4dec..c5ee96af3a2f8011c3a4e451c8a5623ca42f45ac 100644
--- a/Code/Mantid/Framework/Algorithms/test/CreateTransmissionWorkspaceTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/CreateTransmissionWorkspaceTest.h
@@ -178,12 +178,12 @@ public:
     alg->setProperty("WavelengthMin", 1.0);
     alg->setProperty("WavelengthMax", 15.0);
     alg->setProperty("WavelengthStep", 0.05);
-    alg->setProperty("I0MonitorIndex", 0);
+    alg->setProperty("I0MonitorIndex", 1);
     alg->setProperty("MonitorBackgroundWavelengthMin", 14.0);
     alg->setProperty("MonitorBackgroundWavelengthMax", 15.0);
     alg->setProperty("MonitorIntegrationWavelengthMin", 4.0);
     alg->setProperty("MonitorIntegrationWavelengthMax", 10.0);
-    alg->setPropertyValue("ProcessingInstructions", "1");
+    alg->setPropertyValue("ProcessingInstructions", "0");
     alg->setPropertyValue("OutputWorkspace", "demo_ws");
     alg->execute();
 
diff --git a/Code/Mantid/Framework/DataObjects/src/Workspace2D.cpp b/Code/Mantid/Framework/DataObjects/src/Workspace2D.cpp
index 983ce24c3764e28b54d47567f33205b9c640f9a0..f6113eb607fb26ae21fbf2268d783f242c524c5d 100644
--- a/Code/Mantid/Framework/DataObjects/src/Workspace2D.cpp
+++ b/Code/Mantid/Framework/DataObjects/src/Workspace2D.cpp
@@ -88,7 +88,9 @@ void Workspace2D::init(const std::size_t &NVectors, const std::size_t &XLength,
   }
 
   // Add axes that reference the data
+  size_t size= m_axes.size();
   m_axes.resize(2);
+  size = m_axes.size();
   m_axes[0] = new API::RefAxis(XLength, this);
   m_axes[1] = new API::SpectraAxis(this);
 }
diff --git a/Code/Mantid/Framework/TestHelpers/src/WorkspaceCreationHelper.cpp b/Code/Mantid/Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
index f1f2a70d9d9b4352ab1cb76ea4565d261da86f03..6a303258e22a57f5ab25e3f07b1a120bbc659568 100644
--- a/Code/Mantid/Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
+++ b/Code/Mantid/Framework/TestHelpers/src/WorkspaceCreationHelper.cpp
@@ -498,7 +498,7 @@ create2DWorkspaceWithReflectometryInstrument(double startX) {
   instrument->markAsMonitor(monitor);
 
   ObjComponent *sample = new ObjComponent("some-surface-holder");
-  source->setPos(V3D(15, 0, 0));
+  sample->setPos(V3D(15, 0, 0));
   instrument->add(sample);
   instrument->markAsSamplePos(sample);
 
@@ -518,10 +518,12 @@ create2DWorkspaceWithReflectometryInstrument(double startX) {
   workspace->setYUnit("Counts");
 
   workspace->setInstrument(instrument);
-  workspace->getSpectrum(0)->clearDetectorIDs();
-  workspace->getSpectrum(1)->clearDetectorIDs();
-  workspace->getSpectrum(0)->addDetectorID(det->getID());
-  workspace->getSpectrum(1)->addDetectorID(monitor->getID());
+  //workspace->getSpectrum(0)->clearDetectorIDs();
+  //workspace->getSpectrum(1)->clearDetectorIDs();
+  workspace->getSpectrum(0)->setDetectorID(det->getID());
+  workspace->getSpectrum(1)->setDetectorID(monitor->getID());
+  //workspace->getSpectrum(0)->addDetectorID(det->getID());
+  //workspace->getSpectrum(1)->addDetectorID(monitor->getID());
   return workspace;
 }