diff --git a/src/Message/PurchaseResponse.php b/src/Message/PurchaseResponse.php
index 78fbb19..d467d4f 100644
--- a/src/Message/PurchaseResponse.php
+++ b/src/Message/PurchaseResponse.php
@@ -8,8 +8,8 @@
 
 namespace Omnipay\OnePay\Message;
 
-use Omnipay\Common\Message\RedirectResponseInterface;
 use Omnipay\Common\Message\RequestInterface;
+use Omnipay\Common\Message\RedirectResponseInterface;
 
 /**
  * @author Vuong Minh <vuongxuongminh@gmail.com>
diff --git a/tests/Domestic/DomesticGatewayTest.php b/tests/Domestic/DomesticGatewayTest.php
index 6bec497..2a1664a 100644
--- a/tests/Domestic/DomesticGatewayTest.php
+++ b/tests/Domestic/DomesticGatewayTest.php
@@ -12,8 +12,8 @@
 use Omnipay\OnePay\Tests\GatewayTestCase;
 use Omnipay\OnePay\Message\IncomingResponse;
 use Omnipay\OnePay\Message\PurchaseResponse;
-use Omnipay\Common\Message\RedirectResponseInterface;
 use Omnipay\Common\Exception\InvalidRequestException;
+use Omnipay\Common\Message\RedirectResponseInterface;
 use Omnipay\Common\Exception\InvalidResponseException;
 
 /**
diff --git a/tests/International/InternationalGatewayTest.php b/tests/International/InternationalGatewayTest.php
index f81e082..d9a29b0 100644
--- a/tests/International/InternationalGatewayTest.php
+++ b/tests/International/InternationalGatewayTest.php
@@ -12,15 +12,15 @@
 use Omnipay\OnePay\Tests\GatewayTestCase;
 use Omnipay\OnePay\Message\IncomingResponse;
 use Omnipay\OnePay\Message\PurchaseResponse;
-use Omnipay\Common\Message\RedirectResponseInterface;
 use Omnipay\Common\Exception\InvalidRequestException;
+use Omnipay\Common\Message\RedirectResponseInterface;
 use Omnipay\Common\Exception\InvalidResponseException;
 
 /**
  * @author Vuong Minh <vuongxuongminh@gmail.com>
  * @since 1.0.0
  */
-class DomesticGatewayTest extends GatewayTestCase
+class InternationalGatewayTest extends GatewayTestCase
 {
     /**
      * @var \Omnipay\OnePay\DomesticGateway
@@ -87,7 +87,7 @@ public function testIncomingSuccess(string $requestMethod)
             'vpc_TransactionNo' => '1625746',
             'vpc_TxnResponseCode' => 0,
             'vpc_Version' => 2,
-            'vpc_SecureHash' => '0331F9D8E0CD9A6BC581B74721658DFD9A5A219145F92DED700C13E4843BB3B0'
+            'vpc_SecureHash' => '0331F9D8E0CD9A6BC581B74721658DFD9A5A219145F92DED700C13E4843BB3B0',
         ]);
 
         $response = call_user_func([$this->gateway, $requestMethod])->send();
diff --git a/tests/Message/IncomingRequestTest.php b/tests/Message/IncomingRequestTest.php
index 2f27a90..935d7bc 100644
--- a/tests/Message/IncomingRequestTest.php
+++ b/tests/Message/IncomingRequestTest.php
@@ -38,7 +38,7 @@ public function setUp()
             'vpc_TransactionNo' => 9,
             'vpc_TxnResponseCode' => 10,
             'vpc_Version' => 11,
-            'vpc_SecureHash' => 12
+            'vpc_SecureHash' => 12,
         ]);
         $this->request = new IncomingRequest($client, $request);
     }
@@ -59,6 +59,5 @@ public function testIncoming()
         $this->assertEquals(10, $data['vpc_TxnResponseCode']);
         $this->assertEquals(11, $data['vpc_Version']);
         $this->assertEquals(12, $data['vpc_SecureHash']);
-
     }
 }
diff --git a/tests/Message/QueryTransactionResponseTest.php b/tests/Message/QueryTransactionResponseTest.php
index 4103e70..4825fd0 100644
--- a/tests/Message/QueryTransactionResponseTest.php
+++ b/tests/Message/QueryTransactionResponseTest.php
@@ -32,7 +32,7 @@ public function testPurchase()
         $response = new QueryTransactionResponse($this->getMockRequest(), [
             'vpc_MerchTxnRef' => 123,
             'vpc_DRExists' => 'Y',
-            'vpc_TxnResponseCode' => 0
+            'vpc_TxnResponseCode' => 0,
         ]);
 
         $this->assertFalse($response->isPending());