BS-8347
Add unit test