diff --git a/core/Test/BasketControllerTest.php b/core/Test/BasketControllerTest.php
index 3eb22c961535ebab50d0407984d793d98f6685ef..4951a2e68637aaeac569e4e7d2bd4c02f0a7f879 100644
--- a/core/Test/BasketControllerTest.php
+++ b/core/Test/BasketControllerTest.php
@@ -12,6 +12,7 @@ use PHPUnit\Framework\TestCase;
 class BasketControllerTest extends TestCase
 {
     private static $id = null;
+    private static $baskets = null;
 
     public function testCreate()
     {
@@ -348,6 +349,7 @@ class BasketControllerTest extends TestCase
         $this->assertInternalType('array', $responseBody->baskets);
 
         self::$id = $responseBody->baskets[0]->basket_id;
+        self::$baskets = $responseBody->baskets;
     }
 
     public function testUpdateSort()
@@ -358,46 +360,30 @@ class BasketControllerTest extends TestCase
         $environment    = \Slim\Http\Environment::mock(['REQUEST_METHOD' => 'PUT']);
         $request        = \Slim\Http\Request::createFromEnvironment($environment);
 
-        $aArgs = [
-            'method'                => 'DOWN',
-            'power'                 => 'ALL'
-        ];
-        $fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
-
-        $response       = $basketController->updateSort($fullRequest, new \Slim\Http\Response(), ['id' => self::$id]);
-        $responseBody   = json_decode((string)$response->getBody());
+        // DOWN
+        $firstBasket = self::$baskets[0];
+        self::$baskets[0] = self::$baskets[1];
+        self::$baskets[1] = $firstBasket;
 
-        $this->assertInternalType('array', $responseBody->baskets);
-        $this->assertSame(self::$id, $responseBody->baskets[count($responseBody->baskets) - 1]->basket_id);
+        $aArgs = self::$baskets;
 
-        $aArgs = [
-            'method'                => 'UP',
-            'power'                 => 'ONE'
-        ];
         $fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
 
         $response       = $basketController->updateSort($fullRequest, new \Slim\Http\Response(), ['id' => self::$id]);
         $responseBody   = json_decode((string)$response->getBody());
 
         $this->assertInternalType('array', $responseBody->baskets);
-        $this->assertSame(self::$id, $responseBody->baskets[count($responseBody->baskets) - 2]->basket_id);
+        $this->assertSame(self::$id, $responseBody->baskets[1]->basket_id);
 
-        $aArgs = [
-            'method'                => 'DOWN',
-            'power'                 => 'ONE'
-        ];
-        $fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
+        // UP
+        self::$baskets = $responseBody->baskets;
 
-        $response       = $basketController->updateSort($fullRequest, new \Slim\Http\Response(), ['id' => self::$id]);
-        $responseBody   = json_decode((string)$response->getBody());
+        $firstBasket = self::$baskets[0];
+        self::$baskets[0] = self::$baskets[1];
+        self::$baskets[1] = $firstBasket;
 
-        $this->assertInternalType('array', $responseBody->baskets);
-        $this->assertSame(self::$id, $responseBody->baskets[count($responseBody->baskets) - 1]->basket_id);
+        $aArgs = self::$baskets;
 
-        $aArgs = [
-            'method'                => 'UP',
-            'power'                 => 'ALL'
-        ];
         $fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
 
         $response       = $basketController->updateSort($fullRequest, new \Slim\Http\Response(), ['id' => self::$id]);
@@ -406,30 +392,14 @@ class BasketControllerTest extends TestCase
         $this->assertInternalType('array', $responseBody->baskets);
         $this->assertSame(self::$id, $responseBody->baskets[0]->basket_id);
 
-        //  Errors
-        $response       = $basketController->updateSort($fullRequest, new \Slim\Http\Response(), ['id' => 'ABasketWichDoesNotExist']);
-        $responseBody   = json_decode((string)$response->getBody());
-
-        $this->assertInternalType('string', $responseBody->errors);
-        $this->assertSame('Basket not found', $responseBody->errors);
-
-        $response       = $basketController->updateSort($fullRequest, new \Slim\Http\Response(), ['id' => self::$id]);
-        $responseBody   = json_decode((string)$response->getBody());
-
-        $this->assertInternalType('string', $responseBody->errors);
-        $this->assertSame('Basket is already sorted', $responseBody->errors);
+	// Errors
+        $aArgs = self::$baskets;
 
-        $aArgs = [
-            'method'                => 'UPOUSE',
-            'power'                 => 'ALL'
-        ];
         $fullRequest = \httpRequestCustom::addContentInBody($aArgs, $request);
 
-        $response       = $basketController->updateSort($fullRequest, new \Slim\Http\Response(), ['id' => self::$id]);
+        $response       = $basketController->updateSort($fullRequest, new \Slim\Http\Response(), ['id' => 'GAZGAZ']);
         $responseBody   = json_decode((string)$response->getBody());
 
-        $this->assertInternalType('string', $responseBody->errors);
-        $this->assertSame('Bad Request', $responseBody->errors);
+        $this->assertSame('Basket not found', $responseBody->errors);
     }
-
 }