diff --git a/Code/Mantid/Framework/Algorithms/CMakeLists.txt b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
index ece113d4e24cf4e71411dad86f7db336ad320e55..da510a85889b9d02dfe328ba78c92ad07c13c2a0 100644
--- a/Code/Mantid/Framework/Algorithms/CMakeLists.txt
+++ b/Code/Mantid/Framework/Algorithms/CMakeLists.txt
@@ -258,7 +258,7 @@ set ( INC_FILES inc/MantidAlgorithms/AbsorptionCorrection.h
 set ( TEST_FILES test/AddSampleLogTest.h
                  test/AlignDetectorsTest.h
 		 test/AnyShapeAbsorptionTest.h
-		 test/ApplyTransmissionCorrectionTest.h # TODO loads data in the constructor
+		 test/ApplyTransmissionCorrectionTest.h
 		 test/BinaryOperationTest.h
 		 test/CalculateEfficiencyTest.h
 		 test/CalculateTransmissionBeamSpreaderTest.h
@@ -307,7 +307,7 @@ set ( TEST_FILES test/AddSampleLogTest.h
 		 test/FindCenterOfMassPosition2Test.h
 		 test/FindDeadDetectorsTest.h
 		 test/FindDetectorsOutsideLimitsTest.h
-		 test/FindPeaksTest.h # TODO loads data in the constructor
+		 test/FindPeaksTest.h
 		 test/FlatBackgroundTest.h
 		 test/FlatPlateAbsorptionTest.h
 		 test/GetDetectorOffsetsTest.h
diff --git a/Code/Mantid/Framework/Algorithms/test/ApplyTransmissionCorrectionTest.h b/Code/Mantid/Framework/Algorithms/test/ApplyTransmissionCorrectionTest.h
index ef7c64450fdff8bb0f9b275595584f687e192a5a..99ce0ed474a2539e2f5b23b47991d99a2971c1e0 100644
--- a/Code/Mantid/Framework/Algorithms/test/ApplyTransmissionCorrectionTest.h
+++ b/Code/Mantid/Framework/Algorithms/test/ApplyTransmissionCorrectionTest.h
@@ -17,8 +17,21 @@ using Mantid::Kernel::UnitFactory;
 class ApplyTransmissionCorrectionTest : public CxxTest::TestSuite
 {
 public:
-  ApplyTransmissionCorrectionTest() : inputWS("input_data_ws")
+  void testBasics()
   {
+    Mantid::Algorithms::ApplyTransmissionCorrection correction;
+
+    TS_ASSERT_EQUALS( correction.name(), "ApplyTransmissionCorrection" );
+    TS_ASSERT_EQUALS( correction.version(), 1 );
+    TS_ASSERT_EQUALS( correction.category(), "SANS" );
+    TS_ASSERT_THROWS_NOTHING( correction.initialize() );
+    TS_ASSERT( correction.isInitialized() );
+  }
+
+  void testExec()
+  {
+    const std::string inputWS("input_data_ws");
+
     Mantid::DataHandling::LoadSpice2D loader;
     loader.initialize();
     loader.setPropertyValue("Filename","BioSANS_test_data.xml");
@@ -41,37 +54,10 @@ public:
     solidcorr.setPropertyValue("InputWorkspace",inputWS);
     solidcorr.setPropertyValue("OutputWorkspace",inputWS);
     solidcorr.execute();
-  }
-
-  ~ApplyTransmissionCorrectionTest()
-  {
-    Mantid::API::AnalysisDataService::Instance().remove(inputWS);
-  }
-
-  void testName()
-  {
-    TS_ASSERT_EQUALS( correction.name(), "ApplyTransmissionCorrection" )
-  }
 
-  void testVersion()
-  {
-    TS_ASSERT_EQUALS( correction.version(), 1 )
-  }
-
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( correction.category(), "SANS" )
-  }
-
-  void testInit()
-  {
-    TS_ASSERT_THROWS_NOTHING( correction.initialize() )
-    TS_ASSERT( correction.isInitialized() )
-  }
-
-  void testExec()
-  {
     Mantid::Algorithms::ApplyTransmissionCorrection correction;
+    TS_ASSERT_THROWS_NOTHING( correction.initialize() );
+
     const std::string transWS("trans");
     Workspace2D_sptr trans_ws = WorkspaceCreationHelper::Create2DWorkspace154(1,1,1);
     trans_ws->getAxis(0)->unit() = UnitFactory::Instance().create("Wavelength");
@@ -79,8 +65,6 @@ public:
     trans_ws->dataE(0)[0] = 0.02;
     Mantid::API::AnalysisDataService::Instance().addOrReplace(transWS, trans_ws);
 
-    if (!correction.isInitialized()) correction.initialize();
-
     TS_ASSERT_THROWS_NOTHING( correction.setPropertyValue("InputWorkspace",inputWS) )
     TS_ASSERT_THROWS_NOTHING( correction.setPropertyValue("TransmissionWorkspace",transWS) )
     const std::string outputWS("result");
@@ -109,8 +93,10 @@ public:
 
   void testExecTransByHand()
   {
+    const std::string inputWS("input_data_ws");
+
     Mantid::Algorithms::ApplyTransmissionCorrection correction;
-    if (!correction.isInitialized()) correction.initialize();
+    TS_ASSERT_THROWS_NOTHING( correction.initialize() );
 
     TS_ASSERT_THROWS_NOTHING( correction.setPropertyValue("InputWorkspace",inputWS) )
     TS_ASSERT_THROWS_NOTHING( correction.setProperty("TransmissionValue",0.6) )
@@ -136,11 +122,9 @@ public:
     TS_ASSERT_DELTA( result->dataY(id)[0], correct_result, 0.001 )
 
     Mantid::API::AnalysisDataService::Instance().remove(outputWS);
+    Mantid::API::AnalysisDataService::Instance().remove(inputWS);
   }
 
-private:
-  Mantid::Algorithms::ApplyTransmissionCorrection correction;
-  std::string inputWS;
 };
 
 #endif /*APPLYTRANSMISSIONCORRECTIONTEST_H_*/