[TEST] BACKLOG-774 - Add new tests, refactoring