diff --git a/src/Connections/Client.php b/src/Client.php
similarity index 98%
rename from src/Connections/Client.php
rename to src/Client.php
index ccbb024..cb0ccd9 100644
--- a/src/Connections/Client.php
+++ b/src/Client.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Timirey\XApi\Connections;
+namespace Timirey\XApi;
 
-use Timirey\XApi\Connections\Enums\Host;
+use Timirey\XApi\Enums\Cmd;
+use Timirey\XApi\Enums\Host;
+use Timirey\XApi\Enums\Level;
 use Timirey\XApi\Payloads\AbstractPayload;
 use Timirey\XApi\Payloads\Data\ChartLastInfoRecord;
 use Timirey\XApi\Payloads\Data\ChartRangeInfoRecord;
 use Timirey\XApi\Payloads\Data\TradeTransInfo;
-use Timirey\XApi\Payloads\Enums\Cmd;
-use Timirey\XApi\Payloads\Enums\Level;
 use Timirey\XApi\Payloads\GetAllSymbolsPayload;
 use Timirey\XApi\Payloads\GetCalendarPayload;
 use Timirey\XApi\Payloads\GetChartLastRequestPayload;
@@ -64,8 +64,6 @@
 
 /**
  * Client class for interacting with the xStation5 API.
- *
- * todo: rename this class and think of better folder structure.
  */
 class Client
 {
@@ -397,7 +395,7 @@ public function getVersion(): GetVersionResponse
      * @param AbstractPayload $payload The payload to send.
      * @param class-string<T> $responseClass The response class to instantiate.
      * @return AbstractResponse The response instance.
-     * @return T
+     * @return AbstractResponse
      */
     protected function sendRequest(AbstractPayload $payload, string $responseClass): AbstractResponse
     {
diff --git a/src/Payloads/Enums/Cmd.php b/src/Enums/Cmd.php
similarity index 93%
rename from src/Payloads/Enums/Cmd.php
rename to src/Enums/Cmd.php
index 1bd6936..1d44866 100644
--- a/src/Payloads/Enums/Cmd.php
+++ b/src/Enums/Cmd.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Payloads\Enums;
+namespace Timirey\XApi\Enums;
 
 /**
  * Enum representing the command type for a trade.
diff --git a/src/Responses/Enums/Day.php b/src/Enums/Day.php
similarity index 92%
rename from src/Responses/Enums/Day.php
rename to src/Enums/Day.php
index 44e8c54..de7bb18 100644
--- a/src/Responses/Enums/Day.php
+++ b/src/Enums/Day.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Responses\Enums;
+namespace Timirey\XApi\Enums;
 
 /**
  * Enum representing the day of the week.
diff --git a/src/Connections/Enums/Host.php b/src/Enums/Host.php
similarity index 86%
rename from src/Connections/Enums/Host.php
rename to src/Enums/Host.php
index 3b8ab5a..2381ae5 100644
--- a/src/Connections/Enums/Host.php
+++ b/src/Enums/Host.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Connections\Enums;
+namespace Timirey\XApi\Enums;
 
 /**
  * Enum representing the WebSocket host URLs for xStation5 API.
diff --git a/src/Responses/Enums/Impact.php b/src/Enums/Impact.php
similarity index 86%
rename from src/Responses/Enums/Impact.php
rename to src/Enums/Impact.php
index fdaf310..137225d 100644
--- a/src/Responses/Enums/Impact.php
+++ b/src/Enums/Impact.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Responses\Enums;
+namespace Timirey\XApi\Enums;
 
 /**
  * Enum representing the impact level.
diff --git a/src/Payloads/Enums/Level.php b/src/Enums/Level.php
similarity index 88%
rename from src/Payloads/Enums/Level.php
rename to src/Enums/Level.php
index f9980be..12a6d71 100644
--- a/src/Payloads/Enums/Level.php
+++ b/src/Enums/Level.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Payloads\Enums;
+namespace Timirey\XApi\Enums;
 
 /**
  * Enum representing the price level.
diff --git a/src/Responses/Enums/MarginMode.php b/src/Enums/MarginMode.php
similarity index 86%
rename from src/Responses/Enums/MarginMode.php
rename to src/Enums/MarginMode.php
index 3dbfc58..009a51e 100644
--- a/src/Responses/Enums/MarginMode.php
+++ b/src/Enums/MarginMode.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Responses\Enums;
+namespace Timirey\XApi\Enums;
 
 /**
  * Enum representing the margin mode.
diff --git a/src/Payloads/Enums/Period.php b/src/Enums/Period.php
similarity index 94%
rename from src/Payloads/Enums/Period.php
rename to src/Enums/Period.php
index aaf351d..e81cb07 100644
--- a/src/Payloads/Enums/Period.php
+++ b/src/Enums/Period.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Payloads\Enums;
+namespace Timirey\XApi\Enums;
 
 /**
  * Enum representing the period.
diff --git a/src/Responses/Enums/ProfitMode.php b/src/Enums/ProfitMode.php
similarity index 81%
rename from src/Responses/Enums/ProfitMode.php
rename to src/Enums/ProfitMode.php
index 3208936..c826044 100644
--- a/src/Responses/Enums/ProfitMode.php
+++ b/src/Enums/ProfitMode.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Responses\Enums;
+namespace Timirey\XApi\Enums;
 
 /**
  * Enum representing the profit mode.
diff --git a/src/Responses/Enums/QuoteId.php b/src/Enums/QuoteId.php
similarity index 88%
rename from src/Responses/Enums/QuoteId.php
rename to src/Enums/QuoteId.php
index 5accc12..489d992 100644
--- a/src/Responses/Enums/QuoteId.php
+++ b/src/Enums/QuoteId.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Responses\Enums;
+namespace Timirey\XApi\Enums;
 
 /**
  * Enum representing the source of price.
diff --git a/src/Responses/Enums/RequestStatus.php b/src/Enums/RequestStatus.php
similarity index 91%
rename from src/Responses/Enums/RequestStatus.php
rename to src/Enums/RequestStatus.php
index 2d6ffb6..b972a12 100644
--- a/src/Responses/Enums/RequestStatus.php
+++ b/src/Enums/RequestStatus.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Responses\Enums;
+namespace Timirey\XApi\Enums;
 
 /**
  * Enum representing the request status.
diff --git a/src/Responses/Enums/Side.php b/src/Enums/Side.php
similarity index 81%
rename from src/Responses/Enums/Side.php
rename to src/Enums/Side.php
index a457d05..4855e30 100644
--- a/src/Responses/Enums/Side.php
+++ b/src/Enums/Side.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Responses\Enums;
+namespace Timirey\XApi\Enums;
 
 /**
  * Enum representing the side of a trade.
diff --git a/src/Payloads/Enums/Type.php b/src/Enums/Type.php
similarity index 93%
rename from src/Payloads/Enums/Type.php
rename to src/Enums/Type.php
index 55b3615..32382b0 100644
--- a/src/Payloads/Enums/Type.php
+++ b/src/Enums/Type.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Timirey\XApi\Payloads\Enums;
+namespace Timirey\XApi\Enums;
 
 /**
  * Enum representing the order type.
diff --git a/src/Payloads/Data/ChartLastInfoRecord.php b/src/Payloads/Data/ChartLastInfoRecord.php
index 9081372..f308e80 100644
--- a/src/Payloads/Data/ChartLastInfoRecord.php
+++ b/src/Payloads/Data/ChartLastInfoRecord.php
@@ -2,12 +2,11 @@
 
 namespace Timirey\XApi\Payloads\Data;
 
-use Timirey\XApi\Payloads\Enums\Period;
+use Timirey\XApi\Enums\Period;
 
 /**
  * Class representing the last chart information record.
  *
- * todo: make period behave as an enum.
  * todo: start should be DateTime?
  */
 class ChartLastInfoRecord
diff --git a/src/Payloads/Data/ChartRangeInfoRecord.php b/src/Payloads/Data/ChartRangeInfoRecord.php
index dc0e7e1..5481a92 100644
--- a/src/Payloads/Data/ChartRangeInfoRecord.php
+++ b/src/Payloads/Data/ChartRangeInfoRecord.php
@@ -2,12 +2,10 @@
 
 namespace Timirey\XApi\Payloads\Data;
 
-use Timirey\XApi\Payloads\Enums\Period;
+use Timirey\XApi\Enums\Period;
 
 /**
  * Class representing the range chart information record.
- *
- * todo: make period behave as an enum.
  */
 class ChartRangeInfoRecord
 {
diff --git a/src/Payloads/Data/TradeTransInfo.php b/src/Payloads/Data/TradeTransInfo.php
index 55b6366..f960797 100644
--- a/src/Payloads/Data/TradeTransInfo.php
+++ b/src/Payloads/Data/TradeTransInfo.php
@@ -2,14 +2,13 @@
 
 namespace Timirey\XApi\Payloads\Data;
 
-use Timirey\XApi\Payloads\Enums\Cmd;
-use Timirey\XApi\Payloads\Enums\Type;
+use Timirey\XApi\Enums\Cmd;
+use Timirey\XApi\Enums\Type;
 
 /**
  * Class representing trade transaction information.
  *
  * todo: find out which properties are optional.
- * todo: make cmd and type behave as enum.
  */
 class TradeTransInfo
 {
diff --git a/src/Payloads/GetProfitCalculationPayload.php b/src/Payloads/GetProfitCalculationPayload.php
index 0820383..8197bb5 100644
--- a/src/Payloads/GetProfitCalculationPayload.php
+++ b/src/Payloads/GetProfitCalculationPayload.php
@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Payloads;
 
-use Timirey\XApi\Payloads\Enums\Cmd;
+use Timirey\XApi\Enums\Cmd;
 
 /**
  * Class that contains payload for the getProfitCalculation command.
diff --git a/src/Payloads/GetTickPricesPayload.php b/src/Payloads/GetTickPricesPayload.php
index c41159e..ae1c973 100644
--- a/src/Payloads/GetTickPricesPayload.php
+++ b/src/Payloads/GetTickPricesPayload.php
@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Payloads;
 
-use Timirey\XApi\Payloads\Enums\Level;
+use Timirey\XApi\Enums\Level;
 
 /**
  * Class that contains payload for the getTickPrices command.
diff --git a/src/Responses/Data/CalendarRecord.php b/src/Responses/Data/CalendarRecord.php
index 710f059..f27dd57 100644
--- a/src/Responses/Data/CalendarRecord.php
+++ b/src/Responses/Data/CalendarRecord.php
@@ -2,12 +2,11 @@
 
 namespace Timirey\XApi\Responses\Data;
 
-use Timirey\XApi\Responses\Enums\Impact;
+use Timirey\XApi\Enums\Impact;
 
 /**
  * Class representing a calendar record.
  *
- * todo: make impact act as enum.
  * todo: time should be DateTime?
  */
 class CalendarRecord
diff --git a/src/Responses/Data/IbRecord.php b/src/Responses/Data/IbRecord.php
index a6d748b..e1986a3 100644
--- a/src/Responses/Data/IbRecord.php
+++ b/src/Responses/Data/IbRecord.php
@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Responses\Data;
 
-use Timirey\XApi\Responses\Enums\Side;
+use Timirey\XApi\Enums\Side;
 
 /**
  * Class representing an IB record.
diff --git a/src/Responses/Data/QuotesRecord.php b/src/Responses/Data/QuotesRecord.php
index 46d1d79..097478a 100644
--- a/src/Responses/Data/QuotesRecord.php
+++ b/src/Responses/Data/QuotesRecord.php
@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Responses\Data;
 
-use Timirey\XApi\Responses\Enums\Day;
+use Timirey\XApi\Enums\Day;
 
 /**
  * Class representing a quotes record.
diff --git a/src/Responses/Data/SymbolRecord.php b/src/Responses/Data/SymbolRecord.php
index da0e612..7ec4275 100644
--- a/src/Responses/Data/SymbolRecord.php
+++ b/src/Responses/Data/SymbolRecord.php
@@ -2,15 +2,14 @@
 
 namespace Timirey\XApi\Responses\Data;
 
-use Timirey\XApi\Responses\Enums\MarginMode;
-use Timirey\XApi\Responses\Enums\ProfitMode;
-use Timirey\XApi\Responses\Enums\QuoteId;
+use Timirey\XApi\Enums\MarginMode;
+use Timirey\XApi\Enums\ProfitMode;
+use Timirey\XApi\Enums\QuoteId;
 
 /**
  * Class representing a symbol record.
  *
  * todo: find out which properties are nullable.
- * todo: make quoteId, marginMode and profitMode behave as enum.
  */
 class SymbolRecord
 {
diff --git a/src/Responses/Data/TickRecord.php b/src/Responses/Data/TickRecord.php
index 3332391..04e3fd9 100644
--- a/src/Responses/Data/TickRecord.php
+++ b/src/Responses/Data/TickRecord.php
@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Responses\Data;
 
-use Timirey\XApi\Responses\Enums\Level;
+use Timirey\XApi\Enums\Level;
 
 /**
  * Class representing a tick record.
diff --git a/src/Responses/Data/TradeRecord.php b/src/Responses/Data/TradeRecord.php
index 6a37634..4547643 100644
--- a/src/Responses/Data/TradeRecord.php
+++ b/src/Responses/Data/TradeRecord.php
@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Responses\Data;
 
-use Timirey\XApi\Responses\Enums\Cmd;
+use Timirey\XApi\Enums\Cmd;
 
 /**
  * Class representing a trade record.
diff --git a/src/Responses/Data/TradingRecord.php b/src/Responses/Data/TradingRecord.php
index cfce7dc..2eaa143 100644
--- a/src/Responses/Data/TradingRecord.php
+++ b/src/Responses/Data/TradingRecord.php
@@ -2,7 +2,7 @@
 
 namespace Timirey\XApi\Responses\Data;
 
-use Timirey\XApi\Responses\Enums\Day;
+use Timirey\XApi\Enums\Day;
 
 /**
  * Class representing a trading record.
diff --git a/src/Responses/Enums/Cmd.php b/src/Responses/Enums/Cmd.php
deleted file mode 100644
index f3a473c..0000000
--- a/src/Responses/Enums/Cmd.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Timirey\XApi\Responses\Enums;
-
-/**
- * Enum representing the command type for a trade.
- */
-enum Cmd: int
-{
-    /**
-     * Buy command.
-     */
-    case BUY = 0;
-
-    /**
-     * Sell command.
-     */
-    case SELL = 1;
-
-    /**
-     * Buy limit order.
-     */
-    case BUY_LIMIT = 2;
-
-    /**
-     * Sell limit order.
-     */
-    case SELL_LIMIT = 3;
-
-    /**
-     * Buy stop order.
-     */
-    case BUY_STOP = 4;
-
-    /**
-     * Sell stop order.
-     */
-    case SELL_STOP = 5;
-
-    /**
-     * Balance operation (read only).
-     */
-    case BALANCE = 6;
-
-    /**
-     * Credit operation (read only).
-     */
-    case CREDIT = 7;
-}
diff --git a/src/Responses/Enums/Level.php b/src/Responses/Enums/Level.php
deleted file mode 100644
index cb35cb2..0000000
--- a/src/Responses/Enums/Level.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Timirey\XApi\Responses\Enums;
-
-/**
- * Enum representing the price level.
- */
-enum Level: int
-{
-    /**
-     * All available levels.
-     */
-    case ALL = -1;
-
-    /**
-     * Base level bid and ask price for instrument.
-     */
-    case BASE = 0;
-
-    /**
-     * Specified level.
-     */
-    case SPECIFIED = 1;
-}
diff --git a/src/Responses/Enums/Period.php b/src/Responses/Enums/Period.php
deleted file mode 100644
index 18ea9ac..0000000
--- a/src/Responses/Enums/Period.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Timirey\XApi\Responses\Enums;
-
-/**
- * Enum representing the period.
- */
-enum Period: int
-{
-    /**
-     * 1 minute.
-     */
-    case PERIOD_M1 = 1;
-
-    /**
-     * 5 minutes.
-     */
-    case PERIOD_M5 = 5;
-
-    /**
-     * 15 minutes.
-     */
-    case PERIOD_M15 = 15;
-
-    /**
-     * 30 minutes.
-     */
-    case PERIOD_M30 = 30;
-
-    /**
-     * 60 minutes (1 hour).
-     */
-    case PERIOD_H1 = 60;
-
-    /**
-     * 240 minutes (4 hours).
-     */
-    case PERIOD_H4 = 240;
-
-    /**
-     * 1440 minutes (1 day).
-     */
-    case PERIOD_D1 = 1440;
-
-    /**
-     * 10080 minutes (1 week).
-     */
-    case PERIOD_W1 = 10080;
-
-    /**
-     * 43200 minutes (30 days).
-     */
-    case PERIOD_MN1 = 43200;
-}
diff --git a/src/Responses/TradeTransactionStatusResponse.php b/src/Responses/TradeTransactionStatusResponse.php
index 431579d..9e572db 100644
--- a/src/Responses/TradeTransactionStatusResponse.php
+++ b/src/Responses/TradeTransactionStatusResponse.php
@@ -2,12 +2,10 @@
 
 namespace Timirey\XApi\Responses;
 
-use Timirey\XApi\Responses\Enums\RequestStatus;
+use Timirey\XApi\Enums\RequestStatus;
 
 /**
  * Class that contains response of the tradeTransactionStatus command.
- *
- * todo: make requestStatus behave as enum.
  */
 class TradeTransactionStatusResponse extends AbstractResponse
 {
diff --git a/tests/Pest.php b/tests/Pest.php
index 22367f0..044e258 100644
--- a/tests/Pest.php
+++ b/tests/Pest.php
@@ -11,7 +11,7 @@
 |
 */
 
-uses(Timirey\XApi\Tests\TestCase::class)->in('Connections');
+uses(Timirey\XApi\Tests\TestCase::class)->in('Unit');
 
 /*
 |--------------------------------------------------------------------------
diff --git a/tests/Connections/ClientCommandTest.php b/tests/Unit/ClientTest.php
similarity index 98%
rename from tests/Connections/ClientCommandTest.php
rename to tests/Unit/ClientTest.php
index 9345a6b..219aca8 100644
--- a/tests/Connections/ClientCommandTest.php
+++ b/tests/Unit/ClientTest.php
@@ -1,12 +1,17 @@
 <?php
 
-use Timirey\XApi\Connections\Client;
-use Timirey\XApi\Connections\Enums\Host;
+use Timirey\XApi\Client;
+use Timirey\XApi\Enums\Cmd;
+use Timirey\XApi\Enums\Day;
+use Timirey\XApi\Enums\Host;
+use Timirey\XApi\Enums\Level;
+use Timirey\XApi\Enums\Period;
+use Timirey\XApi\Enums\RequestStatus;
+use Timirey\XApi\Enums\Side;
+use Timirey\XApi\Enums\Type;
 use Timirey\XApi\Payloads\Data\ChartLastInfoRecord;
 use Timirey\XApi\Payloads\Data\ChartRangeInfoRecord;
 use Timirey\XApi\Payloads\Data\TradeTransInfo;
-use Timirey\XApi\Payloads\Enums\Period;
-use Timirey\XApi\Payloads\Enums\Type;
 use Timirey\XApi\Payloads\GetAllSymbolsPayload;
 use Timirey\XApi\Payloads\GetCalendarPayload;
 use Timirey\XApi\Payloads\GetChartLastRequestPayload;
@@ -43,13 +48,6 @@
 use Timirey\XApi\Responses\Data\TradeRecord;
 use Timirey\XApi\Responses\Data\TradingHoursRecord;
 use Timirey\XApi\Responses\Data\TradingRecord;
-use Timirey\XApi\Responses\Enums\Cmd as ResponseCmd;
-use Timirey\XApi\Payloads\Enums\Cmd as PayloadCmd;
-use Timirey\XApi\Responses\Enums\Day;
-use Timirey\XApi\Responses\Enums\Level as ResponseLevel;
-use Timirey\XApi\Payloads\Enums\Level as PayloadLevel;
-use Timirey\XApi\Responses\Enums\RequestStatus;
-use Timirey\XApi\Responses\Enums\Side;
 use Timirey\XApi\Responses\GetAllSymbolsResponse;
 use Timirey\XApi\Responses\GetCalendarResponse;
 use Timirey\XApi\Responses\GetChartLastRequestResponse;
@@ -302,7 +300,7 @@ public function setWebSocketClient(WebSocketClient $client): void
 
 test('tradeTransaction command', function () {
     $tradeTransInfo = new TradeTransInfo(
-        cmd: PayloadCmd::BUY,
+        cmd: Cmd::BUY,
         customComment: 'Test trade',
         expiration: time() + 3600,
         offset: 0,
@@ -795,7 +793,7 @@ public function setWebSocketClient(WebSocketClient $client): void
 
 test('getProfitCalculation command', function () {
     $closePrice = 1.3000;
-    $cmd = PayloadCmd::BUY;
+    $cmd = Cmd::BUY;
     $openPrice = 1.2233;
     $symbol = 'EURPLN';
     $volume = 1.0;
@@ -913,7 +911,7 @@ public function setWebSocketClient(WebSocketClient $client): void
 });
 
 test('getTickPrices command', function () {
-    $level = PayloadLevel::BASE;
+    $level = Level::BASE;
     $symbols = ['EURPLN', 'AGO.PL'];
     $timestamp = 1262944112000;
     $getTickPricesPayload = new GetTickPricesPayload($level, $symbols, $timestamp);
@@ -932,7 +930,7 @@ public function setWebSocketClient(WebSocketClient $client): void
                     'bid' => 4000.0,
                     'bidVolume' => 16000,
                     'high' => 4000.0,
-                    'level' => ResponseLevel::BASE,
+                    'level' => Level::BASE,
                     'exemode' => 1,
                     'low' => 3500.0,
                     'spreadRaw' => 0.000003,
@@ -962,7 +960,7 @@ public function setWebSocketClient(WebSocketClient $client): void
         ->and($getTickPricesResponse->quotations[0]->bid)->toBe(4000.0)
         ->and($getTickPricesResponse->quotations[0]->bidVolume)->toBe(16000)
         ->and($getTickPricesResponse->quotations[0]->high)->toBe(4000.0)
-        ->and($getTickPricesResponse->quotations[0]->level)->toBe(ResponseLevel::BASE)
+        ->and($getTickPricesResponse->quotations[0]->level)->toBe(Level::BASE)
         ->and($getTickPricesResponse->quotations[0]->low)->toBe(3500.0)
         ->and($getTickPricesResponse->quotations[0]->spreadRaw)->toBe(0.000003)
         ->and($getTickPricesResponse->quotations[0]->spreadTable)->toBe(0.00042)
@@ -1029,7 +1027,7 @@ public function setWebSocketClient(WebSocketClient $client): void
         ->and($getTradeRecordsResponse->tradeRecords[0]->close_time)->toBeNull()
         ->and($getTradeRecordsResponse->tradeRecords[0]->close_timeString)->toBeNull()
         ->and($getTradeRecordsResponse->tradeRecords[0]->closed)->toBeFalse()
-        ->and($getTradeRecordsResponse->tradeRecords[0]->cmd)->toBe(ResponseCmd::BUY)
+        ->and($getTradeRecordsResponse->tradeRecords[0]->cmd)->toBe(Cmd::BUY)
         ->and($getTradeRecordsResponse->tradeRecords[0]->comment)->toBe('Web Trader')
         ->and($getTradeRecordsResponse->tradeRecords[0]->commission)->toBe(0.0)
         ->and($getTradeRecordsResponse->tradeRecords[0]->customComment)->toBe('Some text')
@@ -1112,7 +1110,7 @@ public function setWebSocketClient(WebSocketClient $client): void
         ->and($getTradesResponse->tradeRecords[0]->close_time)->toBeNull()
         ->and($getTradesResponse->tradeRecords[0]->close_timeString)->toBeNull()
         ->and($getTradesResponse->tradeRecords[0]->closed)->toBeFalse()
-        ->and($getTradesResponse->tradeRecords[0]->cmd)->toBe(ResponseCmd::BUY)
+        ->and($getTradesResponse->tradeRecords[0]->cmd)->toBe(Cmd::BUY)
         ->and($getTradesResponse->tradeRecords[0]->comment)->toBe('Web Trader')
         ->and($getTradesResponse->tradeRecords[0]->commission)->toBe(0.0)
         ->and($getTradesResponse->tradeRecords[0]->customComment)->toBe('Some text')
@@ -1196,7 +1194,7 @@ public function setWebSocketClient(WebSocketClient $client): void
         ->and($getTradesHistoryResponse->tradeRecords[0]->close_time)->toBeNull()
         ->and($getTradesHistoryResponse->tradeRecords[0]->close_timeString)->toBeNull()
         ->and($getTradesHistoryResponse->tradeRecords[0]->closed)->toBeFalse()
-        ->and($getTradesHistoryResponse->tradeRecords[0]->cmd)->toBe(ResponseCmd::BUY)
+        ->and($getTradesHistoryResponse->tradeRecords[0]->cmd)->toBe(Cmd::BUY)
         ->and($getTradesHistoryResponse->tradeRecords[0]->comment)->toBe('Web Trader')
         ->and($getTradesHistoryResponse->tradeRecords[0]->commission)->toBe(0.0)
         ->and($getTradesHistoryResponse->tradeRecords[0]->customComment)->toBe('Some text')