BS-10683: Improve Test coverage