diff --git a/readme.md b/readme.md
index af214002..10e3ed10 100755
--- a/readme.md
+++ b/readme.md
@@ -77,3 +77,4 @@ Contact Mollie: [www.mollie.com/nl/about](https://www.mollie.com/nl/about) — i
 + [More info on Giropay via Mollie](https://www.mollie.com/payments/giropay/)
 + [More info on Klarna Pay Later via Mollie](https://www.mollie.com/payments/klarna-pay-later/)
 + [More info on Klarna Slite It via Mollie](https://www.mollie.com/payments/klarna-slice-it/)
+
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 4560e332..d2bc6155 100755
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -4,7 +4,7 @@
 define("DIR_APPLICATION", realpath(dirname(__FILE__) . "/.."));
 define("DIR_SYSTEM",      DIR_APPLICATION . "/system");
 define("DIR_TEMPLATE",    DIR_APPLICATION . "/catalog/view/theme");
-define("VERSION",         '8.2.3');
+define("VERSION",         '9.0.0');
 
 
 date_default_timezone_set("Europe/Amsterdam");
@@ -15,8 +15,8 @@
 
 	$map = array(
 		"MollieHelper"                         => "$project_dir/catalog/controller/payment/mollie/helper.php",
-		"ControllerExtensionPaymentMollieBase" => "$project_dir/catalog/controller/payment/mollie/base.php",
-		"ModelExtensionPaymentMollieBase"      => "$project_dir/catalog/model/payment/mollie/base.php",
+		"ControllerPaymentMollieBase" => "$project_dir/catalog/controller/payment/mollie/base.php",
+		"ModelPaymentMollieBase"      => "$project_dir/catalog/model/payment/mollie/base.php",
 	);
 
 	if (isset($map[$className]))
diff --git a/tests/unittests/catalog/model/ModelExtensionPaymentMollieIdealTest.php b/tests/unittests/catalog/model/ModelPaymentMollieIdealTest.php
similarity index 92%
rename from tests/unittests/catalog/model/ModelExtensionPaymentMollieIdealTest.php
rename to tests/unittests/catalog/model/ModelPaymentMollieIdealTest.php
index eaae564c..9d51b060 100755
--- a/tests/unittests/catalog/model/ModelExtensionPaymentMollieIdealTest.php
+++ b/tests/unittests/catalog/model/ModelPaymentMollieIdealTest.php
@@ -63,7 +63,7 @@ public function testSetPaymentNothingAffected()
 	{
 		$this->model->db->expects($this->once())
 			->method("query")
-			->with("REPLACE INTO `prefix_mollie_payments` (`order_id` ,`transaction_id`, `method`)
+			->with("REPLACE INTO `prefix_mollie_payments` (`order_id` ,`mollie_order_id`, `method`)
 					 VALUES ('1337', '1bba1d8fdbd8103b46151634bdbe0a60', 'idl')");
 
 		$this->model->db->expects($this->once())
@@ -77,7 +77,7 @@ public function testSetPaymentPaymentSet()
 	{
 		$this->model->db->expects($this->once())
 			->method("query")
-			->with("REPLACE INTO `prefix_mollie_payments` (`order_id` ,`transaction_id`, `method`)
+			->with("REPLACE INTO `prefix_mollie_payments` (`order_id` ,`mollie_order_id`, `method`)
 					 VALUES ('1337', '1bba1d8fdbd8103b46151634bdbe0a60', 'idl')");
 
 		$this->model->db->expects($this->once())