BS-8390: fix and add test