diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataObjectHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataObjectHandler.php
index 95fb6139c..0e79bcac1 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataObjectHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataObjectHandler.php
@@ -8,6 +8,7 @@
 
 use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
 use Magento\FunctionalTestingFramework\DataGenerator\Parsers\DataProfileSchemaParser;
+use Magento\FunctionalTestingFramework\Exceptions\XmlException;
 use Magento\FunctionalTestingFramework\ObjectManager\ObjectHandlerInterface;
 use Magento\FunctionalTestingFramework\ObjectManagerFactory;
 
@@ -104,6 +105,7 @@ public function getAllObjects()
      *
      * @param string[] $parserOutput primitive array output from the Magento parser
      * @return EntityDataObject[]
+     * @throws XmlException
      */
     private function processParserOutput($parserOutput)
     {
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/OperationDefinitionObjectHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/OperationDefinitionObjectHandler.php
index c79c711ff..66ca3f594 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/OperationDefinitionObjectHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/OperationDefinitionObjectHandler.php
@@ -9,6 +9,7 @@
 use Magento\FunctionalTestingFramework\DataGenerator\Objects\OperationElement;
 use Magento\FunctionalTestingFramework\DataGenerator\Parsers\OperationDefinitionParser;
 use Magento\FunctionalTestingFramework\DataGenerator\Util\OperationElementExtractor;
+use Magento\FunctionalTestingFramework\Exceptions\XmlException;
 use Magento\FunctionalTestingFramework\ObjectManager\ObjectHandlerInterface;
 use Magento\FunctionalTestingFramework\ObjectManagerFactory;
 
@@ -125,6 +126,8 @@ public function getOperationDefinition($operation, $dataType)
      * into an array of objects.
      *
      * @return void
+     * @throws \Exception
+     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/EntityDataObject.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/EntityDataObject.php
index 74cef78f2..d8564a26b 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/EntityDataObject.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Objects/EntityDataObject.php
@@ -152,6 +152,7 @@ public function getDataByName($name, $uniquenessFormat)
      * @param string $uniqueData
      * @param string $uniqueDataFormat
      * @return null|string
+     * @throws TestFrameworkException
      */
     private function formatUniqueData($name, $uniqueData, $uniqueDataFormat)
     {
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php
index fb30704a7..bec0e8fd3 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/AdminExecutor.php
@@ -54,6 +54,7 @@ class AdminExecutor extends AbstractExecutor implements CurlInterface
      * @param bool $removeBackend
      *
      * @constructor
+     * @throws TestFrameworkException
      */
     public function __construct($removeBackend)
     {
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/FrontendExecutor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/FrontendExecutor.php
index b6f448dc0..4725c2c1e 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/FrontendExecutor.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/FrontendExecutor.php
@@ -62,6 +62,8 @@ class FrontendExecutor extends AbstractExecutor implements CurlInterface
      *
      * @param string $customerEmail
      * @param string $customerPassWord
+     *
+     * @throws TestFrameworkException
      */
     public function __construct($customerEmail, $customerPassWord)
     {
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php
index 9a93cded3..4e07c0bf5 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/Curl/WebapiExecutor.php
@@ -6,6 +6,7 @@
 
 namespace Magento\FunctionalTestingFramework\DataGenerator\Persist\Curl;
 
+use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 use Magento\FunctionalTestingFramework\Util\Protocol\CurlInterface;
 use Magento\FunctionalTestingFramework\Util\Protocol\CurlTransport;
 
@@ -54,6 +55,7 @@ class WebapiExecutor extends AbstractExecutor implements CurlInterface
      * WebapiExecutor Constructor.
      *
      * @param string $storeCode
+     * @throws TestFrameworkException
      */
     public function __construct($storeCode = null)
     {
@@ -70,6 +72,7 @@ public function __construct($storeCode = null)
      * Returns the authorization token needed for some requests via REST call.
      *
      * @return void
+     * @throws TestFrameworkException
      */
     protected function authorize()
     {
@@ -94,6 +97,7 @@ protected function authorize()
      * @param string $method
      * @param array $headers
      * @return void
+     * @throws TestFrameworkException
      */
     public function write($url, $data = [], $method = CurlInterface::POST, $headers = [])
     {
@@ -111,6 +115,7 @@ public function write($url, $data = [], $method = CurlInterface::POST, $headers
      * @param string $successRegex
      * @param string $returnRegex
      * @return string
+     * @throws TestFrameworkException
      */
     public function read($successRegex = null, $returnRegex = null)
     {
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
index 63144a9ff..437ce69d5 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/CurlHandler.php
@@ -100,6 +100,7 @@ public function __construct($operation, $entityObject, $storeCode = null)
      * @param array $dependentEntities
      * @return array | null
      * @throws TestFrameworkException
+     * @throws \Exception
      */
     public function executeRequest($dependentEntities)
     {
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php
index 290a14c4e..e19151980 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/DataPersistenceHandler.php
@@ -8,6 +8,7 @@
 
 use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
+use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 
 /**
  * Class DataPersistenceHandler
@@ -75,6 +76,7 @@ public function __construct($entityObject, $dependentObjects = [], $customFields
      *
      * @param string $storeCode
      * @return void
+     * @throws TestFrameworkException
      */
     public function createEntity($storeCode = null)
     {
@@ -97,6 +99,8 @@ public function createEntity($storeCode = null)
      * @param string $updateDataName
      * @param array $updateDependentObjects
      * @return void
+     * @throws TestFrameworkException
+     * @throws \Exception
      */
 
     public function updateEntity($updateDataName, $updateDependentObjects = [])
@@ -121,6 +125,7 @@ public function updateEntity($updateDataName, $updateDependentObjects = [])
      * @param integer|null $index
      * @param string $storeCode
      * @return void
+     * @throws TestFrameworkException
      */
 
     public function getEntity($index = null, $storeCode = null)
@@ -142,6 +147,7 @@ public function getEntity($index = null, $storeCode = null)
      * Function which executes a delete request based on specific operation metadata
      *
      * @return void
+     * @throws TestFrameworkException
      */
     public function deleteEntity()
     {
@@ -163,6 +169,7 @@ public function getCreatedObject()
      * Returns a specific data value based on the CreatedObject's definition.
      * @param string $dataName
      * @return string
+     * @throws TestFrameworkException
      */
     public function getCreatedDataByName($dataName)
     {
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php
index 6097f64da..6f5a1b1d3 100644
--- a/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php
+++ b/src/Magento/FunctionalTestingFramework/DataGenerator/Persist/OperationDataArrayResolver.php
@@ -11,6 +11,7 @@
 use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
 use Magento\FunctionalTestingFramework\DataGenerator\Objects\OperationElement;
 use Magento\FunctionalTestingFramework\DataGenerator\Util\OperationElementExtractor;
+use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 
 class OperationDataArrayResolver
 {
@@ -174,6 +175,7 @@ public function resolveOperationDataArray($entityObject, $operationMetadata, $op
      * @param string $operationKey
      * @param string $operationElementType
      * @return array|string
+     * @throws TestFrameworkException
      */
     private function resolvePrimitiveReference($entityObject, $operationKey, $operationElementType)
     {
@@ -234,6 +236,7 @@ private function getDependentEntitiesOfType($type)
      * @param EntityDataObject $entityObject
      * @param string $operationElementValue
      * @return EntityDataObject|null
+     * @throws \Exception
      */
     private function resolveOperationObjectAndEntityData($entityObject, $operationElementValue)
     {
@@ -258,6 +261,7 @@ private function resolveOperationObjectAndEntityData($entityObject, $operationEl
      * @param string $operation
      * @param bool $fromArray
      * @return array
+     * @throws \Exception
      */
     private function resolveNonPrimitiveElement($entityName, $operationElement, $operation, $fromArray = false)
     {
@@ -290,6 +294,7 @@ private function resolveNonPrimitiveElement($entityName, $operationElement, $ope
      *
      * @param string $entityName
      * @return EntityDataObject
+     * @throws \Exception
      */
     private function resolveLinkedEntityObject($entityName)
     {
diff --git a/src/Magento/FunctionalTestingFramework/Page/Handlers/PageObjectHandler.php b/src/Magento/FunctionalTestingFramework/Page/Handlers/PageObjectHandler.php
index 0c47ab7c3..caf2262fa 100644
--- a/src/Magento/FunctionalTestingFramework/Page/Handlers/PageObjectHandler.php
+++ b/src/Magento/FunctionalTestingFramework/Page/Handlers/PageObjectHandler.php
@@ -38,6 +38,8 @@ class PageObjectHandler implements ObjectHandlerInterface
 
     /**
      * Private constructor
+     *
+     * @throws XmlException
      */
     private function __construct()
     {
@@ -74,6 +76,7 @@ private function __construct()
      * Singleton method to return PageObjectHandler.
      *
      * @return PageObjectHandler
+     * @throws XmlException
      */
     public static function getInstance()
     {
diff --git a/src/Magento/FunctionalTestingFramework/Page/Handlers/SectionObjectHandler.php b/src/Magento/FunctionalTestingFramework/Page/Handlers/SectionObjectHandler.php
index a361579e8..ec52e6eb5 100644
--- a/src/Magento/FunctionalTestingFramework/Page/Handlers/SectionObjectHandler.php
+++ b/src/Magento/FunctionalTestingFramework/Page/Handlers/SectionObjectHandler.php
@@ -43,6 +43,7 @@ class SectionObjectHandler implements ObjectHandlerInterface
      * Constructor
      *
      * @constructor
+     * @throws XmlException
      */
     private function __construct()
     {
@@ -93,6 +94,7 @@ private function __construct()
      * Initialize and/or return the singleton instance of this class
      *
      * @return SectionObjectHandler
+     * @throws XmlException
      */
     public static function getInstance()
     {
diff --git a/src/Magento/FunctionalTestingFramework/Page/Objects/PageObject.php b/src/Magento/FunctionalTestingFramework/Page/Objects/PageObject.php
index 30cdc89ed..80e29496d 100644
--- a/src/Magento/FunctionalTestingFramework/Page/Objects/PageObject.php
+++ b/src/Magento/FunctionalTestingFramework/Page/Objects/PageObject.php
@@ -7,6 +7,7 @@
 namespace Magento\FunctionalTestingFramework\Page\Objects;
 
 
+use Magento\FunctionalTestingFramework\Exceptions\XmlException;
 use Magento\FunctionalTestingFramework\Page\Handlers\SectionObjectHandler;
 
 /**
@@ -143,6 +144,7 @@ public function hasSection($sectionName)
      *
      * @param string $sectionName
      * @return SectionObject | null
+     * @throws XmlException
      */
     public function getSection($sectionName)
     {
diff --git a/src/Magento/FunctionalTestingFramework/Suite/Generators/GroupClassGenerator.php b/src/Magento/FunctionalTestingFramework/Suite/Generators/GroupClassGenerator.php
index e374d0e6e..d07f1e987 100644
--- a/src/Magento/FunctionalTestingFramework/Suite/Generators/GroupClassGenerator.php
+++ b/src/Magento/FunctionalTestingFramework/Suite/Generators/GroupClassGenerator.php
@@ -6,6 +6,7 @@
 
 namespace Magento\FunctionalTestingFramework\Suite\Generators;
 
+use Magento\FunctionalTestingFramework\Exceptions\TestReferenceException;
 use Magento\FunctionalTestingFramework\Suite\Objects\SuiteObject;
 use Magento\FunctionalTestingFramework\Test\Objects\ActionObject;
 use Magento\FunctionalTestingFramework\Test\Objects\TestHookObject;
@@ -68,6 +69,7 @@ public function __construct()
      *
      * @param SuiteObject $suiteObject
      * @return string
+     * @throws TestReferenceException
      */
     public function generateGroupClass($suiteObject)
     {
@@ -84,6 +86,7 @@ public function generateGroupClass($suiteObject)
      *
      * @param SuiteObject $suiteObject
      * @return string;
+     * @throws TestReferenceException
      */
     private function createClassContent($suiteObject)
     {
@@ -122,6 +125,7 @@ private function extractClassVar($beforeArray, $afterArray)
      *
      * @param TestHookObject $hookObj
      * @return array
+     * @throws TestReferenceException
      */
     private function buildHookMustacheArray($hookObj)
     {
@@ -171,6 +175,7 @@ private function buildHookMustacheArray($hookObj)
      * @param ActionObject $action
      * @param array $actionEntries
      * @return array
+     * @throws TestReferenceException
      */
     private function buildWebDriverActionsMustacheArray($action, $actionEntries)
     {
diff --git a/src/Magento/FunctionalTestingFramework/Suite/Handlers/SuiteObjectHandler.php b/src/Magento/FunctionalTestingFramework/Suite/Handlers/SuiteObjectHandler.php
index 8930de98c..d4b044cf8 100644
--- a/src/Magento/FunctionalTestingFramework/Suite/Handlers/SuiteObjectHandler.php
+++ b/src/Magento/FunctionalTestingFramework/Suite/Handlers/SuiteObjectHandler.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\FunctionalTestingFramework\Suite\Handlers;
 
+use Magento\FunctionalTestingFramework\Exceptions\XmlException;
 use Magento\FunctionalTestingFramework\ObjectManager\ObjectHandlerInterface;
 use Magento\FunctionalTestingFramework\ObjectManagerFactory;
 use Magento\FunctionalTestingFramework\Suite\Objects\SuiteObject;
@@ -43,6 +44,7 @@ private function __construct()
      * Function to enforce singleton design pattern
      *
      * @return ObjectHandlerInterface
+     * @throws XmlException
      */
     public static function getInstance()
     {
@@ -103,6 +105,7 @@ public function getAllTestReferences()
      *
      * @return void
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+     * @throws XmlException
      */
     private function initSuiteData()
     {
diff --git a/src/Magento/FunctionalTestingFramework/Suite/SuiteGenerator.php b/src/Magento/FunctionalTestingFramework/Suite/SuiteGenerator.php
index f2af5cd31..7ae362591 100644
--- a/src/Magento/FunctionalTestingFramework/Suite/SuiteGenerator.php
+++ b/src/Magento/FunctionalTestingFramework/Suite/SuiteGenerator.php
@@ -7,6 +7,7 @@
 namespace Magento\FunctionalTestingFramework\Suite;
 
 use Magento\FunctionalTestingFramework\Exceptions\TestReferenceException;
+use Magento\FunctionalTestingFramework\Exceptions\XmlException;
 use Magento\FunctionalTestingFramework\Suite\Generators\GroupClassGenerator;
 use Magento\FunctionalTestingFramework\Suite\Handlers\SuiteObjectHandler;
 use Magento\FunctionalTestingFramework\Suite\Objects\SuiteObject;
@@ -71,6 +72,7 @@ public static function getInstance()
      *
      * @param BaseTestManifest $testManifest
      * @return void
+     * @throws \Exception
      */
     public function generateAllSuites($testManifest)
     {
@@ -97,6 +99,7 @@ public function generateAllSuites($testManifest)
      *
      * @param string $suiteName
      * @return void
+     * @throws \Exception
      */
     public function generateSuite($suiteName)
     {
@@ -113,6 +116,8 @@ public function generateSuite($suiteName)
      * @param array $tests
      * @param string $originalSuiteName
      * @return void
+     * @throws TestReferenceException
+     * @throws XmlException
      */
     private function generateSuiteFromTest($suiteName, $tests = [], $originalSuiteName = null)
     {
@@ -147,6 +152,7 @@ private function generateSuiteFromTest($suiteName, $tests = [], $originalSuiteNa
      * @param string $originalSuiteName
      * @return void
      * @throws TestReferenceException
+     * @throws XmlException
      */
     private function validateTestsReferencedInSuite($suiteName, $testsReferenced, $originalSuiteName)
     {
@@ -173,6 +179,7 @@ private function validateTestsReferencedInSuite($suiteName, $testsReferenced, $o
      * @param string $suiteName
      * @param array $suiteContent
      * @return void
+     * @throws \Exception
      */
     private function generateSplitSuiteFromTest($suiteName, $suiteContent)
     {
@@ -189,6 +196,8 @@ private function generateSplitSuiteFromTest($suiteName, $suiteContent)
      * @param array $tests
      * @param string $originalSuiteName
      * @return null|string
+     * @throws XmlException
+     * @throws TestReferenceException
      */
     private function generateGroupFile($suiteName, $tests, $originalSuiteName)
     {
@@ -289,6 +298,7 @@ private static function clearPreviousSessionConfigEntries()
      * @param string $path
      * @param array $tests
      * @return void
+     * @throws TestReferenceException
      */
     private function generateRelevantGroupTests($path, $tests)
     {
diff --git a/src/Magento/FunctionalTestingFramework/Suite/Util/SuiteObjectExtractor.php b/src/Magento/FunctionalTestingFramework/Suite/Util/SuiteObjectExtractor.php
index 4db1abfc7..2e600806b 100644
--- a/src/Magento/FunctionalTestingFramework/Suite/Util/SuiteObjectExtractor.php
+++ b/src/Magento/FunctionalTestingFramework/Suite/Util/SuiteObjectExtractor.php
@@ -42,6 +42,7 @@ public function __construct()
      * @throws XmlException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @throws \Exception
      */
     public function parseSuiteDataIntoObjects($parsedSuiteData)
     {
@@ -133,6 +134,7 @@ public function parseSuiteDataIntoObjects($parsedSuiteData)
      *
      * @param array $suiteReferences
      * @return array
+     * @throws \Exception
      */
     private function extractTestObjectsFromSuiteRef($suiteReferences)
     {
@@ -169,6 +171,7 @@ private function extractTestObjectsFromSuiteRef($suiteReferences)
      * @param string $moduleName
      * @param string $moduleFilePath
      * @return array
+     * @throws \Exception
      */
     private function extractModuleAndFiles($moduleName, $moduleFilePath)
     {
@@ -219,6 +222,7 @@ private function resolveFilePathTestNames($filename, $moduleName = null)
      *
      * @param string $moduleName
      * @return array
+     * @throws \Exception
      */
     private function resolveModulePathTestNames($moduleName)
     {
diff --git a/src/Magento/FunctionalTestingFramework/Test/Handlers/TestObjectHandler.php b/src/Magento/FunctionalTestingFramework/Test/Handlers/TestObjectHandler.php
index b301c7aaa..721c5df84 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Handlers/TestObjectHandler.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Handlers/TestObjectHandler.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\FunctionalTestingFramework\Test\Handlers;
 
+use Magento\FunctionalTestingFramework\Exceptions\XmlException;
 use Magento\FunctionalTestingFramework\ObjectManager\ObjectHandlerInterface;
 use Magento\FunctionalTestingFramework\ObjectManagerFactory;
 use Magento\FunctionalTestingFramework\Test\Objects\TestObject;
@@ -36,6 +37,7 @@ class TestObjectHandler implements ObjectHandlerInterface
      * Singleton method to return TestObjectHandler.
      *
      * @return TestObjectHandler
+     * @throws XmlException
      */
     public static function getInstance()
     {
@@ -106,6 +108,7 @@ public function getTestsByGroup($groupName)
      *
      * @return void
      * @SuppressWarnings(PHPMD.UnusedPrivateMethod)
+     * @throws XmlException
      */
     private function initTestData()
     {
diff --git a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionGroupObject.php b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionGroupObject.php
index fdef1107e..d1e8112e6 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionGroupObject.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionGroupObject.php
@@ -85,6 +85,7 @@ public function getSteps($arguments, $actionReferenceKey)
      * Iterates through given $arguments and overrides ActionGroup's argument values, if any are found.
      * @param array $arguments
      * @return ArgumentObject[]
+     * @throws TestReferenceException
      */
     private function resolveArguments($arguments)
     {
diff --git a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
index a0436bc19..87b8d0a12 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
@@ -234,6 +234,8 @@ public function setTimeout($timeout)
      *   userInput
      *
      * @return void
+     * @throws TestReferenceException
+     * @throws XmlException
      */
     public function resolveReferences()
     {
@@ -254,6 +256,7 @@ public function resolveReferences()
      * Warns user if they are using old Assertion syntax.
      *
      * @return void
+     * @throws TestReferenceException
      */
     public function trimAssertionAttributes()
     {
@@ -327,6 +330,8 @@ private function validateAssertionSchema($attributes)
      * e.g. {{SomeSectionName.ElementName}} becomes #login-button
      *
      * @return void
+     * @throws XmlException
+     * @throws \Exception
      */
     private function resolveSelectorReferenceAndTimeout()
     {
@@ -353,6 +358,8 @@ private function resolveSelectorReferenceAndTimeout()
      * e.g. {{SomePageName}} becomes http://localhost:76543/some/url
      *
      * @return void
+     * @throws TestReferenceException
+     * @throws XmlException
      */
     private function resolveUrlReference()
     {
@@ -374,6 +381,8 @@ private function resolveUrlReference()
      * e.g. {{CustomerEntityFoo.FirstName}} becomes Jerry
      *
      * @return void
+     * @throws TestReferenceException
+     * @throws \Exception
      */
     private function resolveDataInputReferences()
     {
@@ -453,7 +462,7 @@ private function stripAndReturnParameters($reference)
      * @param ObjectHandlerInterface $objectHandler
      * @param string $inputString
      * @return string | null
-     * @throws \Exception
+     * @throws TestReferenceException | \Exception
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -585,6 +594,7 @@ private function resolveEntityDataObjectReference($obj, $match)
      * @param string $match
      * @param object $object
      * @return string
+     * @throws \Exception
      */
     private function resolveParameterization($isParameterized, $replacement, $match, $object)
     {
diff --git a/src/Magento/FunctionalTestingFramework/Test/Util/ActionGroupObjectExtractor.php b/src/Magento/FunctionalTestingFramework/Test/Util/ActionGroupObjectExtractor.php
index aeef21760..32b54c3da 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Util/ActionGroupObjectExtractor.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Util/ActionGroupObjectExtractor.php
@@ -7,6 +7,7 @@
 namespace Magento\FunctionalTestingFramework\Test\Util;
 
 use Magento\FunctionalTestingFramework\Data\Argument\Interpreter\Argument;
+use Magento\FunctionalTestingFramework\Exceptions\XmlException;
 use Magento\FunctionalTestingFramework\Test\Objects\ActionGroupObject;
 use Magento\FunctionalTestingFramework\Test\Objects\ArgumentObject;
 
@@ -39,6 +40,7 @@ public function __construct()
      *
      * @param array $actionGroupData
      * @return ActionGroupObject
+     * @throws XmlException
      */
     public function extractActionGroup($actionGroupData)
     {
diff --git a/src/Magento/FunctionalTestingFramework/Test/Util/ActionMergeUtil.php b/src/Magento/FunctionalTestingFramework/Test/Util/ActionMergeUtil.php
index 8af5e3af0..4bc120f2e 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Util/ActionMergeUtil.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Util/ActionMergeUtil.php
@@ -71,6 +71,8 @@ public function __construct($contextName, $contextType)
      * @param array $parsedSteps
      * @param bool $skipActionGroupResolution
      * @return array
+     * @throws TestReferenceException
+     * @throws XmlException
      */
     public function resolveActionSteps($parsedSteps, $skipActionGroupResolution = false)
     {
@@ -119,6 +121,7 @@ private function resolveActionGroups($mergedSteps)
      *
      * @param array $parsedSteps
      * @return void
+     * @throws XmlException
      */
     private function mergeActions($parsedSteps)
     {
diff --git a/src/Magento/FunctionalTestingFramework/Test/Util/ActionObjectExtractor.php b/src/Magento/FunctionalTestingFramework/Test/Util/ActionObjectExtractor.php
index a3ce58a5e..932e5c96e 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Util/ActionObjectExtractor.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Util/ActionObjectExtractor.php
@@ -48,6 +48,7 @@ public function __construct()
      * @param string $testName
      * @return array
      * @throws XmlException
+     * @throws TestReferenceException
      */
     public function extractActions($testActions, $testName = null)
     {
@@ -162,6 +163,8 @@ private function processActionGroupArgs($actionAttributeData)
      * @param array $actionData
      * @param array $actions
      * @return array
+     * @throws XmlException
+     * @throws TestReferenceException
      */
     private function extractFieldActions($actionData, $actions)
     {
diff --git a/src/Magento/FunctionalTestingFramework/Test/Util/TestHookObjectExtractor.php b/src/Magento/FunctionalTestingFramework/Test/Util/TestHookObjectExtractor.php
index 16ba69e0b..0084800b5 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Util/TestHookObjectExtractor.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Util/TestHookObjectExtractor.php
@@ -37,6 +37,7 @@ public function __construct()
      * @param string $hookType
      * @param array $testHook
      * @return TestHookObject
+     * @throws \Exception
      */
     public function extractHook($parentName, $hookType, $testHook)
     {
diff --git a/src/Magento/FunctionalTestingFramework/Test/Util/TestObjectExtractor.php b/src/Magento/FunctionalTestingFramework/Test/Util/TestObjectExtractor.php
index be4e3c97c..649376558 100644
--- a/src/Magento/FunctionalTestingFramework/Test/Util/TestObjectExtractor.php
+++ b/src/Magento/FunctionalTestingFramework/Test/Util/TestObjectExtractor.php
@@ -59,7 +59,7 @@ public function __construct()
      *
      * @param array $testData
      * @return TestObject
-     * @throws \Magento\FunctionalTestingFramework\Exceptions\XmlException
+     * @throws \Exception
      */
     public function extractTestData($testData)
     {