--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@ -6,7 +6,7 @@ $finder = PhpCsFixer\Finder::create()

 $config = new PhpCsFixer\Config();
 return $config->setRules([
-        '@PHP73Migration' => true,
+        '@PHP70Migration' => true,
        '@PSR12' => true
    ])
    ->setFinder($finder)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,97 +1,10 @@
 # Changelog
-All notable changes to this project will be documented in this file.

-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+---

-## [Unreleased](https://git.d3data.de/D3Public/linkmobility-php-client/compare/2.2.0...rel_2.x)
+## 1.0.0.0 (2022-07-13)

-## [2.2.0](https://git.d3data.de/D3Public/linkmobility-php-client/compare/2.1.0...2.2.0) - 2023-06-29
-### Added
- bump psr/http-message dependency to version 2
-
-### Changed
- use assertion exception
-
-## [2.1.0](https://git.d3data.de/D3Public/linkmobility-php-client/compare/2.0.3...2.1.0) - 2023-01-20
-### Added
- installable in PHP > 8.0
- debug logger to log all comunications in debug mode (default Guzzle client only)
- retry middleware to request again in defined error cases  (default Guzzle client only)
-
-### Fixed
- missing getRecipientsList() in RecipientsListInterface
-
-### Deprecated
- unused client argument in recipient list class
-
-### Removed 
- unused ApiException class
-
-## [2.0.3](https://git.d3data.de/D3Public/linkmobility-php-client/compare/2.0.2...2.0.3) - 2022-12-26
-### Changed
- allow Guzzle v7.3 for more backward compatibility
-
-## [2.0.2](https://git.d3data.de/D3Public/linkmobility-php-client/compare/2.0.1...2.0.2) - 2022-07-28
-### Changed
- add support note
- adjust readme
-
-## [2.0.1](https://git.d3data.de/D3Public/linkmobility-php-client/compare/2.0.0...2.0.1) - 2022-07-28
-### Added
- phpstan code checks
-
-### Changed
- improve changelog
- improve code quality
-
-### Fixed
- wrong return type of LoggerHandler::getInstance
-
-## [2.0.0](https://git.d3data.de/D3Public/linkmobility-php-client/compare/1.3.0...2.0.0) - 2022-07-19
-### Changed
- adjust to PHP >= 7.3 and current dependency packages
-
-## [1.3.1](https://git.d3data.de/D3Public/linkmobility-php-client/compare/1.3.0...1.3.1) - 2022-07-28
-### Changed
- improve code quality
-
-### Fixed
- wrong return type of LoggerHandler::getInstance
-
-## [1.3.0](https://git.d3data.de/D3Public/linkmobility-php-client/compare/1.2.1...1.3.0) - 2022-07-18
-### Added
- tests added
-
-### Changed
- tests use generated example phone numbers
- move recipient checks from list to recipient itself
-
-## [1.2.1](https://git.d3data.de/D3Public/linkmobility-php-client/compare/1.2.0...1.2.1) - 2022-07-15
-### Changed
- extend log messages
- sanitize special phone number format before request
-
-## [1.2.0](https://git.d3data.de/D3Public/linkmobility-php-client/compare/1.1.0...1.2.0) - 2022-07-14
-### Added
- collect exception messages in a class
- collect URI parts in a class
-
-### Changed
- make sender number optional
- assign sender address type only if sender is set
- extract logger handler from client
-
-## [1.1.0](https://git.d3data.de/D3Public/linkmobility-php-client/compare/1.0.0...1.1.0) - 2022-07-13
-### Added
- make installable in PHP 8
-
-### Removed
- remove unused dependency
-
-## [1.0.0](https://git.d3data.de/D3Public/linkmobility-php-client/releases/tag/1.0.0) - 2022-07-13
-### Added
 - initial implementation
  - SMS requests (text or binary)
  - SMS responses
-  - recipient managing
+  - recipient managing
--- a/README.en.md
+++ b/README.en.md
@ -1,7 +1,7 @@
 [![deutsche Version](https://logos.oxidmodule.com/de2_xs.svg)](README.md)
 [![english version](https://logos.oxidmodule.com/en2_xs.svg)](README.en.md)

-# LINK Mobility PHP API Client
+# LINK Mobility Austria PHP API Client

 [LINK Mobility](https://www.linkmobility.de/) provides a service for sending mobile messages (SMS, Whatsapp, RCS, Chatbot, ...).

@ -18,8 +18,8 @@ composer require d3/linkmobility-php-client
 ```

 ```
-$client = new \D3\LinkmobilityClient\Client('personal accesstoken');
-\D3\LinkmobilityClient\LoggerHandler::getInstance()->setLogger($logger);  // optional
+$client = new Client('personal accesstoken');
+$client->setLogger($logger);  // optional
 $request = new D3\LinkmobilityClient\SMS\RequestFactory($message, $client)->getSmsRequest())
    ->addRecipient(new D3\LinkmobilityClient\ValueObject\Recipient('recipient number', 'DE'));
 $response = $client->request($request)
@ -39,12 +39,6 @@ If you have a suggestion that would make this better, please fork the repo and c
 - Push to the Branch (git push origin feature/AmazingFeature)
 - Open a Pull Request

-## Support
-
-If you have any questions about the *messaging service* and its *contracts*, please contact the [LINK Mobility Team](https://www.linkmobility.de/kontakt).
-
-For *technical inquiries* you will find the contact options in the [composer.json](composer.json).
-
 ## License
 (status: 2022-07-13)

--- a/README.md
+++ b/README.md
@ -1,7 +1,7 @@
 [![deutsche Version](https://logos.oxidmodule.com/de2_xs.svg)](README.md)
 [![english version](https://logos.oxidmodule.com/en2_xs.svg)](README.en.md)

-# LINK Mobility PHP API Client
+# LINK Mobility Austria PHP API Client

 [LINK Mobility](https://www.linkmobility.de/) stellt einen Service zum Versenden von mobilen Nachrichten (SMS, Whatsapp, RCS, Chatbot, ...) zur Verfügung.

@ -18,8 +18,8 @@ composer require d3/linkmobility-php-client
 ```

 ```
-$client = new \D3\LinkmobilityClient\Client('personal accesstoken');
-\D3\LinkmobilityClient\LoggerHandler::getInstance()->setLogger($logger);  // optional
+$client = new Client('personal accesstoken');
+$client->setLogger($logger);  // optional
 $request = new D3\LinkmobilityClient\SMS\RequestFactory($message, $client)->getSmsRequest())
    ->addRecipient(new D3\LinkmobilityClient\ValueObject\Recipient('recipient number', 'DE'));
 $response = $client->request($request)
@ -39,12 +39,6 @@ Wenn Sie eine Verbesserungsvorschlag haben, legen Sie einen Fork des Respoitorie
 - Übertragen Sie den Branch (git push origin feature/AmazingFeature)
 - Öffnen Sie einen Pull Request

-## Support
-
-Bei Fragen zum *Messaging Service* und dessen *Verträgen* kontaktieren Sie bitte das [LINK Mobility Team](https://www.linkmobility.de/kontakt).
-
-Zu *technischen Anfragen* finden Sie die Kontaktmöglichkeiten in der [composer.json](composer.json).
-
 ## Lizenz
 (Stand: 13.07.2022)

--- a/Tests/ALoggerHandlerTest.php
+++ b/Tests/ALoggerHandlerTest.php
@ -1,104 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * https://www.d3data.de
- *
- * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Daniel Seifert <support@shopmodule.com>
- * @link      https://www.oxidmodule.com
- */
-
-declare(strict_types=1);
-
-namespace D3\LinkmobilityClient\Tests;
-
-use D3\LinkmobilityClient\LoggerHandler;
-use PHPUnit\Framework\MockObject\MockObject;
-use Psr\Log\AbstractLogger;
-use Psr\Log\LoggerInterface;
-use ReflectionException;
-
-class ALoggerHandlerTest extends ApiTestCase
-{
-    /** tests must run as first, because of singleton, which must not initialized before */
-
-    /** @var LoggerHandler */
-    public $loggerHandler;
-
-    /**
-     * @return void
-     */
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->loggerHandler = new LoggerHandler();
-    }
-
-    /**
-     * @return void
-     */
-    public function tearDown(): void
-    {
-        parent::tearDown();
-
-        unset($this->loggerHandler);
-    }
-
-    /**
-     * @test
-     * @return void
-     * @covers \D3\LinkmobilityClient\LoggerHandler::getInstance
-     */
-    public function testGetInstance()
-    {
-        // not existing instance
-        $this->assertInstanceOf(
-            LoggerHandler::class,
-            LoggerHandler::getInstance()
-        );
-
-        // existing instance
-        $this->assertInstanceOf(
-            LoggerHandler::class,
-            LoggerHandler::getInstance()
-        );
-    }
-
-    /**
-     * @test
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\LoggerHandler::__construct
-     */
-    public function testConstruct()
-    {
-        $this->assertInstanceOf(
-            LoggerInterface::class,
-            $this->callMethod($this->loggerHandler, 'getLogger')
-        );
-    }
-
-    /**
-     * @test
-     * @return void
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\LoggerHandler::setLogger
-     * @covers \D3\LinkmobilityClient\LoggerHandler::getLogger
-     */
-    public function testLogger()
-    {
-        /** @var LoggerInterface|MockObject $loggerMock */
-        $loggerMock = $this->getMockBuilder(AbstractLogger::class)
-            ->onlyMethods(['debug', 'error', 'log'])
-            ->getMock();
-
-        $this->callMethod($this->loggerHandler, 'setLogger', [ $loggerMock]);
-        $this->assertSame(
-            $loggerMock,
-            $this->callMethod($this->loggerHandler, 'getLogger')
-        );
-    }
-}
--- a/Tests/ApiTestCase.php
+++ b/Tests/ApiTestCase.php
@ -31,7 +31,7 @@ abstract class ApiTestCase extends TestCase
     * @return mixed
     * @throws ReflectionException
     */
-    public function callMethod($object, string $methodName, array $arguments = [])
+    public function callMethod(object $object, string $methodName, array $arguments = [])
    {
        $class = new ReflectionClass($object);
        $method = $class->getMethod($methodName);
@ -47,7 +47,7 @@ abstract class ApiTestCase extends TestCase
     * @param $value
     * @throws ReflectionException
     */
-    public function setValue($object, string $valueName, $value)
+    public function setValue(object $object, string $valueName, $value)
    {
        $reflection = new ReflectionClass($object);
        $property = $reflection->getProperty($valueName);
@ -63,7 +63,7 @@ abstract class ApiTestCase extends TestCase
     * @return mixed
     * @throws ReflectionException
     */
-    public function getValue($object, string $valueName)
+    public function getValue(object $object, string $valueName)
    {
        $reflection = new ReflectionClass($object);
        $property = $reflection->getProperty($valueName);
--- a/Tests/ClientTest.php
+++ b/Tests/ClientTest.php
@ -17,18 +17,20 @@ namespace D3\LinkmobilityClient\Tests;

 use Assert\InvalidArgumentException;
 use D3\LinkmobilityClient\Client;
-use D3\LinkmobilityClient\LoggerHandler;
+use D3\LinkmobilityClient\Exceptions\ApiException;
 use D3\LinkmobilityClient\Request\RequestInterface;
 use D3\LinkmobilityClient\Response\Response;
 use D3\LinkmobilityClient\Response\ResponseInterface;
 use D3\LinkmobilityClient\SMS\TextRequest;
-use D3\LinkmobilityClient\Url\Url;
-use D3\LinkmobilityClient\Url\UrlInterface;
+use D3\LinkmobilityClient\Url;
+use D3\LinkmobilityClient\UrlInterface;
 use GuzzleHttp\Client as GuzzleClient;
 use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Psr7\Response as GuzzleResponse;
 use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Http\Message\ResponseInterface as MessageResponseInterface;
 use Psr\Http\Message\StreamInterface;
+use Psr\Log\AbstractLogger;
+use Psr\Log\LoggerInterface;
 use ReflectionException;

 class ClientTest extends ApiTestCase
@ -65,7 +67,6 @@ class ClientTest extends ApiTestCase
     * @param $apiClient
     * @return void
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\Client::__construct
     */
    public function testConstruct($apiKey, $apiUrl, $apiClient)
    {
@ -93,38 +94,15 @@ class ClientTest extends ApiTestCase
        return [
            'api key only'  => ['apiKey', null, null],
            'all without client'  => ['apiKey', new Url(), null],
-            'all arguments'  => ['apiKey', new Url(), new GuzzleClient()],
+            'all arguments'  => ['apiKey', new Url(), new GuzzleClient()]
        ];
    }

-    /**
-     * @test
-     * @throws ReflectionException
-     * @return void
-     * @covers \D3\LinkmobilityClient\Client::getDefaultClient
-     */
-    public function testGetDefaultClient()
-    {
-        /** @var Client|MockObject $sut */
-        $sut = $this->getMockBuilder(Client::class)
-            ->setConstructorArgs(['accessTokenFixture'])
-            ->getMock();
-
-        $this->assertInstanceOf(
-            GuzzleClient::class,
-            $this->callMethod(
-                $sut,
-                'getDefaultClient'
-            )
-        );
-    }
-
    /**
     * @test
     * @return void
     * @throws ReflectionException
     * @dataProvider requestPassedDataProvider
-     * @covers \D3\LinkmobilityClient\Client::request
     *
     */
    public function testRequest($requestIsValid)
@ -186,27 +164,48 @@ class ClientTest extends ApiTestCase
    {
        return [
            'request is valid'      => [true],
-            'request is not valid'  => [false],
+            'request is not valid'  => [false]
        ];
    }

    /**
     * @test
+     * @param $useLogger
+     * @param $okStatus
     * @return void
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\Client::rawRequest
+     * @dataProvider rawRequestDataProvider
     */
-    public function testRawRequest()
+    public function testRawRequest($useLogger, $okStatus)
    {
+        $statusCode = $okStatus ? '200' : '301';
+
        /** @var StreamInterface|MockObject $streamMock */
        $streamMock = $this->getMockBuilder(StreamInterface::class)
            ->getMock();

-        /** @var GuzzleResponse|MockObject $responseMock */
-        $responseMock = $this->getMockBuilder( GuzzleResponse::class)
+        /** @var MessageResponseInterface|MockObject $responseMock */
+        $responseMock = $this->getMockBuilder(MessageResponseInterface::class)
+            ->onlyMethods([
+                'getStatusCode',
+                'getBody',
+                'withStatus',
+                'getReasonPhrase',
+                'getProtocolVersion',
+                'withProtocolVersion',
+                'getHeaders',
+                'hasHeader',
+                'getHeader',
+                'getHeaderLine',
+                'withHeader',
+                'withAddedHeader',
+                'withoutHeader',
+                'withBody'
+            ])
            ->disableOriginalConstructor()
            ->getMock();
-        $responseMock->expects($this->atLeastOnce())
+        $responseMock->expects($this->atLeastOnce())->method('getStatusCode')->willReturn($statusCode);
+        $responseMock->expects($useLogger && $okStatus ? $this->atLeastOnce() : $this->never())
            ->method('getBody')->willReturn($streamMock);

        /** @var GuzzleClient|MockObject $requestClientMock */
@ -215,69 +214,70 @@ class ClientTest extends ApiTestCase
            ->getMock();
        $requestClientMock->expects($this->once())->method('request')->willReturn($responseMock);

+        /** @var LoggerInterface|MockObject $loggerMock */
+        $loggerMock = $this->getMockBuilder(AbstractLogger::class)
+            ->onlyMethods(['debug', 'error', 'log'])
+            ->getMock();
+
        /** @var Client|MockObject $clientMock */
        $clientMock = $this->getMockBuilder(Client::class)
            ->disableOriginalConstructor()
            ->onlyMethods([
-                'getLoggerHandler',
+                'hasLogger',
+                'getLogger'
            ])
            ->getMock();
+        $clientMock->method('hasLogger')->willReturn($useLogger);
+        $clientMock->expects($useLogger ? $this->atLeastOnce() : $this->never())
+            ->method('getLogger')->willReturn($loggerMock);
        $this->setValue($clientMock, 'requestClient', $requestClientMock);

+        if (false === $okStatus) {
+            $this->expectException(ApiException::class);
+        }
        $this->assertSame(
            $responseMock,
            $this->callMethod($clientMock, 'rawRequest', ['myUrl'])
        );
    }

+    /**
+     * @return array
+     */
+    public function rawRequestDataProvider(): array
+    {
+        return [
+            'has logger, OK status' => [true, true],
+            'has no logger, OK status' => [false, true],
+            'has logger, NOK status' => [true, false],
+            'has no logger, NOK status' => [false, false],
+        ];
+    }
+
    /**
     * @test
     * @return void
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\Client::getLoggerHandler
     */
-    public function testGetLoggerHandler()
+    public function testLogger()
    {
-        $this->assertInstanceOf(
-            LoggerHandler::class,
-            $this->callMethod(
-                $this->api,
-                'getLoggerHandler'
-            )
-        );
-    }
+        $this->assertFalse($this->callMethod($this->api, 'hasLogger'));
+        $this->assertNull($this->callMethod($this->api, 'getLogger'));

-    /**
-     * @test
-     * @return void
-     * @throws \PHPUnit\Framework\ExpectationFailedException
-     * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @covers \D3\LinkmobilityClient\Client::getLoggerMiddleware
-     */
-    public function testGetLoggerMiddleware()
-    {
-        $this->assertIsCallable(
-            $this->callMethod(
-                $this->api,
-                'getLoggerMiddleware'
-            )
-        );
-    }
+        /** @var LoggerInterface|MockObject $loggerMock */
+        $loggerMock = $this->getMockBuilder(AbstractLogger::class)
+            ->onlyMethods(['debug', 'error', 'log'])
+            ->getMock();

-    /**
-     * @test
-     * @return void
-     * @throws \PHPUnit\Framework\ExpectationFailedException
-     * @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
-     * @covers \D3\LinkmobilityClient\Client::getRetryMiddleware
-     */
-    public function testGetRetryMiddleware()
-    {
-        $this->assertIsCallable(
-            $this->callMethod(
-                $this->api,
-                'getRetryMiddleware'
-            )
+        $this->assertSame(
+            $this->api,
+            $this->callMethod($this->api, 'setLogger', [$loggerMock])
+        );
+
+        $this->assertTrue($this->callMethod($this->api, 'hasLogger'));
+        $this->assertSame(
+            $loggerMock,
+            $this->callMethod($this->api, 'getLogger')
        );
    }
 }
--- a/Tests/README.md
+++ b/Tests/README.md
@ -7,5 +7,5 @@ composer create-project -s dev --prefer-source [--repository '{"type": "vcs", "u
 # Run tests

 ```
-./vendor/bin/phpunit [--no-coverage] [--coverage-html=cov]
+./vendor/bin/phpunit [--no-coverage]
 ```
--- a/Tests/RecipientsList/RecipientsListTest.php
+++ b/Tests/RecipientsList/RecipientsListTest.php
@ -19,10 +19,13 @@ use D3\LinkmobilityClient\Client;
 use D3\LinkmobilityClient\RecipientsList\RecipientsList;
 use D3\LinkmobilityClient\Tests\ApiTestCase;
 use D3\LinkmobilityClient\ValueObject\Recipient;
-use libphonenumber\PhoneNumberFormat;
+use libphonenumber\NumberParseException;
+use libphonenumber\PhoneNumber;
 use libphonenumber\PhoneNumberType;
 use libphonenumber\PhoneNumberUtil;
 use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\AbstractLogger;
+use Psr\Log\LoggerInterface;
 use ReflectionException;
 use stdClass;

@ -31,7 +34,7 @@ class RecipientsListTest extends ApiTestCase
    /** @var RecipientsList */
    public $recipientsList;

-    private $phoneNumberFixture;
+    private $phoneNumberFixture = '01527565839';
    private $phoneCountryFixture = 'DE';

    /**
@ -47,10 +50,6 @@ class RecipientsListTest extends ApiTestCase
            ->getMock();

        $this->recipientsList = new RecipientsList($clientMock);
-
-        $phoneUtil = PhoneNumberUtil::getInstance();
-        $example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
-        $this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
    }

    /**
@ -66,7 +65,6 @@ class RecipientsListTest extends ApiTestCase
    /**
     * @test
     * @return void
-     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::__construct
     */
    public function testConstruct()
    {
@ -86,10 +84,33 @@ class RecipientsListTest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::add
+     */
+    public function testGetPhoneNumberUtil()
+    {
+        $this->assertInstanceOf(
+            PhoneNumberUtil::class,
+            $this->callMethod(
+                $this->recipientsList,
+                'getPhoneNumberUtil'
+            )
+        );
+    }
+
+    /**
+     * @test
+     * @throws ReflectionException
     */
    public function testAddValidNumber()
    {
+        /** @var PhoneNumberUtil|MockObject $phoneNumberUtilMock */
+        $phoneNumberUtilMock = $this->getMockBuilder(PhoneNumberUtil::class)
+            ->onlyMethods(['parse', 'isValidNumber', 'getNumberType'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $phoneNumberUtilMock->method('parse')->willReturn(new PhoneNumber());
+        $phoneNumberUtilMock->method('isValidNumber')->willReturn(true);
+        $phoneNumberUtilMock->method('getNumberType')->willReturn(PhoneNumberType::MOBILE);
+
        /** @var Recipient|MockObject $recipientMock */
        $recipientMock = $this->getMockBuilder(Recipient::class)
            ->onlyMethods(['get', 'getCountryCode'])
@ -98,6 +119,15 @@ class RecipientsListTest extends ApiTestCase
        $recipientMock->method('get')->willReturn($this->phoneNumberFixture);
        $recipientMock->method('getCountryCode')->willReturn($this->phoneCountryFixture);

+        /** @var RecipientsList|MockObject $recListMock */
+        $recListMock = $this->getMockBuilder(RecipientsList::class)
+            ->onlyMethods(['getPhoneNumberUtil'])
+            ->setConstructorArgs([$this->recipientsList->getClient()])
+            ->getMock();
+        $recListMock->method('getPhoneNumberUtil')->willReturn($phoneNumberUtilMock);
+
+        $this->recipientsList = $recListMock;
+
        $this->assertCount(
            0,
            $this->callMethod($this->recipientsList, 'getRecipientsList')
@ -121,8 +151,90 @@ class RecipientsListTest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::clearRecipents
-     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::getRecipientsList
+     * @dataProvider addInvalidNumberDataProvider
+     */
+    public function testAddInvalidNumber($unparsable, $invalidNumber, $invalidNumberType)
+    {
+        /** @var PhoneNumberUtil|MockObject $phoneNumberUtilMock */
+        $phoneNumberUtilMock = $this->getMockBuilder(PhoneNumberUtil::class)
+            ->onlyMethods(['parse', 'isValidNumber', 'getNumberType'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        if ($unparsable) {
+            $phoneNumberUtilMock->method('parse')->willThrowException(new NumberParseException(0, 'message'));
+        } else {
+            $phoneNumberUtilMock->method('parse')->willReturn(new PhoneNumber());
+        }
+        $phoneNumberUtilMock->method('isValidNumber')->willReturn(!$invalidNumber);
+        $phoneNumberUtilMock->method('getNumberType')->willReturn($invalidNumberType ? PhoneNumberType::FIXED_LINE : PhoneNumberType::MOBILE);
+
+        /** @var Recipient|MockObject $recipientMock */
+        $recipientMock = $this->getMockBuilder(Recipient::class)
+            ->onlyMethods(['get', 'getCountryCode'])
+            ->setConstructorArgs([$this->phoneNumberFixture, $this->phoneCountryFixture])
+            ->getMock();
+        $recipientMock->method('get')->willReturn($this->phoneNumberFixture);
+        $recipientMock->method('getCountryCode')->willReturn($this->phoneCountryFixture);
+
+        /** @var LoggerInterface|MockObject $loggerMock */
+        $loggerMock = $this->getMockBuilder(AbstractLogger::class)
+                           ->onlyMethods(['info', 'log'])
+                           ->getMock();
+        $loggerMock->expects($this->atLeastOnce())->method('info')->willReturn(true);
+
+        /** @var Client|MockObject $clientMock */
+        $clientMock = $this->getMockBuilder(Client::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['hasLogger', 'getLogger'])
+            ->getMock();
+        $clientMock->method('hasLogger')->willReturn(true);
+        $clientMock->method('getLogger')->willReturn($loggerMock);
+
+        /** @var RecipientsList|MockObject $recListMock */
+        $recListMock = $this->getMockBuilder(RecipientsList::class)
+            ->onlyMethods(['getPhoneNumberUtil'])
+            ->setConstructorArgs([$clientMock])
+            ->getMock();
+        $recListMock->method('getPhoneNumberUtil')->willReturn($phoneNumberUtilMock);
+
+        $this->recipientsList = $recListMock;
+
+        $this->assertCount(
+            0,
+            $this->callMethod($this->recipientsList, 'getRecipientsList')
+        );
+
+        $this->assertSame(
+            $this->recipientsList,
+            $this->callMethod(
+                $this->recipientsList,
+                'add',
+                [$recipientMock]
+            )
+        );
+
+        $this->assertCount(
+            0,
+            $this->callMethod($this->recipientsList, 'getRecipientsList')
+        );
+    }
+
+    /**
+     * @return array[]
+     */
+    public function addInvalidNumberDataProvider(): array
+    {
+        return [
+            'unparsable'            => [true, false, false],
+            'invalid number'        => [false, true, false],
+            'invalid number type'   => [false, false, true],
+        ];
+    }
+
+    /**
+     * @test
+     * @throws ReflectionException
     */
    public function testClearRecipents()
    {
@ -150,7 +262,6 @@ class RecipientsListTest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::getRecipients
     */
    public function testGetRecipients()
    {
@ -167,7 +278,7 @@ class RecipientsListTest extends ApiTestCase
        $this->assertSame(
            [
                $this->phoneNumberFixture,
-                $this->phoneNumberFixture,
+                $this->phoneNumberFixture
            ],
            $this->callMethod(
                $this->recipientsList,
@ -179,7 +290,6 @@ class RecipientsListTest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::getRecipientsList
     */
    public function testGetRecipientsList()
    {
@ -211,10 +321,6 @@ class RecipientsListTest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::current
-     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::next
-     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::key
-     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::rewind
     */
    public function testCurrentNextKeyRewind()
    {
@ -263,7 +369,6 @@ class RecipientsListTest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::valid
     */
    public function testValid()
    {
@ -280,7 +385,7 @@ class RecipientsListTest extends ApiTestCase
            $this->recipientsList,
            'recipients',
            [
-                'fixture' => new stdClass(),
+                'fixture' => new stdClass()
            ]
        );

@ -295,15 +400,13 @@ class RecipientsListTest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::setClient
-     * @covers \D3\LinkmobilityClient\RecipientsList\RecipientsList::getClient
     */
    public function testSetGetClient()
    {
        /** @var Client|MockObject $clientMock */
        $clientMock = $this->getMockBuilder(Client::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+                           ->disableOriginalConstructor()
+                           ->getMock();

        $this->assertInstanceOf(
            RecipientsList::class,
@ -333,11 +436,11 @@ class RecipientsListTest extends ApiTestCase
        $recipientMock = $this->getMockBuilder(Recipient::class)
            ->onlyMethods([
                'get',
-                'getCountryCode',
+                'getCountryCode'
            ])
            ->setConstructorArgs([
                $this->phoneNumberFixture,
-                $this->phoneCountryFixture,
+                $this->phoneCountryFixture
            ])
            ->getMock();
        $recipientMock->method('get')->willReturn($this->phoneNumberFixture);
@ -347,11 +450,11 @@ class RecipientsListTest extends ApiTestCase
        $recipientMock2 = $this->getMockBuilder(Recipient::class)
            ->onlyMethods([
                'get',
-                'getCountryCode',
+                'getCountryCode'
            ])
            ->setConstructorArgs([
                $this->phoneNumberFixture,
-                $this->phoneCountryFixture,
+                $this->phoneCountryFixture
            ])
            ->getMock();
        $recipientMock2->method('get')->willReturn($this->phoneNumberFixture);
@ -359,7 +462,7 @@ class RecipientsListTest extends ApiTestCase

        $list = [
            'fixture' => $recipientMock,
-            'fixture2' => $recipientMock2,
+            'fixture2' => $recipientMock2
        ];

        $this->setValue(
--- a/Tests/Request/AbstractRequest.php
+++ b/Tests/Request/AbstractRequest.php
@ -17,7 +17,6 @@ namespace D3\LinkmobilityClient\Tests\Request;

 use Assert\InvalidArgumentException;
 use D3\LinkmobilityClient\Client;
-use D3\LinkmobilityClient\Exceptions\RecipientException;
 use D3\LinkmobilityClient\RecipientsList\RecipientsListInterface;
 use D3\LinkmobilityClient\Request\Request;
 use D3\LinkmobilityClient\Request\RequestInterface;
@ -25,10 +24,6 @@ use D3\LinkmobilityClient\SMS\Response;
 use D3\LinkmobilityClient\Tests\ApiTestCase;
 use D3\LinkmobilityClient\ValueObject\Recipient;
 use D3\LinkmobilityClient\ValueObject\Sender;
-use libphonenumber\NumberParseException;
-use libphonenumber\PhoneNumberFormat;
-use libphonenumber\PhoneNumberType;
-use libphonenumber\PhoneNumberUtil;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
@ -67,8 +62,6 @@ abstract class AbstractRequest extends ApiTestCase
     * @test
     * @return void
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::__construct
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::__construct
     */
    public function testConstruct()
    {
@ -89,46 +82,23 @@ abstract class AbstractRequest extends ApiTestCase
        $requestMock->expects($this->atLeastOnce())->method('setMessage')->with($this->equalTo($messageMock))->willReturnSelf();
        $requestMock->expects($this->atLeastOnce())->method('setClient')->with($this->equalTo($clientMock))->willReturnSelf();

-        $this->callMethod(
-            $requestMock,
-            '__construct',
-            [$messageMock, $clientMock]
-        );
-    }
-
-    /**
-     * @test
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getUri
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getUri
-     */
-    public function testGetUri()
-    {
-        $this->assertIsString(
+        $this->assertInstanceOf(
+            Request::class,
            $this->callMethod(
-                $this->request,
-                'getUri'
+                $requestMock,
+                '__construct',
+                [$messageMock, $clientMock]
            )
        );
    }

    /**
     * @test
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::validate
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::validate
-     * @covers \D3\LinkmobilityClient\Request\Request::validate
-     * @return void
     * @throws ReflectionException
-     * @throws RecipientException
-     * @throws NumberParseException
     */
    public function validatePassedTest()
    {
-        $phoneUtil = PhoneNumberUtil::getInstance();
-        $example = $phoneUtil->getExampleNumberForType('DE', PhoneNumberType::MOBILE);
-        $phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
-
-        $recipient = new Recipient($phoneNumberFixture, 'DE');
+        $recipient = new Recipient('015792300219', 'DE');

        /** @var Request|MockObject $requestMock */
        $requestMock = $this->getMockBuilder($this->testClassName)
@ -151,20 +121,11 @@ abstract class AbstractRequest extends ApiTestCase

    /**
     * @test
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::validate
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::validate
-     * @return void
-     * @throws NumberParseException
-     * @throws RecipientException
     * @throws ReflectionException
     */
    public function validateFailedTest()
    {
-        $phoneUtil = PhoneNumberUtil::getInstance();
-        $example = $phoneUtil->getExampleNumberForType('DE', PhoneNumberType::MOBILE);
-        $phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
-
-        $recipient = new Recipient($phoneNumberFixture, 'DE');
+        $recipient = new Recipient('015792300219', 'DE');

        /** @var Request|MockObject $requestMock */
        $requestMock = $this->getMockBuilder($this->testClassName)
@ -190,9 +151,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getRawBody
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getRawBody
-     * @covers \D3\LinkmobilityClient\Request\Request::getRawBody
     */
    public function testGetRawBody()
    {
@ -217,8 +175,6 @@ abstract class AbstractRequest extends ApiTestCase
     * @test
     * @throws ReflectionException
     * @dataProvider getBodyDataProvider
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getBody
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getBody
     */
    public function testGetBody($contentType, $expected)
    {
@ -258,25 +214,25 @@ abstract class AbstractRequest extends ApiTestCase
                ['json' => [
                    'contentCategory' => 'informational',
                    'messageContent' => 'messageContent',
-                    'priority' => 0,
-                    ]],
+                    'priority' => 0
+                    ]]
            ],
            'other' => [
                'other',
                [
                    'contentCategory' => 'informational',
                    'messageContent' => 'messageContent',
-                    'priority' => 0,
-                ],
-            ],
+                    'priority' => 0
+                ]
+            ]
        ];
    }

+
+
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getOptions
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getOptions
     */
    public function testGetOptions()
    {
@ -289,20 +245,20 @@ abstract class AbstractRequest extends ApiTestCase
            ['json' => [
                'contentCategory' => 'informational',
                'messageContent' => 'messageContent',
-                'priority' => 0,
+                'priority' => 0
            ]]
        );

        $this->assertSame(
            ['headers' => [
                'Accept' => 'application/json',
-                'Content-Type' => 'application/json',
+                'Content-Type' => 'application/json'
            ],
            'json' => [
                'contentCategory' => 'informational',
                'messageContent' => 'messageContent',
-                'priority' => 0,
-            ], ],
+                'priority' => 0
+            ]],
            $this->callMethod(
                $requestMock,
                'getOptions'
@ -336,10 +292,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setMessage
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setMessage
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getMessage
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getMessage
     */
    public function setGetMessageTest()
    {
@ -353,10 +305,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setMethod
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setMethod
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getMethod
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getMethod
     */
    public function setGetMethodTest()
    {
@ -366,8 +314,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getMethods
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getMethods
     */
    public function getMethodsTest()
    {
@ -383,10 +329,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setContentType
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setContentType
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getContentType
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getContentType
     */
    public function setGetContentTypeTest()
    {
@ -396,10 +338,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setClientMessageId
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setClientMessageId
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getClientMessageId
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getClientMessageId
     */
    public function setGetClientMessageIdTest()
    {
@ -409,10 +347,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setContentCategory
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setContentCategory
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getContentCategory
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getContentCategory
     */
    public function setGetContentCategoryTest()
    {
@ -422,8 +356,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getContentCategories
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getContentCategories
     */
    public function getContentCategoriesTest()
    {
@ -439,10 +371,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setTestMode
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setTestMode
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getTestMode
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getTestMode
     */
    public function setGetTestModeTest()
    {
@ -452,10 +380,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setMaxSmsPerMessage
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setMaxSmsPerMessage
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getMaxSmsPerMessage
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getMaxSmsPerMessage
     */
    public function setGetMaxSmsPerMessageTest()
    {
@ -465,10 +389,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setMessageType
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setMessageType
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getMessageType
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getMessageType
     */
    public function setGetMessageTypeTest()
    {
@ -478,10 +398,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setNotificationCallbackUrl
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setNotificationCallbackUrl
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getNotificationCallbackUrl
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getNotificationCallbackUrl
     */
    public function setGetNotificationCallbackUrlTest()
    {
@ -491,10 +407,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setPriority
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setPriority
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getPriority
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getPriority
     */
    public function setGetPriorityTest()
    {
@ -504,8 +416,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getRecipientsList
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getRecipientsList
     */
    public function getRecipientsListTest()
    {
@ -521,10 +431,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::sendAsFlashSms
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::sendAsFlashSms
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::doSendAsFlashSms
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::doSendAsFlashSms
     */
    public function setGetFlashSmsTest()
    {
@ -534,10 +440,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setSenderAddress
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setSenderAddress
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getSenderAddress
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getSenderAddress
     */
    public function setGetSenderAddressTest()
    {
@ -551,66 +453,15 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @dataProvider setGetSenderAddressTypeDataProvider
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setSenderAddressType
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setSenderAddressType
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getSenderAddressType
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getSenderAddressType
     */
-    public function testSetGetSenderAddressType($hasSender, $addressType, $expected)
+    public function setGetSenderAddressTypeTest()
    {
-        /** @var Request|MockObject $request */
-        $request = $this->getMockBuilder($this->testClassName)
-            ->setConstructorArgs([$this->request->getMessage(), $this->request->getClient()])
-            ->onlyMethods(['getSenderAddress'])
-            ->getMock();
-
-        if ($hasSender) {
-            /** @var Sender|MockObject $senderMock */
-            $senderMock = $this->getMockBuilder(Sender::class)
-                ->disableOriginalConstructor()
-                ->onlyMethods(['get'])
-                ->getMock();
-            $senderMock->method('get')->willReturn('fixture');
-            $request->method('getSenderAddress')->willReturn($senderMock);
-        } else {
-            $request->method('getSenderAddress')->willReturn(null);
-        }
-
-        $this->assertInstanceOf(
-            Request::class,
-            $this->callMethod(
-                $request,
-                'setSenderAddressType',
-                [$addressType]
-            )
-        );
-
-        $this->assertSame(
-            $expected,
-            $this->callMethod(
-                $request,
-                'getSenderAddressType'
-            )
-        );
-    }
-
-    /**
-     * @return array[]
-     */
-    public function setGetSenderAddressTypeDataProvider(): array
-    {
-        return [
-            'has no sender'                 => [false, 'fixture', null],
-            'has sender and address type'   => [true, 'fixture', 'fixture'],
-        ];
+        $this->checkGetterSetter('fixture', 'setSenderAddressType', 'getSenderAddressType');
    }

    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getSenderAddressTypes
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getSenderAddressTypes
     */
    public function getSenderAddressTypesTest()
    {
@ -626,10 +477,6 @@ abstract class AbstractRequest extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setValidityPeriode
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setValidityPeriode
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getValidityPeriode
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getValidityPeriode
     */
    public function setGetValidityPeriodeTest()
    {
@ -640,8 +487,6 @@ abstract class AbstractRequest extends ApiTestCase
     * @test
     * @throws ReflectionException
     * @dataProvider getResponseInstanceDataProvider
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getResponseInstance
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getResponseInstance
     */
    public function testGetResponseInstance(ResponseInterface $response)
    {
@ -676,7 +521,7 @@ abstract class AbstractRequest extends ApiTestCase
        /** @var StreamInterface|MockObject $streamMock */
        $streamMock = $this->getMockBuilder(StreamInterface::class)
            ->onlyMethods(['getContents', '__toString', 'close', 'detach', 'getSize', 'tell', 'eof', 'isSeekable',
-                'seek', 'rewind', 'isWritable', 'write', 'isReadable', 'read', 'getMetadata', ])
+                'seek', 'rewind', 'isWritable', 'write', 'isReadable', 'read', 'getMetadata'])
            ->getMock();
        $streamMock->method('getContents')->willReturn('{}');

@ -685,22 +530,18 @@ abstract class AbstractRequest extends ApiTestCase
            ->onlyMethods([
                'getBody', 'getStatusCode', 'withStatus', 'getReasonphrase', 'getProtocolVersion',
                'withProtocolVersion', 'getHeaders', 'hasHeader', 'getHeader', 'getHeaderLine',
-                'withHeader', 'withAddedHeader', 'withoutHeader', 'withBody', ])
+                'withHeader', 'withAddedHeader', 'withoutHeader', 'withBody'])
            ->getMock();
        $rawResponseMock->method('getBody')->willReturn($streamMock);

        return [
-            'SMS Response'  => [$rawResponseMock],
+            'SMS Response'  => [$rawResponseMock]
        ];
    }

    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::setClient
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::setClient
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getClient
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getClient
     */
    public function setGetClientTest()
    {
@ -711,33 +552,4 @@ abstract class AbstractRequest extends ApiTestCase

        $this->checkGetterSetter($clientMock, 'setClient', 'getClient');
    }
-
-    /**
-     * @test
-     * @return void
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\BinaryRequest::getResponseClass
-     * @covers \D3\LinkmobilityClient\SMS\TextRequest::getResponseClass
-     */
-    public function testGetResponseClass()
-    {
-        $className = $this->callMethod(
-            $this->request,
-            'getResponseClass'
-        );
-
-        $this->assertIsString(
-            $className
-        );
-
-        /** @var \D3\LinkmobilityClient\Response\ResponseInterface|MockObject $responseMock */
-        $responseMock = $this->getMockBuilder($className)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->assertInstanceOf(
-            \D3\LinkmobilityClient\Response\ResponseInterface::class,
-            $responseMock
-        );
-    }
 }
--- a/Tests/Response/AbstractResponse.php
+++ b/Tests/Response/AbstractResponse.php
@ -29,16 +29,13 @@ abstract class AbstractResponse extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\Response::__construct
-     * @covers \D3\LinkmobilityClient\SMS\Response::getRawResponse
-     * @covers \D3\LinkmobilityClient\SMS\Response::getContent
     */
    public function testConstruct()
    {
        /** @var StreamInterface|MockObject $streamMock */
        $streamMock = $this->getMockBuilder(StreamInterface::class)
            ->onlyMethods(['getContents', '__toString', 'close', 'detach', 'getSize', 'tell', 'eof', 'isSeekable',
-                'seek', 'rewind', 'isWritable', 'write', 'isReadable', 'read', 'getMetadata', ])
+                'seek', 'rewind', 'isWritable', 'write', 'isReadable', 'read', 'getMetadata'])
            ->getMock();
        $streamMock->expects($this->atLeastOnce())->method('getContents')->willReturn(
            '{
@ -53,7 +50,7 @@ abstract class AbstractResponse extends ApiTestCase
            ->onlyMethods([
                'getBody', 'getStatusCode', 'withStatus', 'getReasonphrase', 'getProtocolVersion',
                'withProtocolVersion', 'getHeaders', 'hasHeader', 'getHeader', 'getHeaderLine',
-                'withHeader', 'withAddedHeader', 'withoutHeader', 'withBody', ])
+                'withHeader', 'withAddedHeader', 'withoutHeader', 'withBody'])
            ->getMock();
        $rawResponseMock->method('getBody')->willReturn($streamMock);

@ -86,7 +83,7 @@ abstract class AbstractResponse extends ApiTestCase
     */
    protected function checkProperties($expected, $propertyName, $methodName)
    {
-        /** @var Response|MockObject $responseMock */
+        /** @var Response $response */
        $responseMock = $this->getMockBuilder($this->testClassName)
            ->disableOriginalConstructor()
            ->onlyMethods(['getContent'])
@ -105,7 +102,6 @@ abstract class AbstractResponse extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\Response::getInternalStatus
     */
    public function testGetInternalStatus()
    {
@ -115,7 +111,6 @@ abstract class AbstractResponse extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\Response::getStatusMessage
     */
    public function testGetStatusMessage()
    {
@ -125,17 +120,6 @@ abstract class AbstractResponse extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\Response::getClientMessageId
-     */
-    public function testGetClientMessageId()
-    {
-        $this->checkProperties('clientMessageId', 'clientMessageId', 'getClientMessageId');
-    }
-
-    /**
-     * @test
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\Response::getTransferId
     */
    public function testGetTransferId()
    {
@ -145,7 +129,6 @@ abstract class AbstractResponse extends ApiTestCase
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\Response::getSmsCount
     */
    public function testGetSmsCount()
    {
@ -159,7 +142,6 @@ abstract class AbstractResponse extends ApiTestCase
     *
     * @throws ReflectionException
     * @dataProvider isSuccessfulDataProvider
-     * @covers \D3\LinkmobilityClient\SMS\Response::isSuccessful
     */
    public function testIsSuccessful($statusCode, $expected)
    {
@ -198,7 +180,6 @@ abstract class AbstractResponse extends ApiTestCase
     *
     * @throws ReflectionException
     * @dataProvider getErrorMessageDataProvider
-     * @covers \D3\LinkmobilityClient\SMS\Response::getErrorMessage
     */
    public function testGetErrorMessage($successful, $expected)
    {
@ -226,7 +207,7 @@ abstract class AbstractResponse extends ApiTestCase
    {
        return [
            'successful'    => [true, ''],
-            'not successful'=> [false, 'fixtureMessage'],
+            'not successful'=> [false, 'fixtureMessage']
        ];
    }
 }
--- a/Tests/SMS/RequestFactoryTest.php
+++ b/Tests/SMS/RequestFactoryTest.php
@ -30,7 +30,6 @@ class RequestFactoryTest extends ApiTestCase
     * @test
     * @return void
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\RequestFactory::__construct
     */
    public function testConstruct()
    {
@ -60,7 +59,6 @@ class RequestFactoryTest extends ApiTestCase
     * @return void
     * @throws ReflectionException
     * @dataProvider getTextSmsRequestDataProvider
-     * @covers \D3\LinkmobilityClient\SMS\RequestFactory::getSmsRequest
     */
    public function testGetTextSmsRequest($encoding, $expectedClass)
    {
@ -100,8 +98,8 @@ class RequestFactoryTest extends ApiTestCase
    public function getTextSmsRequestDataProvider(): array
    {
        return [
-            'binary'    => [SmsLength::ENCODING_UCS2, BinaryRequest::class],
-            'ascii'     => [SmsLength::ENCODING_7BIT, TextRequest::class],
+            'binary'    => [RequestFactory::GSM_UCS2, BinaryRequest::class],
+            'ascii'     => [RequestFactory::GSM_7BIT, TextRequest::class]
        ];
    }

@ -109,7 +107,6 @@ class RequestFactoryTest extends ApiTestCase
     * @test
     * @return void
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\SMS\RequestFactory::getSmsLength
     */
    public function testGetSmsLengthInstance()
    {
--- a/Tests/Url/UrlTest.php
+++ b/Tests/Url/UrlTest.php
@ -13,10 +13,9 @@

 declare(strict_types=1);

-namespace D3\LinkmobilityClient\Tests\Url;
+namespace D3\LinkmobilityClient\Tests;

-use D3\LinkmobilityClient\Tests\ApiTestCase;
-use D3\LinkmobilityClient\Url\Url;
+use D3\LinkmobilityClient\Url;
 use ReflectionException;

 class UrlTest extends ApiTestCase
@ -45,7 +44,6 @@ class UrlTest extends ApiTestCase
     * @test
     * @return void
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\Url\Url::getBaseUri
     */
    public function testGetBaseUri()
    {
@ -60,36 +58,4 @@ class UrlTest extends ApiTestCase
            )
        );
    }
-
-    /**
-     * @test
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\Url\Url::getTextSmsUri
-     */
-    public function testGetTextSmsUri()
-    {
-        $uri = $this->callMethod(
-            $this->url,
-            'getTextSmsUri'
-        );
-
-        $this->assertIsString($uri);
-        $this->assertStringStartsWith('/', $uri);
-    }
-
-    /**
-     * @test
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\Url\Url::getBinarySmsUri
-     */
-    public function testGetBinarySmsUri()
-    {
-        $uri = $this->callMethod(
-            $this->url,
-            'getBinarySmsUri'
-        );
-
-        $this->assertIsString($uri);
-        $this->assertStringStartsWith('/', $uri);
-    }
 }
--- a/Tests/ValueObject/RecipientTest.php
+++ b/Tests/ValueObject/RecipientTest.php
@ -16,13 +16,10 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\Tests\ValueObject;

 use Assert\InvalidArgumentException;
-use D3\LinkmobilityClient\Exceptions\RecipientException;
 use D3\LinkmobilityClient\Tests\ApiTestCase;
 use D3\LinkmobilityClient\ValueObject\Recipient;
 use libphonenumber\NumberParseException;
 use libphonenumber\PhoneNumber;
-use libphonenumber\PhoneNumberFormat;
-use libphonenumber\PhoneNumberType;
 use libphonenumber\PhoneNumberUtil;
 use PHPUnit\Framework\MockObject\MockObject;
 use ReflectionException;
@ -32,22 +29,17 @@ class RecipientTest extends ApiTestCase
    /** @var Recipient */
    public $recipient;

-    private $phoneNumberFixture;
+    private $phoneNumberFixture = '01527565839';
    private $phoneCountryFixture = 'DE';

    /**
     * @return void
     * @throws NumberParseException
-     * @throws RecipientException
     */
    public function setUp(): void
    {
        parent::setUp();

-        $phoneUtil = PhoneNumberUtil::getInstance();
-        $example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
-        $this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
-
        $this->recipient = new Recipient($this->phoneNumberFixture, $this->phoneCountryFixture);
    }

@ -65,21 +57,17 @@ class RecipientTest extends ApiTestCase
     * @test
     * @return void
     * @throws NumberParseException
-     * @throws RecipientException
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\Recipient::__construct
     */
    public function testConstructValid()
    {
        /** @var PhoneNumberUtil|MockObject $phoneNumberUtilMock */
        $phoneNumberUtilMock = $this->getMockBuilder(PhoneNumberUtil::class)
-            ->onlyMethods(['parse', 'format', 'isValidNumber', 'getNumberType'])
+            ->onlyMethods(['parse', 'format'])
            ->disableOriginalConstructor()
            ->getMock();
        $phoneNumberUtilMock->method('parse')->willReturn(new PhoneNumber());
        $phoneNumberUtilMock->method('format')->willReturn('+491527565839');
-        $phoneNumberUtilMock->method('isValidNumber')->willReturn(true);
-        $phoneNumberUtilMock->method('getNumberType')->willReturn(PhoneNumberType::MOBILE);

        /** @var Recipient|MockObject $recipientMock */
        $recipientMock = $this->getMockBuilder(Recipient::class)
@ -90,7 +78,7 @@ class RecipientTest extends ApiTestCase
        $recipientMock->__construct($this->phoneNumberFixture, $this->phoneCountryFixture);

        $this->assertSame(
-            '+491527565839',
+            '491527565839',
            $this->callMethod(
                $recipientMock,
                'get'
@ -112,20 +100,17 @@ class RecipientTest extends ApiTestCase
     * @param $number
     * @param $country
     * @param $validNumber
-     * @param $numberType
     * @param $expectedException
     *
     * @return void
     * @throws NumberParseException
-     * @throws RecipientException
     * @dataProvider constructInvalidDataProvider
-     * @covers       \D3\LinkmobilityClient\ValueObject\Recipient::__construct
     */
-    public function testConstructInvalid($number, $country, $validNumber, $numberType, $expectedException)
+    public function testConstructInvalid($number, $country, $validNumber, $expectedException)
    {
        /** @var PhoneNumberUtil|MockObject $phoneNumberUtilMock */
        $phoneNumberUtilMock = $this->getMockBuilder(PhoneNumberUtil::class)
-            ->onlyMethods(['parse', 'format', 'isValidNumber', 'getNumberType'])
+            ->onlyMethods(['parse', 'format', 'isValidNumber'])
            ->disableOriginalConstructor()
            ->getMock();
        if ($number === 'abc') {
@ -135,7 +120,6 @@ class RecipientTest extends ApiTestCase
        }
        $phoneNumberUtilMock->method('format')->willReturn($number);
        $phoneNumberUtilMock->method('isValidNumber')->willReturn($validNumber);
-        $phoneNumberUtilMock->method('getNumberType')->willReturn($numberType);

        /** @var Recipient|MockObject $recipientMock */
        $recipientMock = $this->getMockBuilder(Recipient::class)
@ -149,27 +133,21 @@ class RecipientTest extends ApiTestCase
    }

    /**
-     * @return array[]
+     * @return string[][]
     */
    public function constructInvalidDataProvider(): array
    {
-        $phoneUtil = PhoneNumberUtil::getInstance();
-        $example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
-        $phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
-
        return [
-            'empty number'          => ['', 'DE', true, PhoneNumberType::MOBILE, InvalidArgumentException::class],
-            'invalid country code'  => [$phoneNumberFixture, 'DEX', true, PhoneNumberType::MOBILE, InvalidArgumentException::class],
-            'unparsable'            => ['abc', 'DE', true, PhoneNumberType::MOBILE, NumberParseException::class],
-            'invalid number'        => ['abcd', 'DE', false, PhoneNumberType::MOBILE, RecipientException::class],
-            'not mobile number'     => ['abcd', 'DE', true, PhoneNumberType::FIXED_LINE, RecipientException::class],
+            'empty number'          => ['', 'DE', true, InvalidArgumentException::class],
+            'invalid country code'  => [$this->phoneNumberFixture, 'DEX', true, InvalidArgumentException::class],
+            'unparsable'            => ['abc', 'DE', true, NumberParseException::class],
+            'invalid number'        => ['abc', 'DE', false, NumberParseException::class]
        ];
    }

    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\Recipient::getPhoneNumberUtil
     */
    public function testGetPhoneNumberUtil()
    {
@ -181,65 +159,4 @@ class RecipientTest extends ApiTestCase
            )
        );
    }
-
-    /**
-     * @test
-     * @return void
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\Recipient::getCountryCode
-     */
-    public function testGetCountryCode()
-    {
-        $this->assertSame(
-            $this->phoneCountryFixture,
-            $this->callMethod(
-                $this->recipient,
-                'getCountryCode'
-            )
-        );
-    }
-
-    /**
-     * @test
-     * @return void
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\ValueObject::get
-     * @covers \D3\LinkmobilityClient\ValueObject\StringValueObject::get
-     * @covers \D3\LinkmobilityClient\ValueObject\StringValueObject::__toString
-     * @covers \D3\LinkmobilityClient\ValueObject\Recipient::get
-     */
-    public function testGet()
-    {
-        $this->assertSame(
-            '+4915123456789',
-            (string) $this->recipient
-        );
-
-        $this->assertSame(
-            '+4915123456789',
-            $this->callMethod(
-                $this->recipient,
-                'get'
-            )
-        );
-    }
-
-    /**
-     * @test
-     * @return void
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\ValueObject::getFormatted
-     * @covers \D3\LinkmobilityClient\ValueObject\StringValueObject::getFormatted
-     * @covers \D3\LinkmobilityClient\ValueObject\Recipient::getFormatted
-     */
-    public function testGetFormatted()
-    {
-        $this->assertSame(
-            '4915123456789',
-            $this->callMethod(
-                $this->recipient,
-                'getFormatted'
-            )
-        );
-    }
 }
--- a/Tests/ValueObject/SenderTest.php
+++ b/Tests/ValueObject/SenderTest.php
@ -21,18 +21,16 @@ use D3\LinkmobilityClient\Tests\ApiTestCase;
 use D3\LinkmobilityClient\ValueObject\Sender;
 use libphonenumber\NumberParseException;
 use libphonenumber\PhoneNumber;
-use libphonenumber\PhoneNumberFormat;
-use libphonenumber\PhoneNumberType;
 use libphonenumber\PhoneNumberUtil;
 use PHPUnit\Framework\MockObject\MockObject;
 use ReflectionException;

 class SenderTest extends ApiTestCase
 {
-    /** @var Sender|MockObject */
+    /** @var Sender */
    public $sender;

-    private $phoneNumberFixture;
+    private $phoneNumberFixture = '015792300219';
    private $phoneCountryFixture = 'DE';

    /**
@ -44,10 +42,6 @@ class SenderTest extends ApiTestCase
    {
        parent::setUp();

-        $phoneUtil = PhoneNumberUtil::getInstance();
-        $example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
-        $this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
-
        $this->sender = new Sender($this->phoneNumberFixture, $this->phoneCountryFixture);
    }

@ -67,10 +61,8 @@ class SenderTest extends ApiTestCase
     * @throws NumberParseException
     * @throws RecipientException
     * @throws ReflectionException
-     * @dataProvider constructValidDataProvider
-     * @covers \D3\LinkmobilityClient\ValueObject\Sender::__construct
     */
-    public function testConstructValid($number, $country, $hasNumber)
+    public function testConstructValid()
    {
        /** @var PhoneNumberUtil|MockObject $phoneNumberUtilMock */
        $phoneNumberUtilMock = $this->getMockBuilder(PhoneNumberUtil::class)
@ -87,42 +79,27 @@ class SenderTest extends ApiTestCase
            ->disableOriginalConstructor()
            ->getMock();
        $senderMock->method('getPhoneNumberUtil')->willReturn($phoneNumberUtilMock);
-        $senderMock->__construct($number, $country);
+        $senderMock->__construct($this->phoneNumberFixture, $this->phoneCountryFixture);

        $this->assertSame(
-            $hasNumber,
+            '4915792300219',
            $this->callMethod(
                $senderMock,
                'get'
-            ) === '4915792300219'
+            )
        );
    }

-    /**
-     * @return array[]
-     */
-    public function constructValidDataProvider(): array
-    {
-        $phoneUtil = PhoneNumberUtil::getInstance();
-        $example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
-        $this->phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
-
-        return [
-            'null number'           => [null, $this->phoneCountryFixture, false],
-            'null country'          => [$this->phoneNumberFixture, null, false],
-            'all values'            => [$this->phoneNumberFixture, $this->phoneCountryFixture, true],
-        ];
-    }
-
    /**
     * @test
     * @param $number
     * @param $country
     * @param $validNumber
     * @param $expectedException
-     * @throws ReflectionException
+     *
+     * @throws NumberParseException
+     * @throws RecipientException
     * @dataProvider constructInvalidDataProvider
-     * @covers       \D3\LinkmobilityClient\ValueObject\Sender::__construct
     */
    public function testConstructInvalid($number, $country, $validNumber, $expectedException)
    {
@ -132,14 +109,12 @@ class SenderTest extends ApiTestCase
            ->disableOriginalConstructor()
            ->getMock();
        if ($number === 'abc') {
-            $phoneNumberUtilMock->expects($this->exactly((int) ($country !== 'DEX')))->method('parse')
-                ->willThrowException(new NumberParseException(0, 'message'));
+            $phoneNumberUtilMock->method('parse')->willThrowException(new NumberParseException(0, 'message'));
        } else {
-            $phoneNumberUtilMock->expects($this->exactly((int) ($country !== 'DEX')))->method('parse')
-                ->willReturn(new PhoneNumber());
+            $phoneNumberUtilMock->method('parse')->willReturn(new PhoneNumber());
        }
        $phoneNumberUtilMock->method('format')->willReturn($number);
-        $phoneNumberUtilMock->method('isValidNumber')->willReturn((bool) $validNumber);
+        $phoneNumberUtilMock->method('isValidNumber')->willReturn($validNumber);

        /** @var Sender|MockObject $senderMock */
        $senderMock = $this->getMockBuilder(Sender::class)
@ -149,35 +124,25 @@ class SenderTest extends ApiTestCase
        $senderMock->method('getPhoneNumberUtil')->willReturn($phoneNumberUtilMock);

        $this->expectException($expectedException);
-
-        $this->callMethod(
-            $senderMock,
-            '__construct',
-            [$number, $country]
-        );
+        $senderMock->__construct($number, $country);
    }

    /**
-     * @return array[]
+     * @return string[][]
     */
    public function constructInvalidDataProvider(): array
    {
-        $phoneUtil = PhoneNumberUtil::getInstance();
-        $example = $phoneUtil->getExampleNumberForType($this->phoneCountryFixture, PhoneNumberType::MOBILE);
-        $phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
-
        return [
            'empty number'          => ['', 'DE', true, InvalidArgumentException::class],
-            'invalid country code'  => [$phoneNumberFixture, 'DEX', true, InvalidArgumentException::class],
+            'invalid country code'  => [$this->phoneNumberFixture, 'DEX', true, InvalidArgumentException::class],
            'unparsable'            => ['abc', 'DE', true, NumberParseException::class],
-            'invalid number'        => ['abcd', 'DE', false, RecipientException::class],
+            'invalid number'        => ['abc', 'DE', false, NumberParseException::class]
        ];
    }

    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\Sender::getPhoneNumberUtil
     */
    public function testGetPhoneNumberUtil()
    {
@ -189,42 +154,4 @@ class SenderTest extends ApiTestCase
            )
        );
    }
-
-    /**
-     * @test
-     * @return void
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\ValueObject::get
-     * @covers \D3\LinkmobilityClient\ValueObject\StringValueObject::get
-     * @covers \D3\LinkmobilityClient\ValueObject\Sender::get
-     */
-    public function testGet()
-    {
-        $this->assertSame(
-            '+4915123456789',
-            $this->callMethod(
-                $this->sender,
-                'get'
-            )
-        );
-    }
-
-    /**
-     * @test
-     * @return void
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\ValueObject::getFormatted
-     * @covers \D3\LinkmobilityClient\ValueObject\StringValueObject::getFormatted
-     * @covers \D3\LinkmobilityClient\ValueObject\Sender::getFormatted
-     */
-    public function testGetFormatted()
-    {
-        $this->assertSame(
-            '4915123456789',
-            $this->callMethod(
-                $this->sender,
-                'getFormatted'
-            )
-        );
-    }
 }
--- a/Tests/ValueObject/SmsBinaryMessageTest.php
+++ b/Tests/ValueObject/SmsBinaryMessageTest.php
@ -15,13 +15,14 @@ declare(strict_types=1);

 namespace D3\LinkmobilityClient\Tests\ValueObject;

+use Assert\InvalidArgumentException;
+use D3\LinkmobilityClient\Tests\ApiTestCase;
 use D3\LinkmobilityClient\ValueObject\SmsBinaryMessage;
-use Phlib\SmsLength\Exception\InvalidArgumentException;
 use Phlib\SmsLength\SmsLength;
 use PHPUnit\Framework\MockObject\MockObject;
 use ReflectionException;

-class SmsBinaryMessageTest extends SmsMessageAbstractTest
+class SmsBinaryMessageTest extends ApiTestCase
 {
    /** @var SmsBinaryMessage */
    public $message;
@ -38,12 +39,20 @@ class SmsBinaryMessageTest extends SmsMessageAbstractTest
        $this->message = new SmsBinaryMessage($this->messageFixture);
    }

+    /**
+     * @return void
+     */
+    public function tearDown(): void
+    {
+        parent::tearDown();
+
+        unset($this->message);
+    }
+
    /**
     * @test
     * @return void
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::__construct
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::__construct
     */
    public function testConstructValid()
    {
@ -80,8 +89,6 @@ class SmsBinaryMessageTest extends SmsMessageAbstractTest
     *
     * @throws ReflectionException
     * @dataProvider constructInvalidDataProvider
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::__construct
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::__construct
     */
    public function testConstructInvalid($binaryMessage, $valid, $expectedException)
    {
@ -93,7 +100,7 @@ class SmsBinaryMessageTest extends SmsMessageAbstractTest
        if ($valid) {
            $smsLengthMock->expects($this->never())->method('validate')->willReturn(true);
        } else {
-            $smsLengthMock->expects($this->atLeastOnce())->method('validate')->willThrowException(new InvalidArgumentException());
+            $smsLengthMock->expects($this->atLeastOnce())->method('validate')->willThrowException(new \Phlib\SmsLength\Exception\InvalidArgumentException());
        }

        /** @var SmsBinaryMessage|MockObject $message */
@ -115,11 +122,34 @@ class SmsBinaryMessageTest extends SmsMessageAbstractTest
        );
    }

+    /**
+     * @return string[][]
+     */
+    public function constructInvalidDataProvider(): array
+    {
+        return [
+            'empty message'          => ['', true, InvalidArgumentException::class],
+            'invalid sms message'    => ['abc', false, \Phlib\SmsLength\Exception\InvalidArgumentException::class]
+        ];
+    }
+
    /**
     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::chunkCount
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::chunkCount
+     */
+    public function testGetSmsLengthInstance()
+    {
+        $this->assertInstanceOf(
+            SmsLength::class,
+            $this->callMethod(
+                $this->message,
+                'getSmsLength'
+            )
+        );
+    }
+
+    /**
+     * @throws ReflectionException
     */
    public function testGetChunkCount()
    {
@ -135,9 +165,9 @@ class SmsBinaryMessageTest extends SmsMessageAbstractTest

        /** @var SmsBinaryMessage|MockObject $message */
        $message = $this->getMockBuilder(SmsBinaryMessage::class)
-            ->onlyMethods(['getSmsLength'])
-            ->disableOriginalConstructor()
-            ->getMock();
+                        ->onlyMethods(['getSmsLength'])
+                        ->disableOriginalConstructor()
+                        ->getMock();
        $message->method('getSmsLength')->willReturn($smsLengthMock);

        $this->assertSame(
@ -150,10 +180,7 @@ class SmsBinaryMessageTest extends SmsMessageAbstractTest
    }

    /**
-     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::length
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::length
     */
    public function testGetSize()
    {
@ -184,10 +211,7 @@ class SmsBinaryMessageTest extends SmsMessageAbstractTest
    }

    /**
-     * @test
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::getMessageContent
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::getMessageContent
     */
    public function testGetMessageContent()
    {
--- a/Tests/ValueObject/SmsMessageAbstractTest.php
+++ b/Tests/ValueObject/SmsMessageAbstractTest.php
@ -1,65 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * https://www.d3data.de
- *
- * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Daniel Seifert <support@shopmodule.com>
- * @link      https://www.oxidmodule.com
- */
-
-declare(strict_types=1);
-
-namespace D3\LinkmobilityClient\Tests\ValueObject;
-
-use Assert\InvalidArgumentException;
-use D3\LinkmobilityClient\Tests\ApiTestCase;
-use D3\LinkmobilityClient\ValueObject\SmsBinaryMessage;
-use Phlib\SmsLength\SmsLength;
-use ReflectionException;
-
-abstract class SmsMessageAbstractTest extends ApiTestCase
-{
-    public $message;
-
-    /**
-     * @return void
-     */
-    public function tearDown(): void
-    {
-        parent::tearDown();
-
-        unset($this->message);
-    }
-
-    /**
-     * @return array[]
-     */
-    public function constructInvalidDataProvider(): array
-    {
-        return [
-            'empty message'          => ['', true, InvalidArgumentException::class],
-            'invalid sms message'    => ['abc', false, \Phlib\SmsLength\Exception\InvalidArgumentException::class],
-        ];
-    }
-
-    /**
-     * @test
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsBinaryMessage::getSmsLength
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::getSmsLength
-     */
-    public function testGetSmsLengthInstance()
-    {
-        $this->assertInstanceOf(
-            SmsLength::class,
-            $this->callMethod(
-                $this->message,
-                'getSmsLength'
-            )
-        );
-    }
-}
--- a/Tests/ValueObject/SmsTextMessageTest.php
+++ b/Tests/ValueObject/SmsTextMessageTest.php
@ -21,7 +21,7 @@ use Phlib\SmsLength\SmsLength;
 use PHPUnit\Framework\MockObject\MockObject;
 use ReflectionException;

-class SmsTextMessageTest extends SmsMessageAbstractTest
+class SmsTextMessageTest extends SmsBinaryMessageTest
 {
    /** @var SmsTextMessage */
    public $message;
@ -42,8 +42,6 @@ class SmsTextMessageTest extends SmsMessageAbstractTest
     * @test
     * @return void
     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::__construct
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::__construct
     */
    public function testConstructValid()
    {
@ -80,8 +78,6 @@ class SmsTextMessageTest extends SmsMessageAbstractTest
     *
     * @throws ReflectionException
     * @dataProvider constructInvalidDataProvider
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::__construct
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::__construct
     */
    public function testConstructInvalid($binaryMessage, $valid, $expectedException)
    {
@ -114,104 +110,4 @@ class SmsTextMessageTest extends SmsMessageAbstractTest
            )
        );
    }
-
-    /**
-     * @test
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::chunkCount
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::chunkCount
-     */
-    public function testGetChunkCount()
-    {
-        $expected = 2;
-
-        /** @var SmsLength|MockObject $smsLengthMock */
-        $smsLengthMock = $this->getMockBuilder(SmsLength::class)
-            ->onlyMethods(['getMessageCount', 'validate'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $smsLengthMock->expects($this->once())->method('getMessageCount')->willReturn($expected);
-        $smsLengthMock->method('validate')->willReturn(true);
-
-        /** @var SmsTextMessage|MockObject $message */
-        $message = $this->getMockBuilder(SmsTextMessage::class)
-            ->onlyMethods(['getSmsLength'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $message->method('getSmsLength')->willReturn($smsLengthMock);
-
-        $this->assertSame(
-            $expected,
-            $this->callMethod(
-                $message,
-                'chunkCount'
-            )
-        );
-    }
-
-    /**
-     * @test
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::length
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::length
-     */
-    public function testGetSize()
-    {
-        $expected = 55;
-
-        /** @var SmsLength|MockObject $smsLengthMock */
-        $smsLengthMock = $this->getMockBuilder(SmsLength::class)
-            ->onlyMethods(['getSize', 'validate'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $smsLengthMock->expects($this->once())->method('getSize')->willReturn($expected);
-        $smsLengthMock->method('validate')->willReturn(true);
-
-        /** @var SmsTextMessage|MockObject $message */
-        $message = $this->getMockBuilder(SmsTextMessage::class)
-            ->onlyMethods(['getSmsLength'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $message->method('getSmsLength')->willReturn($smsLengthMock);
-
-        $this->assertSame(
-            $expected,
-            $this->callMethod(
-                $message,
-                'length'
-            )
-        );
-    }
-
-    /**
-     * @test
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsTextMessage::getMessageContent
-     * @covers \D3\LinkmobilityClient\ValueObject\SmsMessageAbstract::getMessageContent
-     */
-    public function testGetMessageContent()
-    {
-        /** @var SmsLength|MockObject $smsLengthMock */
-        $smsLengthMock = $this->getMockBuilder(SmsLength::class)
-            ->onlyMethods(['validate'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $smsLengthMock->method('validate')->willReturn(true);
-
-        /** @var SmsTextMessage|MockObject $message */
-        $message = $this->getMockBuilder(SmsTextMessage::class)
-            ->onlyMethods(['getSmsLength'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $message->method('getSmsLength')->willReturn($smsLengthMock);
-        $message->__construct($this->messageFixture);
-
-        $this->assertSame(
-            'testMessage',
-            $this->callMethod(
-                $message,
-                'getMessageContent'
-            )
-        );
-    }
 }
--- a/Tests/ValueObject/ValueObjectTest.php
+++ b/Tests/ValueObject/ValueObjectTest.php
@ -1,85 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * https://www.d3data.de
- *
- * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Daniel Seifert <support@shopmodule.com>
- * @link      https://www.oxidmodule.com
- */
-
-declare(strict_types=1);
-
-namespace D3\LinkmobilityClient\Tests\ValueObject;
-
-use Assert\InvalidArgumentException;
-use D3\LinkmobilityClient\Tests\ApiTestCase;
-use D3\LinkmobilityClient\ValueObject\ValueObject;
-use libphonenumber\PhoneNumberFormat;
-use libphonenumber\PhoneNumberType;
-use libphonenumber\PhoneNumberUtil;
-use PHPUnit\Framework\MockObject\MockObject;
-use ReflectionException;
-
-class ValueObjectTest extends ApiTestCase
-{
-    /** @var ValueObject|MockObject */
-    public $value;
-
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        $this->value = $this->getMockBuilder(ValueObject::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-    }
-
-    /**
-     * @test
-     * @return void
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\ValueObject::__construct
-     * @covers \D3\LinkmobilityClient\ValueObject\ValueObject::get
-     */
-    public function testConstructValid()
-    {
-        $phoneUtil = PhoneNumberUtil::getInstance();
-        $example = $phoneUtil->getExampleNumberForType('DE', PhoneNumberType::MOBILE);
-        $phoneNumberFixture = $phoneUtil->format($example, PhoneNumberFormat::NATIONAL);
-
-        $this->callMethod(
-            $this->value,
-            '__construct',
-            [$phoneNumberFixture]
-        );
-
-        $this->assertSame(
-            '01512 3456789',
-            $this->getValue(
-                $this->value,
-                'value'
-            )
-        );
-    }
-
-    /**
-     * @test
-     * @return void
-     * @throws ReflectionException
-     * @covers \D3\LinkmobilityClient\ValueObject\ValueObject::__construct
-     */
-    public function testConstructInvalid()
-    {
-        $this->expectException(InvalidArgumentException::class);
-
-        $this->callMethod(
-            $this->value,
-            '__construct',
-            ['']
-        );
-    }
-}
--- a/composer.json
+++ b/composer.json
@ -1,7 +1,7 @@
 {
    "name": "d3/linkmobility-php-client",
    "type": "library",
-    "description": "PHP client for LINK Mobility API",
+    "description": "PHP client for LINK Mobility Austria API",
    "keywords": [
        "LINK Mobility",
        "php",
@ -21,20 +21,19 @@
      "GPL-3.0-or-later"
    ],
    "require": {
-        "php": "^7.3 || ^8.0.3",
-        "beberlei/assert": "^3.3",
-        "guzzlehttp/guzzle": "^7.3",
-        "psr/http-message": "^1.0 || ^2.0",
-        "phlib/sms-length": "^2.0",
+        "php": "^7.0",
+        "beberlei/assert": "^2.9.9",
+        "guzzlehttp/guzzle": "~6.2",
+        "psr/http-message": "~1.0",
+        "symfony/options-resolver": "^4.4.37",
+        "phlib/sms-length": "^1.1.0 || ^2.0.0",
        "giggsey/libphonenumber-for-php": "^8.12.50",
-        "caseyamcl/guzzle_retry_middleware": "^2.8",
        "ext-json": "*"
    },
    "require-dev": {
-        "php": "^7.4 || ~8.0.3",
-        "phpunit/phpunit" : "^9.5",
-        "friendsofphp/php-cs-fixer": "^3.9",
-        "phpstan/phpstan": "^1.8"
+        "php": "^7.2",
+        "phpunit/phpunit" : "^8.0",
+        "friendsofphp/php-cs-fixer": "^2.0"
    },
    "autoload": {
        "psr-4": {
@ -43,9 +42,8 @@
        }
    },
    "scripts": {
-        "test": "./vendor/bin/phpunit",
+        "test": "phpunit",
        "check-style": "./vendor/bin/php-cs-fixer fix --verbose --dry-run",
-        "fix-style": "./vendor/bin/php-cs-fixer fix --verbose",
-        "check-code": "./vendor/bin/phpstan analyse -c phpstan.neon --no-progress --ansi"
+        "fix-style": "./vendor/bin/php-cs-fixer fix --verbose"
    }
 }
--- a/phpstan.neon
+++ b/phpstan.neon
@ -1,6 +0,0 @@
-parameters:
-    paths:
-        - src
-        - Tests
-    level: 5
-    phpVersion: 70300
--- a/phpunit.xml
+++ b/phpunit.xml
@ -1,20 +1,22 @@
-<?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         bootstrap="vendor/autoload.php"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-    <report>
-      <clover outputFile="build/logs/clover.xml"/>
-    </report>
-  </coverage>
-  <testsuite name="linkmobility">
-    <directory>./Tests</directory>
-  </testsuite>
-  <logging/>
+
+<phpunit
+    bootstrap="vendor/autoload.php"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true">
+
+    <testsuite name="tankerkoenig">
+        <directory>./Tests</directory>
+    </testsuite>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
+
 </phpunit>
--- a/src/Client.php
+++ b/src/Client.php
@ -15,18 +15,14 @@ declare(strict_types=1);

 namespace D3\LinkmobilityClient;

-use Assert\InvalidArgumentException;
+use D3\LinkmobilityClient\Exceptions\ApiException;
+use D3\LinkmobilityClient\Exceptions\ExceptionMessages;
 use D3\LinkmobilityClient\Request\RequestInterface;
-use D3\LinkmobilityClient\Url\Url;
-use D3\LinkmobilityClient\Url\UrlInterface;
-use GuzzleHttp\Client as GuzzleClient;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\HandlerStack;
-use GuzzleHttp\MessageFormatter;
-use GuzzleHttp\Middleware;
-use GuzzleRetry\GuzzleRetryMiddleware;
+use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Log\LoggerInterface;

 class Client
 {
@ -34,32 +30,20 @@ class Client
    public $apiUrl;
    public $requestClient;

+    private $logger;
+
    public function __construct(string $accessToken, UrlInterface $apiUrl = null, ClientInterface $client = null)
    {
        $this->accessToken = $accessToken;
        $this->apiUrl = $apiUrl ?: new Url();
-        $this->requestClient = $client ?: $this->getDefaultClient();
-    }
-
-    /**
-     * @return GuzzleClient
-     */
-    protected function getDefaultClient(): GuzzleClient
-    {
-        $handlerStack = HandlerStack::create();
-        $handlerStack->push($this->getLoggerMiddleware());
-        $handlerStack->push($this->getRetryMiddleware());
-
-        return new GuzzleClient( [
-            'base_uri'  => $this->apiUrl->getBaseUri(),
-            'handler'   => $handlerStack
-        ]);
+        $this->requestClient = $client ?: new \GuzzleHttp\Client([ 'base_uri' => $this->apiUrl->getBaseUri() ]);
    }

    /**
     * @param RequestInterface $request
     *
     * @return Response\ResponseInterface
+     * @throws ApiException
     * @throws GuzzleException
     * @throws InvalidArgumentException
     */
@ -78,47 +62,64 @@ class Client
     * @param array  $options
     *
     * @return ResponseInterface
+     * @throws ApiException
     * @throws GuzzleException
     */
    protected function rawRequest($url, string $method = RequestInterface::METHOD_GET, array $options = []): ResponseInterface
    {
        $options['headers']['Authorization'] = 'Bearer '.$this->accessToken;

-        $response = $this->requestClient->request($method, $url, $options);
-        $response->getBody()->rewind();
+        if ($this->hasLogger()) {
+            $this->getLogger()->debug('request '.$url, $options);
+        }
+
+        $response = $this->requestClient->request(
+            $method,
+            $url,
+            $options
+        );
+
+        if ($response->getStatusCode() != 200) {
+            $message = sprintf(ExceptionMessages::NOK_REQUEST_RETURN, $url, $response->getStatusCode());
+            if ($this->hasLogger()) {
+                $this->getLogger()->error($message);
+            }
+            throw new ApiException($message);
+        }
+
+        if ($this->hasLogger()) {
+            $response->getBody()->rewind();
+            $this->getLogger()->debug('response', [$response->getBody()->getContents()]);
+        }

        return $response;
    }

    /**
-     * @return LoggerHandler
-     */
-    public function getLoggerHandler(): LoggerHandler
-    {
-        return LoggerHandler::getInstance();
-    }
-
-    /**
-     * @param string $loglevel
+     * @param mixed $logger
     *
-     * @return callable
+     * @return Client
     */
-    protected function getLoggerMiddleware(string $loglevel = 'debug'): callable
+    public function setLogger(LoggerInterface $logger): Client
    {
-        return Middleware::log(
-            $this->getLoggerHandler()->getLogger(),
-            new MessageFormatter(MessageFormatter::DEBUG),
-            $loglevel
-        );
+        $this->logger = $logger;
+
+        return $this;
    }

    /**
-     * @return callable
+     * @return bool
     */
-    protected function getRetryMiddleware(): callable
+    public function hasLogger(): bool
    {
-        return GuzzleRetryMiddleware::factory([
-            'max_retry_attempts' => 3
-        ]);
+        return $this->logger instanceof LoggerInterface;
+    }
+
+    /**
+     * @return LoggerInterface|null
+     */
+    public function getLogger()
+    {
+        return $this->hasLogger() ? $this->logger : null;
    }
 }
--- a/src/Exceptions/NoSenderDefinedException.php
+++ b/src/Exceptions/NoSenderDefinedException.php
@ -15,6 +15,6 @@ declare(strict_types=1);

 namespace D3\LinkmobilityClient\Exceptions;

-class NoSenderDefinedException extends LinkmobilityException
+class ApiException extends LinkmobilityException
 {
 }
--- a/src/Exceptions/ExceptionMessages.php
+++ b/src/Exceptions/ExceptionMessages.php
@ -17,15 +17,11 @@ namespace D3\LinkmobilityClient\Exceptions;

 class ExceptionMessages
 {
-    public const INVALID_SENDER             = 'invalid sender phone number';
+    public const INVALID_SENDER            = 'invalid sender phone number';

-    public const NOK_REQUEST_RETURN         = 'request %1$s returns status code %2$s';
+    public const NOK_REQUEST_RETURN        = 'request %1$s returns status code %2$s';

-    public const INVALID_RECIPIENT_PHONE    = 'invalid recipient phone number';
+    public const INVALID_RECIPIENT_PHONE   = 'invalid recipient phone number';

-    public const NOT_A_MOBILE_NUMBER        = 'not a mobile number';
-
-    public const EMPTY_RECIPIENT_LIST       = 'request must contain a valid recipient';
-
-    public const DEBUG_NOSENDERORCOUNTRYCODE= 'no sender number or sender country code defined, use fallback to account default';
+    public const NOT_A_MOBILE_NUMBER       = 'not a mobile number';
 }
--- a/src/LoggerHandler.php
+++ b/src/LoggerHandler.php
@ -1,59 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * https://www.d3data.de
- *
- * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Daniel Seifert <support@shopmodule.com>
- * @link      https://www.oxidmodule.com
- */
-
-declare(strict_types=1);
-
-namespace D3\LinkmobilityClient;
-
-use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
-
-class LoggerHandler
-{
-    /** @var LoggerHandler */
-    private static $instance = null;
-    private $logger;
-
-    /**
-     * @return LoggerHandler
-     */
-    public static function getInstance(): LoggerHandler
-    {
-        if (self::$instance === null) {
-            self::$instance = new self();
-        }
-
-        return self::$instance;
-    }
-
-    public function __construct()
-    {
-        $this->setLogger(new NullLogger());
-    }
-
-    /**
-     * @param LoggerInterface $logger
-     */
-    public function setLogger(LoggerInterface $logger)
-    {
-        $this->logger = $logger;
-    }
-
-    /**
-     * @return LoggerInterface
-     */
-    public function getLogger(): LoggerInterface
-    {
-        return $this->logger;
-    }
-}
--- a/src/RecipientsList/RecipientsList.php
+++ b/src/RecipientsList/RecipientsList.php
@ -16,8 +16,13 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\RecipientsList;

 use D3\LinkmobilityClient\Client;
+use D3\LinkmobilityClient\Exceptions\ExceptionMessages;
+use D3\LinkmobilityClient\Exceptions\RecipientException;
 use D3\LinkmobilityClient\ValueObject\Recipient;
 use Iterator;
+use libphonenumber\NumberParseException;
+use libphonenumber\PhoneNumberType;
+use libphonenumber\PhoneNumberUtil;

 class RecipientsList implements RecipientsListInterface, Iterator
 {
@ -31,15 +36,17 @@ class RecipientsList implements RecipientsListInterface, Iterator
     */
    private $recipients = [];

-    /**
-     * @deprecated unused client parameter will remove
-     * @param Client|null $client
-     */
-    public function __construct(Client $client = null)
+    public function __construct(Client $client)
    {
-        if ($client) {
-            $this->setClient( $client );
-        }
+        $this->setClient($client);
+    }
+
+    /**
+     * @return PhoneNumberUtil
+     */
+    protected function getPhoneNumberUtil(): PhoneNumberUtil
+    {
+        return PhoneNumberUtil::getInstance();
    }

    /**
@ -49,7 +56,34 @@ class RecipientsList implements RecipientsListInterface, Iterator
     */
    public function add(Recipient $recipient): RecipientsListInterface
    {
-        $this->recipients[ md5(serialize($recipient)) ] = $recipient;
+        $phoneUtil = $this->getPhoneNumberUtil();
+        try {
+            $phoneNumber = $phoneUtil->parse($recipient->get(), $recipient->getCountryCode());
+
+            if (false === $phoneUtil->isValidNumber($phoneNumber)) {
+                throw new RecipientException(ExceptionMessages::INVALID_RECIPIENT_PHONE);
+            } elseif (
+                false === in_array(
+                    $phoneUtil->getNumberType($phoneNumber),
+                    [
+                        PhoneNumberType::MOBILE,
+                        PhoneNumberType::FIXED_LINE_OR_MOBILE
+                    ]
+                )
+            ) {
+                throw new RecipientException(ExceptionMessages::NOT_A_MOBILE_NUMBER);
+            }
+
+            $this->recipients[ md5(serialize($recipient)) ] = $recipient;
+        } catch (NumberParseException $e) {
+            if ($this->getClient()->hasLogger()) {
+                $this->getClient()->getLogger()->info($e->getMessage());
+            }
+        } catch (RecipientException $e) {
+            if ($this->getClient()->hasLogger()) {
+                $this->getClient()->getLogger()->info($e->getMessage());
+            }
+        }

        return $this;
    }
@ -64,15 +98,12 @@ class RecipientsList implements RecipientsListInterface, Iterator
        return $this;
    }

-    /**
-     * @return array
-     */
    public function getRecipients(): array
    {
        return array_values(
            array_map(
                function (Recipient $recipient) {
-                    return $recipient->getFormatted();
+                    return $recipient->get();
                },
                $this->recipients
            )
@ -119,7 +150,6 @@ class RecipientsList implements RecipientsListInterface, Iterator
    }

    /**
-     * @deprecated
     * @return Client
     */
    public function getClient(): Client
@ -128,7 +158,6 @@ class RecipientsList implements RecipientsListInterface, Iterator
    }

    /**
-     * @deprecated
     * @param Client $client
     *
     * @return RecipientsList
--- a/src/RecipientsList/RecipientsListInterface.php
+++ b/src/RecipientsList/RecipientsListInterface.php
@ -20,10 +20,6 @@ use D3\LinkmobilityClient\ValueObject\Recipient;

 interface RecipientsListInterface
 {
-    /**
-     * @deprecated unused client parameter will remove
-     * @param Client $client
-     */
    public function __construct(Client $client);

    public function add(Recipient $recipient): RecipientsListInterface;
@ -31,6 +27,4 @@ interface RecipientsListInterface
    public function clearRecipents(): RecipientsListInterface;

    public function getRecipients(): array;
-
-    public function getRecipientsList(): array;
 }
--- a/src/Request/Request.php
+++ b/src/Request/Request.php
@ -16,9 +16,7 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\Request;

 use Assert\Assert;
-use Assert\InvalidArgumentException;
 use D3\LinkmobilityClient\Client;
-use D3\LinkmobilityClient\Exceptions\ExceptionMessages;
 use D3\LinkmobilityClient\RecipientsList\RecipientsList;
 use D3\LinkmobilityClient\RecipientsList\RecipientsListInterface;
 use D3\LinkmobilityClient\Response\ResponseInterface;
@ -26,7 +24,9 @@ use D3\LinkmobilityClient\ValueObject\Recipient;
 use D3\LinkmobilityClient\ValueObject\Sender;
 use D3\LinkmobilityClient\ValueObject\SmsMessageAbstract;
 use D3\LinkmobilityClient\ValueObject\SmsMessageInterface;
+use D3\LinkmobilityClient\ValueObject\StringValueObject;
 use GuzzleHttp\RequestOptions;
+use InvalidArgumentException;

 abstract class Request implements RequestInterface
 {
@ -106,7 +106,7 @@ abstract class Request implements RequestInterface
    private $test = false;

    /**
-     * @var int
+     * @var bool
     */
    private $maxSmsPerMessage = 0;

@ -118,12 +118,9 @@ abstract class Request implements RequestInterface
        $this->recipientsList = new RecipientsList($client);
        $this->setMessage($message);
        $this->setClient($client);
-    }

-    /**
-     * @return string
-     */
-    abstract public function getUri(): string;
+        return $this;
+    }

    /**
     * @throws InvalidArgumentException
@ -138,7 +135,7 @@ abstract class Request implements RequestInterface
        Assert::that($this->getOptions())->isArray();

        Assert::that($this->getRecipientsList())->isInstanceOf(RecipientsList::class)->notEmpty();
-        Assert::that($this->getRecipientsList()->getRecipients())->notEmpty(ExceptionMessages::EMPTY_RECIPIENT_LIST);
+        Assert::that($this->getRecipientsList()->getRecipients())->notEmpty('request must contain a valid recipient');
        Assert::thatAll($this->getRecipientsList())->isInstanceOf(Recipient::class)->notEmpty();

        // optional properties
@ -166,7 +163,7 @@ abstract class Request implements RequestInterface
            'senderAddress'     => $this->getSenderAddress() ? $this->getSenderAddress()->getFormatted() : null,
            'senderAddressType' => $this->getSenderAddressType(),
            'test'              => $this->getTestMode(),
-            'validityPeriode'   => $this->getValidityPeriode(),
+            'validityPeriode'   => $this->getValidityPeriode()
        ];
    }

@ -197,18 +194,18 @@ abstract class Request implements RequestInterface
                'headers' => [
                    'Accept'            => $this->contentType,
                    'Content-Type'      => $this->contentType,
-                ],
+                ]
            ],
            $this->getBody()
        );
    }

    /**
-     * @param SmsMessageInterface $message
+     * @param StringValueObject $message
     *
     * @return $this
     */
-    public function setMessage(SmsMessageInterface $message): Request
+    public function setMessage(StringValueObject $message): Request
    {
        $this->message = $message;

@ -277,7 +274,7 @@ abstract class Request implements RequestInterface
        return $this;
    }

-    public function getClientMessageId(): ?string
+    public function getClientMessageId()
    {
        return $this->clientMessageId;
    }
@ -303,7 +300,7 @@ abstract class Request implements RequestInterface
    {
        return [
            RequestInterface::CONTENTCATEGORY_ADVERTISEMENT    => RequestInterface::CONTENTCATEGORY_ADVERTISEMENT,
-            RequestInterface::CONTENTCATEGORY_INFORMATIONAL    => RequestInterface::CONTENTCATEGORY_INFORMATIONAL,
+            RequestInterface::CONTENTCATEGORY_INFORMATIONAL    => RequestInterface::CONTENTCATEGORY_INFORMATIONAL
        ];
    }

@ -373,7 +370,7 @@ abstract class Request implements RequestInterface
    /**
     * @return string|null
     */
-    public function getNotificationCallbackUrl(): ?string
+    public function getNotificationCallbackUrl()
    {
        return $this->notificationCallbackUrl;
    }
@ -393,7 +390,7 @@ abstract class Request implements RequestInterface
    /**
     * @return int|null
     */
-    public function getPriority(): ?int
+    public function getPriority()
    {
        return $this->priority;
    }
@ -419,7 +416,7 @@ abstract class Request implements RequestInterface
    }

    /**
-     * @return bool
+     * @return bool|null
     */
    public function doSendAsFlashSms(): bool
    {
@ -441,7 +438,7 @@ abstract class Request implements RequestInterface
    /**
     * @return Sender|null
     */
-    public function getSenderAddress(): ?Sender
+    public function getSenderAddress()
    {
        return $this->senderAddress;
    }
@ -461,9 +458,9 @@ abstract class Request implements RequestInterface
    /**
     * @return string|null
     */
-    public function getSenderAddressType(): ?string
+    public function getSenderAddressType()
    {
-        return $this->getSenderAddress() && $this->getSenderAddress()->get() ? $this->senderAddressType : null;
+        return $this->senderAddressType;
    }

    /**
@ -475,7 +472,7 @@ abstract class Request implements RequestInterface
            RequestInterface::SENDERADDRESSTYPE_ALPHANUMERIC    => RequestInterface::SENDERADDRESSTYPE_ALPHANUMERIC,
            RequestInterface::SENDERADDRESSTYPE_INTERNATIONAL   => RequestInterface::SENDERADDRESSTYPE_INTERNATIONAL,
            RequestInterface::SENDERADDRESSTYPE_NATIONAL        => RequestInterface::SENDERADDRESSTYPE_NATIONAL,
-            RequestInterface::SENDERADDRESSTYPE_SHORTCODE       => RequestInterface::SENDERADDRESSTYPE_SHORTCODE,
+            RequestInterface::SENDERADDRESSTYPE_SHORTCODE       => RequestInterface::SENDERADDRESSTYPE_SHORTCODE
        ];
    }

@ -494,7 +491,7 @@ abstract class Request implements RequestInterface
    /**
     * @return int|null
     */
-    public function getValidityPeriode(): ?int
+    public function getValidityPeriode()
    {
        return $this->validityPeriode;
    }
@ -520,7 +517,6 @@ abstract class Request implements RequestInterface

    /**
     * @param Client $client
-     * @return Request
     */
    public function setClient(Client $client): Request
    {
--- a/src/Request/RequestInterface.php
+++ b/src/Request/RequestInterface.php
@ -15,16 +15,14 @@ declare(strict_types=1);

 namespace D3\LinkmobilityClient\Request;

-use Assert\InvalidArgumentException;
 use D3\LinkmobilityClient\Client;
-use D3\LinkmobilityClient\RecipientsList\RecipientsListInterface;
 use D3\LinkmobilityClient\ValueObject\SmsMessageInterface;
+use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface as PsrResponseInterface;
 use D3\LinkmobilityClient\Response\ResponseInterface as LMResponseInterface;

 interface RequestInterface
 {
-    // @codeCoverageIgnoreStart
    public const METHOD_GET = 'GET';
    public const METHOD_POST = 'POST';
    public const METHOD_PUT = 'PUT';
@ -43,20 +41,10 @@ interface RequestInterface
    public const SENDERADDRESSTYPE_INTERNATIONAL = 'international';
    public const SENDERADDRESSTYPE_ALPHANUMERIC = 'alphanumeric';
    public const SENDERADDRESSTYPE_SHORTCODE = 'shortcode';
-    // @codeCoverageIgnoreEnd

-    /**
-     * @param SmsMessageInterface $message
-     * @param Client              $client
-     */
    public function __construct(SmsMessageInterface $message, Client $client);

-    /**
-     * @param string $method
-     *
-     * @return Request
-     */
-    public function setMethod(string $method): Request;
+    public function setMethod(string $method);

    /**
     * Must return the HTTP verb for this request, i.e. GET, POST, PUT
@ -65,18 +53,6 @@ interface RequestInterface
     */
    public function getMethod(): string;

-    /**
-     * @param bool $test
-     *
-     * @return Request
-     */
-    public function setTestMode(bool $test): Request;
-
-    /**
-     * @return bool
-     */
-    public function getTestMode(): bool;
-
    /**
     * Must return the URI for the request with a leading slash, i.e. /messages.json
     *
@ -105,11 +81,6 @@ interface RequestInterface
     */
    public function getResponseInstance(PsrResponseInterface $rawResponse): LMResponseInterface;

-    /**
-     * @return RecipientsListInterface
-     */
-    public function getRecipientsList(): RecipientsListInterface;
-
    /**
     * Must return the options for this request. If there are none, return [] (empty array)
     *
--- a/src/Response/Response.php
+++ b/src/Response/Response.php
@ -72,7 +72,7 @@ abstract class Response implements ResponseInterface
    /**
     * @return string|null
     */
-    public function getClientMessageId(): ?string
+    public function getClientMessageId()
    {
        return $this->getContent()[self::CLIENTMESSAGEID];
    }
@ -80,13 +80,13 @@ abstract class Response implements ResponseInterface
    /**
     * @return string|null
     */
-    public function getTransferId(): ?string
+    public function getTransferId()
    {
        return $this->getContent()[self::TRANSFERID];
    }

    /**
-     * @return int
+     * @return string|null
     */
    public function getSmsCount(): int
    {
--- a/src/SMS/BinaryRequest.php
+++ b/src/SMS/BinaryRequest.php
@ -16,10 +16,9 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\SMS;

 use Assert\Assert;
-use Assert\InvalidArgumentException;
 use D3\LinkmobilityClient\Request\Request;
-use D3\LinkmobilityClient\Url\Url;
 use D3\LinkmobilityClient\ValueObject\SmsBinaryMessage;
+use InvalidArgumentException;

 class BinaryRequest extends Request implements SmsRequestInterface
 {
@ -28,7 +27,7 @@ class BinaryRequest extends Request implements SmsRequestInterface
     */
    public function getUri(): string
    {
-        return (new Url())->getBinarySmsUri();
+        return '/rest/smsmessaging/binary';
    }

    public function getRawBody(): array
@ -36,7 +35,7 @@ class BinaryRequest extends Request implements SmsRequestInterface
        return array_merge(
            parent::getRawBody(),
            [
-                'userDataHeaderPresent' => true,
+                'userDataHeaderPresent' => true
            ]
        );
    }
--- a/src/SMS/RequestFactory.php
+++ b/src/SMS/RequestFactory.php
@ -20,15 +20,21 @@ use D3\LinkmobilityClient\ValueObject\SmsBinaryMessage;
 use D3\LinkmobilityClient\ValueObject\SmsTextMessage;
 use Phlib\SmsLength\SmsLength;

-class RequestFactory implements RequestFactoryInterface
+class RequestFactory
 {
+    /**
+     * @deprecated is SmsLength constant from version 2.1
+     */
+    public const GSM_7BIT = '7-bit';
+
+    /**
+     * @deprecated is SmsLength constant from version 2.1
+     */
+    public const GSM_UCS2 = 'ucs-2';
+
    protected $message;
    protected $client;

-    /**
-     * @param $message
-     * @param Client $client
-     */
    public function __construct($message, Client $client)
    {
        $this->message = $message;
@ -40,7 +46,7 @@ class RequestFactory implements RequestFactoryInterface
     */
    public function getSmsRequest(): SmsRequestInterface
    {
-        if ($this->getSmsLength()->getEncoding() === SmsLength::ENCODING_7BIT) {
+        if ($this->getSmsLength()->getEncoding() === self::GSM_7BIT) {
            $message = new SmsTextMessage($this->message);
            return new TextRequest($message, $this->client);
        }
--- a/src/SMS/RequestFactoryInterface.php
+++ b/src/SMS/RequestFactoryInterface.php
@ -15,11 +15,9 @@ declare(strict_types=1);

 namespace D3\LinkmobilityClient\SMS;

-use D3\LinkmobilityClient\Client;
-
 interface RequestFactoryInterface
 {
-    public function __construct($message, Client $client);
+    public function __construct($message);

-    public function getSmsRequest(): SmsRequestInterface;
+    public function getRequest(): SmsRequestInterface;
 }
--- a/src/SMS/Response.php
+++ b/src/SMS/Response.php
@ -15,8 +15,6 @@ declare(strict_types=1);

 namespace D3\LinkmobilityClient\SMS;

-use D3\LinkmobilityClient\Response\Response as BaseResponse;
-
-class Response extends BaseResponse
+class Response extends \D3\LinkmobilityClient\Response\Response
 {
 }
--- a/src/SMS/TextRequest.php
+++ b/src/SMS/TextRequest.php
@ -16,10 +16,9 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\SMS;

 use Assert\Assert;
-use Assert\InvalidArgumentException;
 use D3\LinkmobilityClient\Request\Request;
-use D3\LinkmobilityClient\Url\Url;
 use D3\LinkmobilityClient\ValueObject\SmsTextMessage;
+use InvalidArgumentException;

 class TextRequest extends Request implements SmsRequestInterface
 {
@ -28,7 +27,7 @@ class TextRequest extends Request implements SmsRequestInterface
     */
    public function getUri(): string
    {
-        return (new Url())->getTextSmsUri();
+        return '/rest/smsmessaging/text';
    }

    /**
--- a/src/Url/Url.php
+++ b/src/Url/Url.php
@ -13,7 +13,7 @@

 declare(strict_types=1);

-namespace D3\LinkmobilityClient\Url;
+namespace D3\LinkmobilityClient;

 class Url implements UrlInterface
 {
@ -26,20 +26,4 @@ class Url implements UrlInterface
    {
        return $this->baseUri;
    }
-
-    /**
-     * @return string
-     */
-    public function getTextSmsUri(): string
-    {
-        return '/rest/smsmessaging/text';
-    }
-
-    /**
-     * @return string
-     */
-    public function getBinarySmsUri(): string
-    {
-        return '/rest/smsmessaging/binary';
-    }
 }
--- a/src/Url/UrlInterface.php
+++ b/src/Url/UrlInterface.php
@ -13,13 +13,9 @@

 declare(strict_types=1);

-namespace D3\LinkmobilityClient\Url;
+namespace D3\LinkmobilityClient;

 interface UrlInterface
 {
    public function getBaseUri(): string;
-
-    public function getTextSmsUri(): string;
-
-    public function getBinarySmsUri(): string;
 }
--- a/src/ValueObject/Recipient.php
+++ b/src/ValueObject/Recipient.php
@ -16,24 +16,12 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\ValueObject;

 use Assert\Assert;
-use Assert\InvalidArgumentException;
-use D3\LinkmobilityClient\Exceptions\ExceptionMessages;
-use D3\LinkmobilityClient\Exceptions\RecipientException;
 use libphonenumber\NumberParseException;
 use libphonenumber\PhoneNumberFormat;
-use libphonenumber\PhoneNumberType;
 use libphonenumber\PhoneNumberUtil;

 class Recipient extends StringValueObject
 {
-    /**
-     * @var array
-     */
-    protected $allowedNumberTypes = [
-        PhoneNumberType::MOBILE,
-        PhoneNumberType::FIXED_LINE_OR_MOBILE,
-    ];
-
    /**
     * @var string
     */
@ -44,29 +32,15 @@ class Recipient extends StringValueObject
     * @param string $iso2CountryCode
     *
     * @throws NumberParseException
-     * @throws RecipientException
-     * @throws InvalidArgumentException
     */
    public function __construct(string $number, string $iso2CountryCode)
    {
-        Assert::that($number)->notEmpty();
        Assert::that($iso2CountryCode)->string()->length(2);

        $phoneUtil = $this->getPhoneNumberUtil();

        $phoneNumber = $phoneUtil->parse($number, strtoupper($iso2CountryCode));
-        $number = $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164);
-
-        if (false === $phoneUtil->isValidNumber($phoneNumber)) {
-            throw new RecipientException(ExceptionMessages::INVALID_RECIPIENT_PHONE);
-        } elseif (
-            false === in_array(
-                $phoneUtil->getNumberType($phoneNumber),
-                $this->allowedNumberTypes
-            )
-        ) {
-            throw new RecipientException(ExceptionMessages::NOT_A_MOBILE_NUMBER);
-        }
+        $number = ltrim($phoneUtil->format($phoneNumber, PhoneNumberFormat::E164), '+');

        parent::__construct($number);
        $this->countryCode = $iso2CountryCode;
@ -87,9 +61,4 @@ class Recipient extends StringValueObject
    {
        return $this->countryCode;
    }
-
-    public function getFormatted(): string
-    {
-        return ltrim(parent::getFormatted(), '+');
-    }
 }
--- a/src/ValueObject/Sender.php
+++ b/src/ValueObject/Sender.php
@ -16,49 +16,35 @@ declare(strict_types=1);
 namespace D3\LinkmobilityClient\ValueObject;

 use Assert\Assert;
-use Assert\InvalidArgumentException;
 use D3\LinkmobilityClient\Exceptions\ExceptionMessages;
-use D3\LinkmobilityClient\Exceptions\NoSenderDefinedException;
 use D3\LinkmobilityClient\Exceptions\RecipientException;
-use D3\LinkmobilityClient\LoggerHandler;
 use libphonenumber\NumberParseException;
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberUtil;

-class Sender extends ValueObject
+class Sender extends StringValueObject
 {
    /**
-     * @param string|null $number
-     * @param string|null $iso2CountryCode
+     * @param string $number
+     * @param string $iso2CountryCode
     *
-     * @throws NumberParseException
     * @throws RecipientException
-     * @throws InvalidArgumentException
+     * @throws NumberParseException
     */
-    public function __construct(string $number = null, string $iso2CountryCode = null)
+    public function __construct(string $number, string $iso2CountryCode)
    {
-        try {
-            if (is_null($number) || is_null($iso2CountryCode)) {
-                throw new NoSenderDefinedException();
-            }
+        Assert::that($iso2CountryCode)->string()->length(2);

-            Assert::that($iso2CountryCode)->string()->length(2);
+        $phoneUtil = $this->getPhoneNumberUtil();

-            $phoneUtil = $this->getPhoneNumberUtil();
+        $phoneNumber = $phoneUtil->parse($number, strtoupper($iso2CountryCode));
+        $number = ltrim($phoneUtil->format($phoneNumber, PhoneNumberFormat::E164), '+');

-            $phoneNumber = $phoneUtil->parse($number, strtoupper($iso2CountryCode));
-            $number      = $phoneUtil->format($phoneNumber, PhoneNumberFormat::E164);
-
-            if (false === $phoneUtil->isValidNumber($phoneNumber)) {
-                throw new RecipientException(ExceptionMessages::INVALID_SENDER);
-            }
-
-            parent::__construct($number);
-        } catch (NoSenderDefinedException $e) {
-            LoggerHandler::getInstance()->getLogger()->debug(
-                ExceptionMessages::DEBUG_NOSENDERORCOUNTRYCODE
-            );
+        if (false === $phoneUtil->isValidNumber($phoneNumber)) {
+            throw new RecipientException(ExceptionMessages::INVALID_SENDER);
        }
+
+        parent::__construct($number);
    }

    /**
@ -69,8 +55,11 @@ class Sender extends ValueObject
        return PhoneNumberUtil::getInstance();
    }

-    public function getFormatted(): string
+    /**
+     * @return int
+     */
+    public function getFormatted()
    {
-        return ltrim(parent::getFormatted(), '+');
+        return parent::getFormatted();
    }
 }
--- a/src/ValueObject/SmsBinaryMessage.php
+++ b/src/ValueObject/SmsBinaryMessage.php
@ -35,7 +35,7 @@ class SmsBinaryMessage extends SmsMessageAbstract
    public function getMessageContent()
    {
        return str_split(
-            base64_encode(parent::getMessageContent()),
+            base64_encode($this->get()),
            SmsLength::MAXIMUM_CHARACTERS_UCS2_SINGLE
        );
    }
--- a/src/ValueObject/SmsMessageAbstract.php
+++ b/src/ValueObject/SmsMessageAbstract.php
@ -43,9 +43,6 @@ abstract class SmsMessageAbstract extends StringValueObject implements SmsMessag
        return $this->getSmsLength()->getSize();
    }

-    /**
-     * @return mixed
-     */
    public function getMessageContent()
    {
        return $this->get();
--- a/src/ValueObject/SmsTextMessage.php
+++ b/src/ValueObject/SmsTextMessage.php
@ -15,7 +15,7 @@ declare(strict_types=1);

 namespace D3\LinkmobilityClient\ValueObject;

-use Assert\InvalidArgumentException;
+use InvalidArgumentException;

 class SmsTextMessage extends SmsMessageAbstract
 {
--- a/src/ValueObject/StringValueObject.php
+++ b/src/ValueObject/StringValueObject.php
@ -15,8 +15,17 @@ declare(strict_types=1);

 namespace D3\LinkmobilityClient\ValueObject;

+use Assert\Assert;
+
 abstract class StringValueObject extends ValueObject
 {
+    public function __construct(string $number)
+    {
+        Assert::that($number)->notEmpty();
+
+        $this->value = $number;
+    }
+
    public function __toString()
    {
        return $this->get();
@ -26,4 +35,9 @@ abstract class StringValueObject extends ValueObject
    {
        return $this->value;
    }
+
+    public function getFormatted()
+    {
+        return $this->get();
+    }
 }
--- a/src/ValueObject/ValueObject.php
+++ b/src/ValueObject/ValueObject.php
@ -15,31 +15,7 @@ declare(strict_types=1);

 namespace D3\LinkmobilityClient\ValueObject;

-use Assert\Assert;
-use Assert\InvalidArgumentException;
-
 abstract class ValueObject
 {
    protected $value;
-
-    /**
-     * @param string $number
-     * @throws InvalidArgumentException
-     */
-    public function __construct(string $number)
-    {
-        Assert::that($number)->notEmpty();
-
-        $this->value = $number;
-    }
-
-    public function get()
-    {
-        return $this->value;
-    }
-
-    public function getFormatted(): string
-    {
-        return $this->get();
-    }
 }