BS-10854
Improve coverage
Refactor