BS-9737
Add coverage