BS-2546 - Fix test coverage