Fix issue with current store code

app/code/community/EcomDev/PHPUnit/Test/Case/Util.php

@@ -511,6 +511,7 @@ class EcomDev_PHPUnit_Test_Case_Util
     public static function setUp()
     {
         self::app()->resetDispatchedEvents();
+        self::$originalStore = Mage::app()->getStore()->getCode();
     }
 
     /**

app/code/community/EcomDev/PHPUnit/Test/Listener.php

@@ -173,6 +173,9 @@ class EcomDev_PHPUnit_Test_Listener implements PHPUnit_Framework_TestListener
         ));
 
         if ($test instanceof PHPUnit_Framework_TestCase) {
+            EcomDev_PHPUnit_Helper::tearDown();
+            EcomDev_PHPUnit_Test_Case_Util::tearDown();
+            
             EcomDev_PHPUnit_Test_Case_Util::getFixture(get_class($test))
                 ->setScope(EcomDev_PHPUnit_Model_FixtureInterface::SCOPE_LOCAL)
                 ->discard(); // Clear applied fixture
@@ -180,9 +183,6 @@ class EcomDev_PHPUnit_Test_Listener implements PHPUnit_Framework_TestListener
             if (EcomDev_PHPUnit_Test_Case_Util::getExpectation(get_class($test))->isLoaded()) {
                 EcomDev_PHPUnit_Test_Case_Util::getExpectation(get_class($test))->discard();
             }
-
-            EcomDev_PHPUnit_Test_Case_Util::tearDown();
-            EcomDev_PHPUnit_Helper::tearDown();
         }
 
         Mage::dispatchEvent('phpunit_test_end_after', array(