diff --git a/Tests/Unit/Model/Methods/AbstractMethodTest.php b/Tests/Unit/Model/Methods/AbstractMethodTest.php
index 62335ec40bf..05473765f0c 100644
--- a/Tests/Unit/Model/Methods/AbstractMethodTest.php
+++ b/Tests/Unit/Model/Methods/AbstractMethodTest.php
@@ -7,7 +7,6 @@
 use Mollie\Api\Resources\Method;
 use Mollie\Api\Endpoints\MethodEndpoint;
 use Mollie\Api\Resources\MethodCollection;
-use Mollie\Payment\Model\Methods\ApplePay;
 use Mollie\Payment\Model\MollieConfigProvider;
 use Mollie\Payment\Helper\General as MollieHelper;
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -53,7 +52,7 @@ public function testHasTheCorrectCode()
         $reflection = new \ReflectionClass($this->instance);
         $instance = $reflection->newInstanceWithoutConstructor();
 
-        $this->assertEquals($this->code, $instance->getCode());
+        $this->assertEquals('mollie_methods_' . $this->code, $instance->getCode());
     }
 
     public function testIsListedAsActiveMethod()
@@ -72,14 +71,19 @@ public function testIsListedAsActiveMethod()
 
         $methods = $helper->getAllActiveMethods(1);
 
-        $this->assertArrayHasKey($this->code, $methods);
+        if ($this->code == 'paymentlink') {
+            $this->assertArrayNotHasKey('mollie_methods_' . $this->code, $methods);
+            return;
+        }
+
+        $this->assertArrayHasKey('mollie_methods_' . $this->code, $methods);
     }
 
     public function testThatTheMethodIsActive()
     {
         /** @var Method $method */
         $method = $this->objectManager->getObject(Method::class);
-        $method->id = 'applepay';
+        $method->id = $this->code;
         $method->image = new \stdClass;
         $method->image->size2x = 'http://www.example.com/image.png';
 
@@ -95,6 +99,7 @@ public function testThatTheMethodIsActive()
         $instance = $this->objectManager->getObject(MollieConfigProvider::class);
         $methods = $instance->getActiveMethods($mollieApiClient);
 
-        $this->assertArrayHasKey($this->code, $methods);
+        $this->assertArrayHasKey('mollie_methods_' . $this->code, $methods);
+        $this->assertEquals($method->image->size2x, $methods['mollie_methods_' . $this->code]['image']);
     }
 }
\ No newline at end of file
diff --git a/Tests/Unit/Model/Methods/ApplePayTest.php b/Tests/Unit/Model/Methods/ApplePayTest.php
index 27398b5129c..be490ea1227 100644
--- a/Tests/Unit/Model/Methods/ApplePayTest.php
+++ b/Tests/Unit/Model/Methods/ApplePayTest.php
@@ -11,7 +11,7 @@ class ApplePayTest extends AbstractMethodTest
 {
     protected $instance = ApplePay::class;
 
-    protected $code = 'mollie_methods_applepay';
+    protected $code = 'applepay';
 
     public function testTheIncludeWalletsParameterIsUsed()
     {
diff --git a/Tests/Unit/Model/Methods/BancontactTest.php b/Tests/Unit/Model/Methods/BancontactTest.php
new file mode 100644
index 00000000000..2bc03c7f25e
--- /dev/null
+++ b/Tests/Unit/Model/Methods/BancontactTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class BancontactTest extends AbstractMethodTest
+{
+    protected $instance = Bancontact::class;
+
+    protected $code = 'bancontact';
+}
diff --git a/Tests/Unit/Model/Methods/BanktransferTest.php b/Tests/Unit/Model/Methods/BanktransferTest.php
new file mode 100644
index 00000000000..6b377d81536
--- /dev/null
+++ b/Tests/Unit/Model/Methods/BanktransferTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class BanktransferTest extends AbstractMethodTest
+{
+    protected $instance = Banktransfer::class;
+
+    protected $code = 'banktransfer';
+}
diff --git a/Tests/Unit/Model/Methods/BelfiusTest.php b/Tests/Unit/Model/Methods/BelfiusTest.php
new file mode 100644
index 00000000000..836a5f76245
--- /dev/null
+++ b/Tests/Unit/Model/Methods/BelfiusTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class BelfiusTest extends AbstractMethodTest
+{
+    protected $instance = Belfius::class;
+
+    protected $code = 'belfius';
+}
diff --git a/Tests/Unit/Model/Methods/CreditcardTest.php b/Tests/Unit/Model/Methods/CreditcardTest.php
new file mode 100644
index 00000000000..f64bca4205f
--- /dev/null
+++ b/Tests/Unit/Model/Methods/CreditcardTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class CreditcardTest extends AbstractMethodTest
+{
+    protected $instance = Creditcard::class;
+
+    protected $code = 'creditcard';
+}
diff --git a/Tests/Unit/Model/Methods/EpsTest.php b/Tests/Unit/Model/Methods/EpsTest.php
new file mode 100644
index 00000000000..36728046657
--- /dev/null
+++ b/Tests/Unit/Model/Methods/EpsTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class EpsTest extends AbstractMethodTest
+{
+    protected $instance = Eps::class;
+
+    protected $code = 'eps';
+}
diff --git a/Tests/Unit/Model/Methods/GiftcardTest.php b/Tests/Unit/Model/Methods/GiftcardTest.php
new file mode 100644
index 00000000000..dabed70cfcc
--- /dev/null
+++ b/Tests/Unit/Model/Methods/GiftcardTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class GiftcardTest extends AbstractMethodTest
+{
+    protected $instance = Giftcard::class;
+
+    protected $code = 'giftcard';
+}
diff --git a/Tests/Unit/Model/Methods/GiropayTest.php b/Tests/Unit/Model/Methods/GiropayTest.php
new file mode 100644
index 00000000000..fee7e7876d1
--- /dev/null
+++ b/Tests/Unit/Model/Methods/GiropayTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class GiropayTest extends AbstractMethodTest
+{
+    protected $instance = Giropay::class;
+
+    protected $code = 'giropay';
+}
diff --git a/Tests/Unit/Model/Methods/IdealTest.php b/Tests/Unit/Model/Methods/IdealTest.php
new file mode 100644
index 00000000000..e7b78cd9e91
--- /dev/null
+++ b/Tests/Unit/Model/Methods/IdealTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class IdealTest extends AbstractMethodTest
+{
+    protected $instance = Ideal::class;
+
+    protected $code = 'ideal';
+}
diff --git a/Tests/Unit/Model/Methods/InghomepayTest.php b/Tests/Unit/Model/Methods/InghomepayTest.php
new file mode 100644
index 00000000000..aed905e6947
--- /dev/null
+++ b/Tests/Unit/Model/Methods/InghomepayTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class InghomepayTest extends AbstractMethodTest
+{
+    protected $instance = Inghomepay::class;
+
+    protected $code = 'inghomepay';
+}
diff --git a/Tests/Unit/Model/Methods/KbcTest.php b/Tests/Unit/Model/Methods/KbcTest.php
new file mode 100644
index 00000000000..be191850ae3
--- /dev/null
+++ b/Tests/Unit/Model/Methods/KbcTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class KbcTest extends AbstractMethodTest
+{
+    protected $instance = Kbc::class;
+
+    protected $code = 'kbc';
+}
diff --git a/Tests/Unit/Model/Methods/KlarnapaylaterTest.php b/Tests/Unit/Model/Methods/KlarnapaylaterTest.php
new file mode 100644
index 00000000000..12fe4537046
--- /dev/null
+++ b/Tests/Unit/Model/Methods/KlarnapaylaterTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class KlarnapaylaterTest extends AbstractMethodTest
+{
+    protected $instance = Klarnapaylater::class;
+
+    protected $code = 'klarnapaylater';
+}
diff --git a/Tests/Unit/Model/Methods/KlarnasliceitTest.php b/Tests/Unit/Model/Methods/KlarnasliceitTest.php
new file mode 100644
index 00000000000..51f589b76ad
--- /dev/null
+++ b/Tests/Unit/Model/Methods/KlarnasliceitTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class KlarnasliceitTest extends AbstractMethodTest
+{
+    protected $instance = Klarnasliceit::class;
+
+    protected $code = 'klarnasliceit';
+}
diff --git a/Tests/Unit/Model/Methods/PaymentlinkTest.php b/Tests/Unit/Model/Methods/PaymentlinkTest.php
new file mode 100644
index 00000000000..b399c801eba
--- /dev/null
+++ b/Tests/Unit/Model/Methods/PaymentlinkTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class PaymentlinkTest extends AbstractMethodTest
+{
+    protected $instance = Paymentlink::class;
+
+    protected $code = 'paymentlink';
+}
diff --git a/Tests/Unit/Model/Methods/PaypalTest.php b/Tests/Unit/Model/Methods/PaypalTest.php
new file mode 100644
index 00000000000..c70e759a345
--- /dev/null
+++ b/Tests/Unit/Model/Methods/PaypalTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class PaypalTest extends AbstractMethodTest
+{
+    protected $instance = Paypal::class;
+
+    protected $code = 'paypal';
+}
diff --git a/Tests/Unit/Model/Methods/PaysafecardTest.php b/Tests/Unit/Model/Methods/PaysafecardTest.php
new file mode 100644
index 00000000000..375fc2bf93c
--- /dev/null
+++ b/Tests/Unit/Model/Methods/PaysafecardTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class PaysafecardTest extends AbstractMethodTest
+{
+    protected $instance = Paysafecard::class;
+
+    protected $code = 'paysafecard';
+}
diff --git a/Tests/Unit/Model/Methods/Przelewy24Test.php b/Tests/Unit/Model/Methods/Przelewy24Test.php
new file mode 100644
index 00000000000..660a95b2c53
--- /dev/null
+++ b/Tests/Unit/Model/Methods/Przelewy24Test.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class Przelewy24Test extends AbstractMethodTest
+{
+    protected $instance = Przelewy24::class;
+
+    protected $code = 'przelewy24';
+}
diff --git a/Tests/Unit/Model/Methods/SofortTest.php b/Tests/Unit/Model/Methods/SofortTest.php
new file mode 100644
index 00000000000..98413d135b9
--- /dev/null
+++ b/Tests/Unit/Model/Methods/SofortTest.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Mollie\Payment\Model\Methods;
+
+use Mollie\Payment\Tests\Unit\Model\Methods\AbstractMethodTest;
+
+class SofortTest extends AbstractMethodTest
+{
+    protected $instance = Sofort::class;
+
+    protected $code = 'sofort';
+}