diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 90558a5f..56c87f43 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0"?>
 <phpunit bootstrap="bootstrap.php" backupStaticAttributes="false" colors="true">
     <testsuites>
-        <testsuite name="mollie magento plugin tests">
+        <testsuite name="Mollie Magento 1">
             <directory>.</directory>
         </testsuite>
     </testsuites>
     <logging>
         <log type="junit" target="../build/logs/junit-unittests.xml" logIncompleteSkipped="false"/>
-        <log type="coverage-html" target="../build/coverage" charset="UTF-8"
-             yui="true" highlight="true"
-             lowUpperBound="35" highLowerBound="70"/>
+        <log type="coverage-html" target="../build/coverage" charset="UTF-8" yui="true" highlight="true" lowUpperBound="35" highLowerBound="70"/>
         <log type="coverage-clover" target="../build/clover/clover-unittests.xml"/>
     </logging>
     <filter>
diff --git a/tests/unittests/Helper/ApiTest.php b/tests/unittests/Helper/ApiTest.php
index d3128847..d0400f14 100644
--- a/tests/unittests/Helper/ApiTest.php
+++ b/tests/unittests/Helper/ApiTest.php
@@ -28,7 +28,7 @@ protected function setUp()
 			->method("Helper")
 			->will($this->returnValueMap(
 				array(
-					array('mpm/data', $this->data),
+					array('mpm', $this->data),
 					array('core', new Mage_Core_Helper_Data()),
 				)
 			));
diff --git a/tests/unittests/Helper/DataTest.php b/tests/unittests/Helper/DataTest.php
index 83f7420f..5345da77 100644
--- a/tests/unittests/Helper/DataTest.php
+++ b/tests/unittests/Helper/DataTest.php
@@ -41,7 +41,7 @@ protected function setUp()
 
 		$this->mage->expects($this->any())
 			->method("Helper")
-			->with("mpm/data")
+			->with("mpm")
 			->will($this->returnValue($this->HelperData));
 
 		$this->resource = $this->getMock("stdClass", array("getConnection", "getTableName"));
@@ -95,7 +95,7 @@ public function testGetVersion()
 					<depends>
 						<Mage_Payment />
 					</depends>
-					<version>4.0.0</version>
+					<version>4.2.2</version>
 				</Mollie_Mpm>
 			</modules>
 		');
@@ -109,7 +109,7 @@ public function testGetVersion()
 			->method("getConfig")
 			->will($this->returnValue($config));
 
-		$this->assertEquals("4.0.0", $this->HelperData->getModuleVersion());
+		$this->assertEquals("4.2.2", $this->HelperData->getModuleVersion());
 	}
 
 	public function testGetStatusById()
diff --git a/tests/unittests/Model/ApiTest.php b/tests/unittests/Model/ApiTest.php
index 94f0000a..0df814cd 100644
--- a/tests/unittests/Model/ApiTest.php
+++ b/tests/unittests/Model/ApiTest.php
@@ -42,7 +42,7 @@ public function setUp()
 		$this->mage->expects($this->any())
 			->method("Helper")
 			->will($this->returnValueMap(array(
-			array("mpm/data", $this->datahelper),
+			array("mpm", $this->datahelper),
 			array("mpm/api", $this->apihelper),
 		)));
 
@@ -82,7 +82,7 @@ public function testIsNotAvailableIfDisabledInAdmin()
 	{
 		$this->datahelper->expects($this->once())
 			->method("getConfig")
-			->with("mollie","active")
+			->with("mollie", "active")
 			->will($this->returnValue(FALSE));
 
 		$model = new Mollie_Mpm_Model_Api();
diff --git a/tests/unittests/controllers/ApiControllerReportActionTest.php b/tests/unittests/controllers/ApiControllerReportActionTest.php
index eb835cee..3045cebf 100644
--- a/tests/unittests/controllers/ApiControllerReportActionTest.php
+++ b/tests/unittests/controllers/ApiControllerReportActionTest.php
@@ -88,7 +88,7 @@ public function setUp()
 		$this->mage->expects($this->any())
 			->method("Helper")
 			->will($this->returnValueMap(array(
-			array("mpm/data", $this->data_helper),
+			array("mpm", $this->data_helper),
 			array("mpm/api", $this->api_helper),
 			array("directory", $this->directory),
 		)));
diff --git a/tests/unittests/controllers/ApiControllerReturnActionTest.php b/tests/unittests/controllers/ApiControllerReturnActionTest.php
index 2cde3193..2ee3e442 100644
--- a/tests/unittests/controllers/ApiControllerReturnActionTest.php
+++ b/tests/unittests/controllers/ApiControllerReturnActionTest.php
@@ -70,7 +70,7 @@ public function setUp()
 		$this->mage->expects($this->any())
 			->method("Helper")
 			->will($this->returnValueMap(array(
-			array("mpm/data", $this->datahelper),
+			array("mpm", $this->datahelper),
 		)));
 
 		$this->order = $this->getMock("Mage_Sales_Model_Order", array("getData", "setPayment", "getGrandTotal", "getAllItems", "setState", "sendNewOrderEmail", "setEmailSent", "cancel", "save"));