BS-10331
Update test coverage
BS-10331
Update test coverage