ADEN-1074 Refactoring before implementing the logic
ADEN-1074 Added unit tests for the GPT hop detection